Changeset 10368 for NEMO/branches/2018/dev_r10164_HPC09_ESIWACE_PREP_MERGE/src/TOP/PISCES/P4Z/p4zpoc.F90

Timestamp:

2018-12-03T12:45:01+01:00 (5 years ago)

Author:

smasson

Message:

dev_r10164_HPC09_ESIWACE_PREP_MERGE: merge with trunk@10365, see #2133

File:

• NEMO/branches/2018/dev_r10164_HPC09_ESIWACE_PREP_MERGE/src/TOP/PISCES/P4Z/p4zpoc.F90 (modified) (7 diffs)

NEMO/branches/2018/dev_r10164_HPC09_ESIWACE_PREP_MERGE/src/TOP/PISCES/P4Z/p4zpoc.F90

@@ -62 +62 @@
       CHARACTER (len=25) :: charout
       REAL(wp), DIMENSION(jpi,jpj  )   :: totprod, totthick, totcons 
-      REAL(wp), DIMENSION(jpi,jpj,jpk)   :: zremipoc, zremigoc, zorem3, ztremint
+      REAL(wp), DIMENSION(jpi,jpj,jpk)   :: zremipoc, zremigoc, zorem3, ztremint, zfolimi
       REAL(wp), DIMENSION(jpi,jpj,jpk,jcpoc) :: alphag
       !!---------------------------------------------------------------------
@@ -90 +90 @@
       orem  (:,:,:)   = 0.
       ztremint(:,:,:) = 0.
+      zfolimi (:,:,:) = 0.
 
       DO jn = 1, jcpoc
@@ -209 +210 @@
                   tra(ji,jj,jk,jpdoc) = tra(ji,jj,jk,jpdoc) + zorem2
                   tra(ji,jj,jk,jpfer) = tra(ji,jj,jk,jpfer) + zofer2
+                  zfolimi(ji,jj,jk)   = zofer2
                END DO
             END DO
@@ -239 +241 @@
                   tra(ji,jj,jk,jpgop) = tra(ji,jj,jk,jpgop) - zopop2 * (1. + solgoc)
                   tra(ji,jj,jk,jpbfe) = tra(ji,jj,jk,jpbfe) - zofer2 * (1. + solgoc)
+                  zfolimi(ji,jj,jk)   = zofer2
                END DO
             END DO
@@ -414 +417 @@
                     tra(ji,jj,jk,jppoc) = tra(ji,jj,jk,jppoc) - zorem
                     tra(ji,jj,jk,jpsfe) = tra(ji,jj,jk,jpsfe) - zofer
+                    zfolimi(ji,jj,jk)   = zfolimi(ji,jj,jk) + zofer
                   ENDIF
                END DO
@@ -439 +443 @@
                 tra(ji,jj,jk,jpdop) = tra(ji,jj,jk,jpdop) + zopop 
                 tra(ji,jj,jk,jpfer) = tra(ji,jj,jk,jpfer) + zofer 
+                zfolimi(ji,jj,jk)   = zfolimi(ji,jj,jk) + zofer
              END DO
            END DO
@@ -449 +454 @@
           CALL iom_put( "REMINP" , zremipoc(:,:,:) * tmask(:,:,:) )  ! Remineralisation rate
           CALL iom_put( "REMING" , zremigoc(:,:,:) * tmask(:,:,:) )  ! Remineralisation rate
+          CALL iom_put( "REMINF" , zfolimi(:,:,:)  * tmask(:,:,:)  * 1.e+9 * zrfact2 )  ! Remineralisation rate
         ENDIF
      ENDIF