Changeset 7766 for branches/NERC/dev_r5518_NOC_MEDUSA_Stable/NEMOGCM/NEMO/TOP_SRC/trcrst.F90

Timestamp:

2017-03-07T19:30:03+01:00 (7 years ago)

Author:

jpalmier

Message:

JPALM -- adapted MEDUSA_SBC to coupled mode, and merged this branch with RICHARD s fixes_part2 branch

File:

• branches/NERC/dev_r5518_NOC_MEDUSA_Stable/NEMOGCM/NEMO/TOP_SRC/trcrst.F90 (modified) (5 diffs)

branches/NERC/dev_r5518_NOC_MEDUSA_Stable/NEMOGCM/NEMO/TOP_SRC/trcrst.F90

@@ -686 +686 @@
       !!----------------------------------------------------------------------
       INTEGER  :: jk, jn
-      REAL(wp) :: ztraf, zmin, zmax, zmean, zdrift
+      REAL(wp) :: ztraf, zmin, zmax, zmean, zdrift, areasf
       REAL(wp), DIMENSION(jpi,jpj) :: zvol
       !!----------------------------------------------------------------------
@@ -696 +696 @@
       ENDIF
       !
-         zvol(:,:) = e1e2t(:,:) * fse3t_a(:,:,1) * tmask(:,:,1)
+      zvol(:,:) = e1e2t(:,:) * fse3t_a(:,:,1) * tmask(:,:,1)
+      areasf = glob_sum(zvol(:,:))
       DO jn = 1, jptra
          ztraf = glob_sum( tra(:,:,1,jn) * zvol(:,:) )
@@ -705 +706 @@
             CALL mpp_max( zmax )      ! max over the global domain
          END IF
-         zmean  = ztraf / areatot
+         zmean  = ztraf / areasf
          IF(lwp) WRITE(numout,9001) jn, TRIM( ctrcnm(jn) ), zmean, zmin, zmax
       END DO
@@ -734 +735 @@
       zvol(:,:) = e1e2t(:,:) * fse3t_a(:,:,1) * tmask(:,:,1)
       ztraf = glob_sum( dgtr(:,:) * zvol(:,:) )
-      areasf = glob_sum(e1e2t(:,:) * tmask(:,:,1) )
+      !! areasf = glob_sum(e1e2t(:,:) * tmask(:,:,1) )
+      areasf = glob_sum(zvol(:,:))
       zmin  = MINVAL( dgtr(:,:), mask= ((tmask(:,:,1).NE.0.)) )
       zmax  = MAXVAL( dgtr(:,:), mask= ((tmask(:,:,1).NE.0.)) )
@@ -741 +743 @@
          CALL mpp_max( zmax )      ! max over the global domain
       END IF
-      zmean  = ztraf / areatot
+      zmean  = ztraf / areasf
       IF(lwp) WRITE(numout,9002) TRIM( names ), zmean, zmin, zmax
       !