Changeset 13373 for NEMO/branches/2020/dev_r13333_TOP-05_Ethe_Agrif/src/TOP/PISCES/P4Z/p4zopt.F90

Timestamp:

2020-08-03T11:46:38+02:00 (4 years ago)

Author:

cetlod

Message:

TOP-05_Ethe_Agrif : 1st step of changes to successfully compile, see ticket #2508

File:

• NEMO/branches/2020/dev_r13333_TOP-05_Ethe_Agrif/src/TOP/PISCES/P4Z/p4zopt.F90 (modified) (5 diffs)

NEMO/branches/2020/dev_r13333_TOP-05_Ethe_Agrif/src/TOP/PISCES/P4Z/p4zopt.F90

@@ -32 +32 @@
    REAL(wp) ::   xsi0r       ! 1. /rn_si0
 
+  INTEGER  ::   nksr1        ! levels below which the light cannot penetrate ( depth larger than 391 m)
+
    TYPE(FLD), ALLOCATABLE, DIMENSION(:) ::   sf_par      ! structure of input par
-   INTEGER , PARAMETER :: nbtimes = 366  !: maximum number of times record in a file
-   INTEGER  :: ntimes_par                ! number of time steps in a file
    REAL(wp), ALLOCATABLE, SAVE, DIMENSION(:,:)   ::   par_varsw      ! PAR fraction of shortwave
    REAL(wp), ALLOCATABLE, SAVE, DIMENSION(:,:,:) ::   ekb, ekg, ekr  ! wavelength (Red-Green-Blue)
@@ -279 +279 @@
          pe3(:,:,1) = zqsr(:,:)
          !
-         DO jk = 2, nksr + 1
-            DO jj = 1, jpj
-               DO ji = 1, jpi
-                  pe0(ji,jj,jk) = pe0(ji,jj,jk-1) * EXP( -e3t(ji,jj,jk-1,Kmm) * xsi0r )
-                  pe1(ji,jj,jk) = pe1(ji,jj,jk-1) * EXP( -ekb  (ji,jj,jk-1 )        )
-                  pe2(ji,jj,jk) = pe2(ji,jj,jk-1) * EXP( -ekg  (ji,jj,jk-1 )        )
-                  pe3(ji,jj,jk) = pe3(ji,jj,jk-1) * EXP( -ekr  (ji,jj,jk-1 )        )
-               END DO
-              !
-            END DO
-            !
-         END DO
+         DO_3D( 1, 1, 1, 1, 2, nksr1 )
+            pe0(ji,jj,jk) = pe0(ji,jj,jk-1) * EXP( -e3t(ji,jj,jk-1,Kmm) * xsi0r )
+            pe1(ji,jj,jk) = pe1(ji,jj,jk-1) * EXP( -ekb  (ji,jj,jk-1 )        )
+            pe2(ji,jj,jk) = pe2(ji,jj,jk-1) * EXP( -ekg  (ji,jj,jk-1 )        )
+            pe3(ji,jj,jk) = pe3(ji,jj,jk-1) * EXP( -ekr  (ji,jj,jk-1 )        )
+         END_3D
         !
       ELSE   ! T- level
@@ -331 +325 @@
       ! Compute par_varsw at nit000 or only if there is more than 1 time record in par coefficient file
       IF( ln_varpar ) THEN
-         IF( kt == nit000 .OR. ( kt /= nit000 .AND. ntimes_par > 1 ) ) THEN
-            CALL fld_read( kt, 1, sf_par )
-            par_varsw(:,:) = ( sf_par(1)%fnow(:,:,1) ) / 3.0
-         ENDIF
+         CALL fld_read( kt, 1, sf_par )
+         par_varsw(:,:) = ( sf_par(1)%fnow(:,:,1) ) / 3.0
       ENDIF
       !
@@ -377 +369 @@
       xparsw = parlux / 3.0
       xsi0r  = 1.e0 / rn_si0
+      nksr1  = nksr + 1
       !
       ! Variable PAR at the surface of the ocean
@@ -392 +385 @@
                                    ALLOCATE( sf_par(1)%fnow(jpi,jpj,1)   )
          IF( sn_par%ln_tint )      ALLOCATE( sf_par(1)%fdta(jpi,jpj,1,2) )
-
-         CALL iom_open (  TRIM( sn_par%clname ) , numpar )
-         ntimes_par = iom_getszuld( numpar )   ! get number of record in file
       ENDIF
       !