Changeset 1298 for trunk/NEMO/TOP_SRC/PISCES/p4zprod.F90

Timestamp:

2009-02-09T09:48:20+01:00 (15 years ago)

Author:

cetlod

Message:

correction of minor bug in PISCES model ( mpi case ), see ticket:327

File:

• trunk/NEMO/TOP_SRC/PISCES/p4zprod.F90 (modified) (8 diffs)

trunk/NEMO/TOP_SRC/PISCES/p4zprod.F90

@@ -47 +47 @@
       texcret2                   ,  &  !: 1 - excret2        
       rpis180                    ,  &  !: rpi / 180
-      tpp = 0.                         !: Total primary production
+      tpp                              !: Total primary production
 
    !!* Substitution
@@ -233 +233 @@
       END DO
 
-!     Computation of the fractionnal day length
-!     -----------------------------------------
-!      zstrn(:,:) = strn(:,:)
 
       WHERE( zstrn(:,:) < 1.e0 ) zstrn(:,:) = 24.
       zstrn(:,:) = 24. / zstrn(:,:)
-!      DO jj = 1, jpj
-!         DO ji = 1, jpi
-!
-!      Computation of the maximum light intensity
-!      ------------------------------------------
-!            IF( zstrn(ji,jj) < 1.e0 )   zstrn(ji,jj) = 24.
-!            zstrn(ji,jj) = 24. / zstrn(ji,jj)
-!         END DO
-!      END DO
 
 !CDIR NOVERRCHK
@@ -257 +245 @@
 
                IF( etot(ji,jj,jk) > 1.E-3 ) THEN
-!     Computation of the various production terms for nanophyto.
-!     ----------------------------------------------------------
+                  !     Computation of the various production terms for nanophyto.
                   zetot2 = enano(ji,jj,jk) * zstrn(ji,jj)
                   zmax = MAX( 0.1, xlimphy(ji,jj,jk) )
@@ -290 +277 @@
             DO ji = 1, jpi
                IF( etot(ji,jj,jk) > 1.E-3 ) THEN
-!       Computation of the various production terms for diatoms
-!       -------------------------------------------------------
+                  !  Computation of the various production terms for diatoms
                   zetot2 = ediat(ji,jj,jk) * zstrn(ji,jj)
                   zmax = MAX( 0.1, xlimdia(ji,jj,jk) )
@@ -319 +305 @@
       !
 
-!
-!   Update the arrays TRA which contain the biological sources and sinks
-!   --------------------------------------------------------------------
-
+      !   Update the arrays TRA which contain the biological sources and sinks
       DO jk = 1, jpkm1
          DO jj = 1, jpj
@@ -361 +344 @@
              zvol = zvol * facvol(ji,jj,jk)
 #endif
-             tpp  = tpp + ( zprorca(ji,jj,jk) + zprorcad(ji,jj,jk) ) * zvol
+             tpp  = tpp + ( zprorca(ji,jj,jk) + zprorcad(ji,jj,jk) ) &
+                          * zvol * tmask(ji,jj,jk) * tmask_i(ji,jj)
           END DO
         END DO
       END DO
 
-      IF( lk_mpp ) CALL mpp_sum( tpp )
 
       IF( MOD( kt, nspyr ) == 0 ) THEN
+        IF( lk_mpp ) CALL mpp_sum( tpp )
         WRITE(numout,*) 'Total PP :'
         WRITE(numout,*) '-------------------- : ',tpp * 12. / 1.E12
@@ -377 +361 @@
 #if defined key_trc_dia3d
       zrfact2 = 1.e3 * rfact2r
-!   Supplementary diagnostics
-!   -------------------------
+      !   Supplementary diagnostics
       trc3d(:,:,:,jp_pcs0_3d + 3)  = etot(:,:,:)
       trc3d(:,:,:,jp_pcs0_3d + 4)  = zprorca(:,:,:)  * zrfact2
@@ -437 +420 @@
       texcret   = 1.0 - excret
       texcret2  = 1.0 - excret2
+      tpp       = 0.
 
    END SUBROUTINE p4z_prod_init