Changeset 4529 for trunk/NEMOGCM/NEMO/TOP_SRC/PISCES/P4Z/p4zmicro.F90

Timestamp:

2014-03-15T12:00:04+01:00 (10 years ago)

Author:

cetlod

Message:

Bugfix and minor improvment on PISCES, see ticket #1258

File:

• trunk/NEMOGCM/NEMO/TOP_SRC/PISCES/P4Z/p4zmicro.F90 (modified) (5 diffs)

trunk/NEMOGCM/NEMO/TOP_SRC/PISCES/P4Z/p4zmicro.F90

@@ -72 +72 @@
       INTEGER  :: ji, jj, jk
       REAL(wp) :: zcompadi, zcompaz , zcompaph, zcompapoc
-      REAL(wp) :: zgraze  , zdenom, zdenom2, zncratio
+      REAL(wp) :: zgraze  , zdenom, zdenom2
       REAL(wp) :: zfact   , zstep, zfood, zfoodlim
-      REAL(wp) :: zepshert, zepsherv, zgrarsig, zgraztot, zgraztotf
+      REAL(wp) :: zepshert, zepsherv, zgrarsig, zgraztot, zgraztotn, zgraztotf
       REAL(wp) :: zgrarem, zgrafer, zgrapoc, zprcaca, zmortz
-      REAL(wp) :: zrespz, ztortz, zgrasrat
+      REAL(wp) :: zrespz, ztortz, zgrasrat, zgrasratn
       REAL(wp) :: zgrazp, zgrazm, zgrazsd
       REAL(wp) :: zgrazmf, zgrazsf, zgrazpf
@@ -91 +91 @@
          DO jj = 1, jpj
             DO ji = 1, jpi
-               zcompaz = MAX( ( trn(ji,jj,jk,jpzoo) - 1.e-8 ), 0.e0 )
+               zcompaz = MAX( ( trn(ji,jj,jk,jpzoo) - 1.e-9 ), 0.e0 )
                zstep   = xstep
 # if defined key_degrad
@@ -130 +130 @@
                zgraztot  = zgrazp  + zgrazm  + zgrazsd 
                zgraztotf = zgrazpf + zgrazsf + zgrazmf 
+               zgraztotn = zgrazp * quotan(ji,jj,jk) + zgrazm + zgrazsd * quotad(ji,jj,jk)
 
                ! Grazing by microzooplankton
@@ -137 +138 @@
                !    --------------------------------------------
                zgrasrat  = zgraztotf / ( zgraztot + rtrn )
-               zncratio  = ( xpref2p * zcompaph * quotan(ji,jj,jk) &
-                  &        + xpref2d * zcompadi * quotad(ji,jj,jk) + xpref2c * zcompapoc ) / ( zfood + rtrn )
-               zepshert  = epsher * MIN( 1., zncratio )
-               zepsherv  = zepshert * MIN( 1., zgrasrat / ferat3 )
+               zgrasratn = zgraztotn / ( zgraztot + rtrn )
+               zepshert  =  MIN( 1., zgrasratn, zgrasrat / ferat3)
+               zepsherv  = zepshert * MIN( epsher, (1. - unass) * zgrasrat / ferat3, (1. - unass) * zgrasratn )
                zgrafer   = zgraztot * MAX( 0. , ( 1. - unass ) * zgrasrat - ferat3 * zepsherv ) 
                zgrarem   = zgraztot * ( 1. - zepsherv - unass )
@@ -174 +174 @@
                tra(ji,jj,jk,jppoc) = tra(ji,jj,jk,jppoc) + zmortz - zgrazm
                tra(ji,jj,jk,jpsfe) = tra(ji,jj,jk,jpsfe) + ferat3 * zmortz - zgrazmf
-               zprcaca = xfracal(ji,jj,jk) * zgrazp
                !
                ! calcite production
+               zprcaca = xfracal(ji,jj,jk) * zgrazp
                prodcal(ji,jj,jk) = prodcal(ji,jj,jk) + zprcaca  ! prodcal=prodcal(nanophy)+prodcal(microzoo)+prodcal(mesozoo)
                !