Changeset 7174 for branches/2016/dev_r7012_ROBUST5_CNRS/NEMOGCM/NEMO/TOP_SRC/PISCES/P4Z/p4zfechem.F90

Timestamp:

2016-11-03T16:02:51+01:00 (7 years ago)

Author:

cetlod

Message:

new top interface : minor improvments of PISCES

File:

• branches/2016/dev_r7012_ROBUST5_CNRS/NEMOGCM/NEMO/TOP_SRC/PISCES/P4Z/p4zfechem.F90 (modified) (1 diff)

branches/2016/dev_r7012_ROBUST5_CNRS/NEMOGCM/NEMO/TOP_SRC/PISCES/P4Z/p4zfechem.F90

@@ -250 +250 @@
                   zfecoll = ( 0.3 * zFeL1(ji,jj,jk) + 0.5 * zFeL2(ji,jj,jk) ) * 1E-9
                ELSE
+                  zfeequi = zFe3(ji,jj,jk) * 1E-9
                   IF (ln_fecolloid) THEN
-                     zfeequi = zFe3(ji,jj,jk) * 1E-9
                      zhplus   = max( rtrn, hi(ji,jj,jk) )
-                     fe3sol  = fesol(ji,jj,jk,1) * ( fesol(ji,jj,jk,2) * zhplus**2  &
+                     fe3sol  = fesol(ji,jj,jk,1) * ( zhplus**3 + fesol(ji,jj,jk,2) * zhplus**2  &
                      &         + fesol(ji,jj,jk,3) * zhplus + fesol(ji,jj,jk,4)     &
                      &         + fesol(ji,jj,jk,5) / zhplus )
                      zfecoll = max( ( 0.1 * zFeL1(ji,jj,jk) * 1E-9 ), ( zFeL1(ji,jj,jk) * 1E-9 -fe3sol ) )
                   ELSE
-                     zfeequi = zFe3(ji,jj,jk) * 1E-9 
                      zfecoll = 0.5 * zFeL1(ji,jj,jk) * 1E-9
                      fe3sol  = 0.
-                     kfep    = 0.
                   ENDIF
                ENDIF
+               !
                ztrc   = ( trb(ji,jj,jk,jppoc) + trb(ji,jj,jk,jpgoc) + trb(ji,jj,jk,jpcal) + trb(ji,jj,jk,jpgsi) ) * 1.e6 
                IF( ln_dust )  zdust  = dust(ji,jj) / ( wdust / rday ) * tmask(ji,jj,jk) ! dust in kg/m2/s