Changeset 2457 for branches/nemo_v3_3_beta/NEMOGCM/NEMO/TOP_SRC/trcrst.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/trcrst.F90 (modified) (3 diffs)

branches/nemo_v3_3_beta/NEMOGCM/NEMO/TOP_SRC/trcrst.F90

@@ -27 +27 @@
    USE trcnam_trp
    USE lib_mpp
+   USE lib_fortran
    USE iom
    USE trcrst_cfc      ! CFC      
@@ -317 +318 @@
       zdiag_tot = 0.e0
       DO jn = 1, jptra
-         zdiag_var    = 0.e0
-         zdiag_varmin = 0.e0
-         zdiag_varmax = 0.e0
-         DO jk = 1, jpk
-            DO jj = 1, jpj
-               DO ji = 1, jpi
-                  zvol = cvol(ji,jj,jk)
 #  if defined key_degrad
-                  zvol = zvol * facvol(ji,jj,jk)
+         zdiag_var = glob_sum( trn(:,:,:,jn) * cvol(:,:,:) * facvol(:,:,:) )
+#  else
+         zdiag_var = glob_sum( trn(:,:,:,jn) * cvol(:,:,:)  )
 #  endif
-                  zdiag_var = zdiag_var + trn(ji,jj,jk,jn) * zvol
-               END DO
-            END DO
-         END DO
-         
          zdiag_varmin = MINVAL( trn(:,:,:,jn), mask= ((tmask*SPREAD(tmask_i,DIM=3,NCOPIES=jpk).NE.0.)) )
          zdiag_varmax = MAXVAL( trn(:,:,:,jn), mask= ((tmask*SPREAD(tmask_i,DIM=3,NCOPIES=jpk).NE.0.)) )
@@ -337 +328 @@
             CALL mpp_min( zdiag_varmin )      ! min over the global domain
             CALL mpp_max( zdiag_varmax )      ! max over the global domain
-            CALL mpp_sum( zdiag_var    )      ! sum over the global domain
          END IF
          zdiag_tot = zdiag_tot + zdiag_var