Changeset 14416 for NEMO/branches/2021/dev_r14383_PISCES_NEWDEV_PISCO/src/TOP/PISCES/P4Z/p4zopt.F90

Timestamp:

2021-02-07T16:08:48+01:00 (3 years ago)

Author:

cetlod

Message:

dev_r14383_PISCES_NEWDEV_PISCO : minor improvments

File:

• NEMO/branches/2021/dev_r14383_PISCES_NEWDEV_PISCO/src/TOP/PISCES/P4Z/p4zopt.F90 (modified) (5 diffs)

NEMO/branches/2021/dev_r14383_PISCES_NEWDEV_PISCO/src/TOP/PISCES/P4Z/p4zopt.F90

@@ -67 +67 @@
       REAL(wp), DIMENSION(jpi,jpj    ) :: zdepmoy, zetmp1, zetmp2, zetmp3, zetmp4
       REAL(wp), DIMENSION(jpi,jpj    ) :: zqsr100, zqsr_corr
-      REAL(wp), DIMENSION(jpi,jpj,jpk) :: zpar, ze0, ze1, ze2, ze3, zchl3d
+      REAL(wp), DIMENSION(jpi,jpj,jpk) :: zpar, ze0, ze1, ze2, ze3
       !!---------------------------------------------------------------------
       !
@@ -79 +79 @@
       ze2(:,:,:) = 0._wp
       ze3(:,:,:) = 0._wp
+
       !
       ! Attenuation coef. function of Chlorophyll and wavelength (Red-Green-Blue)
@@ -85 +86 @@
       ! in Lengaigne et al. (2007).
       ! --------------------------------------------------------
-                     zchl3d(:,:,:) = tr(:,:,:,jpnch,Kbb) + tr(:,:,:,jpdch,Kbb)
-      IF( ln_p5z )   zchl3d(:,:,:) = zchl3d(:,:,:)       + tr(:,:,:,jppch,Kbb)
       !
       ! Computation of the light attenuation parameters based on a 
       ! look-up table
       DO_3D( 1, 1, 1, 1, 1, jpkm1 )
-         zchl = ( zchl3d(ji,jj,jk) + rtrn ) * 1.e6
+         zchl =  ( tr(ji,jj,jk,jpnch,Kbb) + tr(ji,jj,jk,jpdch,Kbb) + rtrn ) * 1.e6
+         IF( ln_p5z )   zchl = zchl + tr(ji,jj,jk,jppch,Kbb) * 1.e6
          zchl = MIN(  10. , MAX( 0.05, zchl )  )
          irgb = NINT( 41 + 20.* LOG10( zchl ) + rtrn )
@@ -99 +99 @@
          ekr(ji,jj,jk) = rkrgb(3,irgb) * e3t(ji,jj,jk,Kmm)
       END_3D
+
 
       ! Photosynthetically Available Radiation (PAR)
@@ -329 +330 @@
          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, nksr + 1 )
+            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