Changeset 2457 for branches/nemo_v3_3_beta/NEMOGCM/NEMO/TOP_SRC/PISCES/p4zprod.F90

Timestamp:

2010-12-07T10:51:47+01:00 (14 years ago)

Author:

cetlod

Message:

Improve TOP & OFF components in v3.3beta, see ticket #774

File:

• branches/nemo_v3_3_beta/NEMOGCM/NEMO/TOP_SRC/PISCES/p4zprod.F90 (modified) (4 diffs)

branches/nemo_v3_3_beta/NEMOGCM/NEMO/TOP_SRC/PISCES/p4zprod.F90

@@ -23 +23 @@
 
    USE lib_mpp
+   USE lib_fortran
 
    IMPLICIT NONE
@@ -49 +50 @@
       texcret2                   ,  &  !: 1 - excret2        
       tpp                              !: Total primary production
-
-   INTEGER  ::  nspyr                  !: number of timesteps per year
 
    !!* Substitution
@@ -326 +325 @@
 
      ! Total primary production per year
-     DO jk = 1, jpkm1
-        DO jj = 1, jpj
-          DO ji = 1, jpi
-             zvol = cvol(ji,jj,jk)
+
 #if defined key_degrad
-             zvol = zvol * facvol(ji,jj,jk)
+     tpp = tpp + glob_sum( ( zprorca(:,:,:) + zprorcad(:,:,:) ) * cvol(:,:,:) * facvol(:,:,:) )
+#else
+     tpp = tpp + glob_sum( ( zprorca(:,:,:) + zprorcad(:,:,:) ) * cvol(:,:,:) )
 #endif
-             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( MOD( kt, nspyr ) == 0 .AND. jnt == nrdttrc ) THEN
-        IF( lk_mpp ) CALL mpp_sum( tpp )
-        WRITE(numout,*) 'Total PP :'
+
+     IF( kt == nitend .AND. jnt == nrdttrc ) THEN
+        WRITE(numout,*) 'Total PP (Gtc) :'
         WRITE(numout,*) '-------------------- : ',tpp * 12. / 1.E12
-        WRITE(numout,*) '(GtC/yr)'
-        tpp = 0.
+        WRITE(numout,*) 
       ENDIF
 
@@ -418 +408 @@
       ENDIF
 
-      ! number of timesteps per year
-      nspyr  = INT( nyear_len(1) * rday / rdt )
-
       texcret   = 1.0 - excret
       texcret2  = 1.0 - excret2