Changeset 14786 for NEMO/branches/2021/dev_r14383_PISCES_NEWDEV_PISCO/src/TOP/PISCES/P4Z/p4zmeso.F90

Timestamp:

2021-05-05T09:09:10+02:00 (3 years ago)

Author:

aumont

Message:

Various bug fixes in PISCES

File:

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

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

@@ -141 +141 @@
          ! small cells
          ! -------------------------------------------------------------------------------
-         zcompaph  = MAX( ( tr(ji,jj,jk,jpphy,Kbb) - xthresh2phy ), 0.e0 ) &
-            &      * MIN(1., MAX( 0., ( quotan(ji,jj,jk) - 0.2) / 0.3 ) )
-
+         zcompaph  = MAX( ( tr(ji,jj,jk,jpphy,Kbb) - xthresh2phy ), 0.e0 )
 
          ! Mesozooplankton grazing
@@ -214 +212 @@
          ! Compute the proportion of filter feeders. It is assumed steady state.
          ! ---------------------------------------------------------------------  
-         zproport  = (zgrazffep + zgrazffeg)/(rtrn + zgraztotc)
+         zproport  = 0._wp
+         IF( gdepw(ji,jj,jk+1,Kmm) > MAX(hmld(ji,jj), heup_01(ji,jj) ) ) THEN
+            zproport  = (zgrazffep + zgrazffeg)/(rtrn + zgraztotc)
+         ENDIF
 
          ! Compute fractionation of aggregates. It is assumed that 
@@ -228 +229 @@
          zfrac     = zproport * grazflux  * xstep * wsbio4(ji,jj,jk)      &
          &          * tr(ji,jj,jk,jpgoc,Kbb) * tr(ji,jj,jk,jpmes,Kbb)          &
-         &          * ( 0.2 + 3.8 * zratio2 / ( 1.**2 + zratio2 ) )
+         &          * ( 0.4 + 3.6 * zratio2 / ( 1.**2 + zratio2 ) )
          zfracfe   = zfrac * tr(ji,jj,jk,jpbfe,Kbb) / (tr(ji,jj,jk,jpgoc,Kbb) + rtrn)
 
@@ -236 +237 @@
          zgrazfffp = zproport * zgrazfffp
          zgrazfffg = zproport * zgrazfffg
+         zgrazdc   = (1.0 - zproport) * zgrazdc
+         zgraznc   = (1.0 - zproport) * zgraznc
+         zgrazz    = (1.0 - zproport) * zgrazz
+         zgrazpoc  = (1.0 - zproport) * zgrazpoc
+         zgrazdf   = (1.0 - zproport) * zgrazdf
+         zgraznf   = (1.0 - zproport) * zgraznf
+         zgrazpof  = (1.0 - zproport) * zgrazpof
+
 
          ! Total ingestion rates in C, N, Fe
@@ -280 +289 @@
          tr(ji,jj,jk,jpdch,Krhs) = tr(ji,jj,jk,jpdch,Krhs) - zgrazdc * tr(ji,jj,jk,jpdch,Kbb) / ( tr(ji,jj,jk,jpdia,Kbb) + rtrn )
          tr(ji,jj,jk,jpdsi,Krhs) = tr(ji,jj,jk,jpdsi,Krhs) - zgrazdc * tr(ji,jj,jk,jpdsi,Kbb) / ( tr(ji,jj,jk,jpdia,Kbb) + rtrn )
-         tr(ji,jj,jk,jpgsi,Krhs) = tr(ji,jj,jk,jpgsi,Krhs) + zgrazdc * tr(ji,jj,jk,jpdsi,Kbb) / ( tr(ji,jj,jk,jpdia,Kbb) + rtrn )
          zgrabsi(ji,jj,jk)       = zgrazdc * tr(ji,jj,jk,jpdsi,Kbb) / ( tr(ji,jj,jk,jpdia,Kbb) + rtrn )
          !
@@ -308 +316 @@
          zprcaca = part2 * zprcaca
          tr(ji,jj,jk,jpdic,Krhs) = tr(ji,jj,jk,jpdic,Krhs) + zgrazcal - zprcaca
-         tr(ji,jj,jk,jptal,Krhs) = tr(ji,jj,jk,jptal,Krhs) - 2. * ( zgrazcal - zprcaca )
+         tr(ji,jj,jk,jptal,Krhs) = tr(ji,jj,jk,jptal,Krhs) + 2. * ( zgrazcal - zprcaca )
          tr(ji,jj,jk,jpcal,Krhs) = tr(ji,jj,jk,jpcal,Krhs) - zgrazcal + zprcaca