Changeset 2819 for branches/2011/dev_r2787_LOCEAN3_TRA_TRP/NEMOGCM/NEMO/TOP_SRC/trcrst.F90

Timestamp:

2011-08-09T10:29:53+02:00 (13 years ago)

Author:

cetlod

Message:

Improvment of branch dev_r2787_LOCEAN3_TRA_TRP

File:

• branches/2011/dev_r2787_LOCEAN3_TRA_TRP/NEMOGCM/NEMO/TOP_SRC/trcrst.F90 (modified) (2 diffs)

branches/2011/dev_r2787_LOCEAN3_TRA_TRP/NEMOGCM/NEMO/TOP_SRC/trcrst.F90

@@ -285 +285 @@
 
       INTEGER  :: jn
-      REAL(wp) :: zdiag_var, zdiag_varmin, zdiag_varmax, zdiag_tot
-      REAL(wp) :: zder
+      REAL(wp) :: ztraf, zmin, zmax, zmean, zdrift
       !!----------------------------------------------------------------------
 
@@ -296 +295 @@
       ENDIF
       
-      zdiag_tot = 0.e0
-      DO jn = 1, jptra
-#  if defined key_degrad
-         zdiag_var = glob_sum( trn(:,:,:,jn) * cvol(:,:,:) * facvol(:,:,:) )
-#  else
-         zdiag_var = glob_sum( trn(:,:,:,jn) * cvol(:,:,:)  )
-#  endif
-         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.)) )
+      DO jn = 1, jptra
+         IF( .NOT.lk_degrad )  THEN  ;  ztraf = glob_sum( trn(:,:,:,jn) * cvol(:,:,:) )
+         ELSE                        ;  ztraf = glob_sum( trn(:,:,:,jn) * cvol(:,:,:) * facvol(:,:,:) )
+         ENDIF
+         zmin = MINVAL( trn(:,:,:,jn), mask= ((tmask*SPREAD(tmask_i,DIM=3,NCOPIES=jpk).NE.0.)) )
+         zmax = MAXVAL( trn(:,:,:,jn), mask= ((tmask*SPREAD(tmask_i,DIM=3,NCOPIES=jpk).NE.0.)) )
          IF( lk_mpp ) THEN
-            CALL mpp_min( zdiag_varmin )      ! min over the global domain
-            CALL mpp_max( zdiag_varmax )      ! max over the global domain
+            CALL mpp_min( zmin )      ! min over the global domain
+            CALL mpp_max( zmax )      ! max over the global domain
          END IF
-         zdiag_tot = zdiag_tot + zdiag_var
-         zdiag_var = zdiag_var / areatot
-         IF(lwp) WRITE(numout,*) '   MEAN NO ', jn, ctrcnm(jn), ' = ', zdiag_var,   &
-            &                    ' MIN = ', zdiag_varmin, ' MAX = ', zdiag_varmax
-      END DO
-      
-      zder = ( ( zdiag_tot - trai ) / ( trai + 1.e-12 )  ) * 100._wp
-      IF(lwp) WRITE(numout,*) '   Integral of all tracers over the full domain  = ', zdiag_tot
-      IF(lwp) WRITE(numout,*) '   Drift of the sum of all tracers =', zder, ' %'
+         zmean  = ztraf / areatot
+         zdrift = ( ( ztraf - trai(jn) ) / ( trai(jn) + 1.e-12 )  ) * 100._wp
+         IF(lwp) WRITE(numout,*) ' tracer nb : ', jn,'   ', TRIM( ctrcnm(jn) ) , &
+            &    ' mean = ', zmean, ' min = ', zmin, ' max = ', zmax, ' drift = ', zdrift, ' %'
+      END DO
+      WRITE(numout,*) 
       
    END SUBROUTINE trc_rst_stat