Changeset 617 for trunk/NEMO/TOP_SRC/SMS/p4zprod.F

Timestamp:

2007-02-21T14:03:10+01:00 (17 years ago)

Author:

opalod

Message:

* empty log message *

File:

• trunk/NEMO/TOP_SRC/SMS/p4zprod.F (modified) (9 diffs)

trunk/NEMO/TOP_SRC/SMS/p4zprod.F

@@ -55 +55 @@
       REAL prdia(jpi,jpj,jpk),prbio(jpi,jpj,jpk)
       REAL etot2(jpi,jpj,jpk),pislopead2(jpi,jpj,jpk)
-      REAL xlim,silfac2,siborn,zprod,zprod2
-      REAL zmxltst,zmxlday
+      REAL xlim,silfac2,siborn,zprod
+      REAL zmxltst,zmxlday,xlim1
 C
 C     Computation of the optimal production
@@ -128 +128 @@
 C
 C
+        xlim1=trn(ji,jj,jk,jpsil)/(trn(ji,jj,jk,jpsil)+xksi1)
         xlim=xdiatno3(ji,jj,jk)+xdiatnh4(ji,jj,jk)
 C
@@ -134 +135 @@
      &    trn(ji,jj,jk,jppo4)/(concdnh4+trn(ji,jj,jk,jppo4)),
      &    xlim)
-        silfac=5.4*exp(-4.23*silim)+1.13
+        silfac=5.4*exp(-4.23*silim)*max(0.,min(1.,2.2*(xlim1-0.5)))+1.
         siborn=max(0.,(trn(ji,jj,jk,jpsil)-15.E-6))
         silfac2=1.+3.*siborn/(siborn+xksi2)
-        silfac=min(7.6,silfac*silfac2)
+        silfac=min(6.4,silfac*silfac2)
 C
         ysopt(ji,jj,jk)=grosip*trn(ji,jj,jk,jpsil)/(trn(ji,jj,jk,jpsil)
@@ -195 +196 @@
 C     ----------------------------------------------------------
 C
+        pislopen(ji,jj,jk)=pislopead(ji,jj,jk)
+     &    *trn(ji,jj,jk,jpnch)/(rtrn+trn(ji,jj,jk,jpphy)*12.)
+     &    /(prmax(ji,jj,jk)*rjjss*max(0.1,xlimphy(ji,jj,jk))+rtrn)
+
         prbiochl = prmax(ji,jj,jk)
      &    *(1.-exp(-pislopen(ji,jj,jk)*etot2(ji,jj,jk)))
@@ -206 +211 @@
 C
         zprod=rjjss*prorca(ji,jj,jk)*prbiochl*trn(ji,jj,jk,jpphy)
-     &    *xlimphy(ji,jj,jk)
-
-        zprod2=rjjss*prorca(ji,jj,jk)*prbiochl*trn(ji,jj,jk,jpphy)
      &    *max(0.1,xlimphy(ji,jj,jk))
 
@@ -215 +217 @@
      &    +rtrn)
 
-        prorca6(ji,jj,jk) = chlcnm*144.*zprod2/(pislopead(ji,jj,jk)
-     &    *etot2(ji,jj,jk)*max(trn(ji,jj,jk,jpnch),1.E-10)+rtrn)
+        prorca6(ji,jj,jk) = chlcnm*144.*zprod/(pislopead(ji,jj,jk)
+     &    *etot2(ji,jj,jk)*trn(ji,jj,jk,jpnch)+rtrn)
 
             END DO
@@ -229 +231 @@
 C       -------------------------------------------------------
 C
+        pislope2n(ji,jj,jk)=pislopead2(ji,jj,jk)
+     &    *trn(ji,jj,jk,jpdch)/(rtrn+trn(ji,jj,jk,jpdia)*12.)
+     &    /(prmax(ji,jj,jk)*rjjss*max(0.1,xlimdia(ji,jj,jk))+rtrn)
+
         prdiachl = prmax(ji,jj,jk)
      &    *(1.-exp(-etot2(ji,jj,jk)*pislope2n(ji,jj,jk)))
@@ -243 +249 @@
      &    *max(0.1,xlimdia(ji,jj,jk))
 
-        zprod2=rjjss*prorca2(ji,jj,jk)*prdiachl*xlimdia2(ji,jj,jk)
-     &    *trn(ji,jj,jk,jpdia)
-
-C
-        prorca4(ji,jj,jk) = (fecdm)**2*zprod2/chlcdm
+C
+        prorca4(ji,jj,jk) = (fecdm)**2*zprod/chlcdm
      &    /(pislopead2(ji,jj,jk)*etot2(ji,jj,jk)*trn(ji,jj,jk,jpdfe)
      &    +rtrn)
 C
         prorca7(ji,jj,jk) = chlcdm*144.*zprod/(pislopead2(ji,jj,jk)
-     &    *etot2(ji,jj,jk)*max(trn(ji,jj,jk,jpdch),1.E-10)+rtrn)
+     &    *etot2(ji,jj,jk)*trn(ji,jj,jk,jpdch)+rtrn)
 C
             END DO
@@ -261 +264 @@
       RETURN
       END
-