Changeset 7520 for branches/2015/dev_r5003_MERCATOR6_CRS/NEMOGCM/NEMO/TOP_SRC

Timestamp:

2016-12-28T17:26:05+01:00 (7 years ago)

Author:

cbricaud

Message:

cleaning and bug correction in CRS branch

Location:

branches/2015/dev_r5003_MERCATOR6_CRS/NEMOGCM/NEMO/TOP_SRC/PISCES/P4Z

Files:

• p4zbio.F90 (modified) (3 diffs)
• p4zopt.F90 (modified) (2 diffs)
• p4zsed.F90 (modified) (1 diff)
• p4zsink.F90 (modified) (4 diffs)

branches/2015/dev_r5003_MERCATOR6_CRS/NEMOGCM/NEMO/TOP_SRC/PISCES/P4Z/p4zbio.F90

@@ -55 +55 @@
       INTEGER             :: ji, jj, jk, jn
       CHARACTER (len=25) :: charout
-
       !!---------------------------------------------------------------------
       !
@@ -73 +72 @@
       END DO
 
-          
       CALL p4z_opt  ( kt, knt )     ! Optic: PAR in the water column
       CALL p4z_sink ( kt, knt )     ! vertical flux of particulate organic matter
@@ -81 +79 @@
       !                             ! (for each element : C, Si, Fe, Chl )
       CALL p4z_mort ( kt      )     ! phytoplankton mortality
-     !                             ! zooplankton sources/sinks routines 
+      !                             ! zooplankton sources/sinks routines 
       CALL p4z_micro( kt, knt )           ! microzooplankton
       CALL p4z_meso ( kt, knt )           ! mesozooplankton

branches/2015/dev_r5003_MERCATOR6_CRS/NEMOGCM/NEMO/TOP_SRC/PISCES/P4Z/p4zopt.F90

@@ -107 +107 @@
                ekg(ji,jj,jk) = xkrgb(2,irgb) * fse3t(ji,jj,jk)
                ekr(ji,jj,jk) = xkrgb(3,irgb) * fse3t(ji,jj,jk)
-!#if defined key_crs
-!               zfse3 = e3t_max_crs(ji,jj,jk)
-!#else
-!               zfse3 = fse3t(ji,jj,jk)
-!#endif
-!               ekb(ji,jj,jk) = xkrgb(1,irgb) * zfse3
-!               ekg(ji,jj,jk) = xkrgb(2,irgb) * zfse3
-!               ekr(ji,jj,jk) = xkrgb(3,irgb) * zfse3
             END DO
          END DO
@@ -200 +192 @@
                   zetmp4 (ji,jj) = zetmp4 (ji,jj) + ediat    (ji,jj,jk) * fse3t(ji,jj,jk) ! production
                   zdepmoy(ji,jj) = zdepmoy(ji,jj) + fse3t(ji,jj,jk)
-!#if defined key_crs
-!                zfse3 = e3t_max_crs(ji,jj,jk)
-!#else
-!               zfse3 = fse3t(ji,jj,jk)
-!#endif
-!                  zetmp1 (ji,jj) = zetmp1 (ji,jj) + etot     (ji,jj,jk) * zfse3 ! remineralisation
-!                  zetmp2 (ji,jj) = zetmp2 (ji,jj) + etot_ndcy(ji,jj,jk) * zfse3 ! production
-!                  zetmp3 (ji,jj) = zetmp3 (ji,jj) + enano    (ji,jj,jk) * zfse3 ! production
-!                  zetmp4 (ji,jj) = zetmp4 (ji,jj) + ediat    (ji,jj,jk) * zfse3 ! production
-!                  zdepmoy(ji,jj) = zdepmoy(ji,jj) + zfse3
                ENDIF
             END DO

branches/2015/dev_r5003_MERCATOR6_CRS/NEMOGCM/NEMO/TOP_SRC/PISCES/P4Z/p4zsed.F90

@@ -223 +223 @@
          DO ji = 1, jpi
             ikt  = mbkt(ji,jj)
-!#if defined key_crs
-!            zdep = e3t_max_crs(ji,jj,ikt) / xstep
-!#else
-!            zdep = fse3t(ji,jj,ikt) / xstep
-!#endif
+#if defined key_crs
+            zdep = e3t_max_crs(ji,jj,ikt) / xstep
+#else
             zdep = fse3t(ji,jj,ikt) / xstep
+#endif
             zwsbio4(ji,jj) = MIN( 0.99 * zdep, wsbio4(ji,jj,ikt) )
             zwscal (ji,jj) = MIN( 0.99 * zdep, wscal (ji,jj,ikt) )

branches/2015/dev_r5003_MERCATOR6_CRS/NEMOGCM/NEMO/TOP_SRC/PISCES/P4Z/p4zsink.F90

@@ -135 +135 @@
              DO ji = 1, jpi
                 IF( tmask(ji,jj,jk) == 1) THEN
-!#if defined key_crs
-!                   zwsmax =  0.5 * e3t_max_crs(ji,jj,jk) / xstep
-!#else
-!                   zwsmax =  0.5 * fse3t(ji,jj,jk) / xstep
-!#endif
+#if defined key_crs
+                   zwsmax =  0.5 * e3t_max_crs(ji,jj,jk) / xstep
+#else
                    zwsmax =  0.5 * fse3t(ji,jj,jk) / xstep
+#endif
                    iiter1 =  MAX( iiter1, INT( wsbio3(ji,jj,jk) / zwsmax ) )
                    iiter2 =  MAX( iiter2, INT( wsbio4(ji,jj,jk) / zwsmax ) )
@@ -159 +158 @@
             DO ji = 1, jpi
                IF( tmask(ji,jj,jk) == 1 ) THEN
-!#if defined key_crs
-!                   zwsmax =  0.5 * e3t_max_crs(ji,jj,jk) / xstep
-!#else
-!                   zwsmax =  0.5 * fse3t(ji,jj,jk) / xstep
-!#endif
-                 zwsmax = 0.5 * fse3t(ji,jj,jk) / xstep
+                 zwsmax =  0.5 * fse3t(ji,jj,jk) / xstep
                  wsbio3(ji,jj,jk) = MIN( wsbio3(ji,jj,jk), zwsmax * FLOAT( iiter1 ) )
                  wsbio4(ji,jj,jk) = MIN( wsbio4(ji,jj,jk), zwsmax * FLOAT( iiter2 ) )
@@ -870 +864 @@
             DO jj = 1,jpj
                DO ji = 1, jpi
+#if defined key_crs
+                  zflx = ( psinkflx(ji,jj,jk) - psinkflx(ji,jj,jk+1) ) / e3t_max_crs(ji,jj,jk)
+#else
                   zflx = ( psinkflx(ji,jj,jk) - psinkflx(ji,jj,jk+1) ) / fse3t(ji,jj,jk)
+#endif
                   trb(ji,jj,jk,jp_tra) = trb(ji,jj,jk,jp_tra) + zflx
                END DO
@@ -881 +879 @@
          DO jj = 1,jpj
             DO ji = 1, jpi
+#if defined key_crs
+               zflx = ( psinkflx(ji,jj,jk) - psinkflx(ji,jj,jk+1) ) / e3t_max_crs(ji,jj,jk)
+#else
                zflx = ( psinkflx(ji,jj,jk) - psinkflx(ji,jj,jk+1) ) / fse3t(ji,jj,jk)
+#endif
                ztrb(ji,jj,jk) = ztrb(ji,jj,jk) + 2. * zflx
             END DO