Changeset 2271

Timestamp:

2010-10-14T18:41:36+02:00 (14 years ago)

Author:

rblod

Message:

Fix global sum issue in sbcfwb see ticket #737

File:

• branches/nemo_v3_3_beta/NEMOGCM/NEMO/OPA_SRC/SBC/sbcfwb.F90 (modified) (7 diffs)

branches/nemo_v3_3_beta/NEMOGCM/NEMO/OPA_SRC/SBC/sbcfwb.F90

@@ -35 +35 @@
    REAL(wp) ::   area               ! global mean ocean surface (interior domain)
 
-   REAL(wp), DIMENSION(jpi,jpj) ::   e1e2_i    ! area of the interior domain (e1t*e2t*tmask_i)
+   REAL(wp), DIMENSION(jpi,jpj) ::   e1e2    ! area of the interior domain (e1t*e2t)
 
    !! * Substitutions
@@ -87 +87 @@
          ENDIF
          !
-         e1e2_i(:,:) = e1t(:,:) * e2t(:,:) * tmask_i(:,:)
-         area = glob_sum( e1e2_i(:,:) )   ! sum over the global domain
+         e1e2(:,:) = e1t(:,:) * e2t(:,:) 
+         area = glob_sum( e1e2(:,:) )   ! sum over the global domain
          !
       ENDIF
@@ -103 +103 @@
       CASE ( 1 )                               ! global mean fwf set to zero
          IF( MOD( kt-1, kn_fsbc ) == 0 ) THEN
-            z_fwf = glob_sum( e1e2_i(:,:) * ( emp(:,:) - rnf(:,:) ) ) / area   ! sum over the global domain
+            z_fwf = glob_sum( e1e2(:,:) * ( emp(:,:) - rnf(:,:) ) ) / area   ! sum over the global domain
             emp (:,:) = emp (:,:) - z_fwf 
             emps(:,:) = emps(:,:) - z_fwf 
@@ -127 +127 @@
          IF( MOD( kt, ikty ) == 0 ) THEN
             a_fwb_b = a_fwb
-            a_fwb   = glob_sum( e1e2_i(:,:) * sshn(:,:) )   ! sum over the global domain
+            a_fwb   = glob_sum( e1e2(:,:) * sshn(:,:) )   ! sum over the global domain
             a_fwb   = a_fwb * 1.e+3 / ( area * 86400. * 365. )     ! convert in Kg/m3/s = mm/s
 !!gm        !                                                      !!bug 365d year 
@@ -156 +156 @@
 
             ! Area filled by <0 and >0 erp 
-            zsurf_neg = SUM( e1e2_i(:,:)*ztmsk_neg(:,:) )
-            zsurf_pos = SUM( e1e2_i(:,:)*ztmsk_pos(:,:) )
+            zsurf_neg = glob_sum( e1e2(:,:)*ztmsk_neg(:,:) )
+            zsurf_pos = glob_sum( e1e2(:,:)*ztmsk_pos(:,:) )
         
             ! fwf global mean 
-            z_fwf = glob_sum( e1e2_i(:,:) * ( emp(:,:) - rnf(:,:) ) ) / area
-            IF( lk_mpp )   CALL  mpp_sum( z_fwf )
-            IF( lk_mpp )   CALL  mpp_sum( zsurf_neg )
-            IF( lk_mpp )   CALL  mpp_sum( zsurf_pos )
+            z_fwf = glob_sum( e1e2(:,:) * ( emp(:,:) - rnf(:,:) ) ) / area
             
             IF( z_fwf < 0.e0 ) THEN
@@ -176 +173 @@
 
             ! fwf global mean over <0 or >0 erp area
-            zsum_fwf = SUM( e1e2_i(:,:) * z_fwf )
-            IF( lk_mpp )   CALL  mpp_sum( zsum_fwf )
+            zsum_fwf = glob_sum( e1e2(:,:) * z_fwf )
             z_fwf_nsrf =  zsum_fwf / ( zsurf_tospread + rsmall )
             ! weight to respect erp field 2D structure 
-!!gm  Strange          
-            z_wgt(:,:) = ztmsk_tospread(:,:) * erp(:,:) / ( SUM( ztmsk_tospread(:,:) * erp(:,:) * e1e2_i(:,:) ) + rsmall )
+            zsum_erp = glob_sum( ztmsk_tospread(:,:) * erp(:,:) * e1e2(:,:) )
+            z_wgt(:,:) = ztmsk_tospread(:,:) * erp(:,:) / ( zsum_erp + rsmall )
+
             ! final correction term to apply
             zerp_cor(:,:) = -1. * z_fwf_nsrf * zsurf_tospread * z_wgt(:,:)
@@ -194 +191 @@
                IF( z_fwf < 0.e0 ) THEN
                   WRITE(numout,*)'       z_fwf < 0'
-                  WRITE(numout,*)'       SUM(erp+)        = ', SUM( ztmsk_tospread(:,:)*erp(:,:)*e1e2_i(:,:) )*1.e-3,' m3.s-1'
+                  WRITE(numout,*)'       SUM(erp+)        = ', SUM( ztmsk_tospread(:,:)*erp(:,:)*e1e2(:,:) )*1.e-3,' m3.s-1'
                ELSE
                    WRITE(numout,*)'      z_fwf >= 0'
-                   WRITE(numout,*)'      SUM(erp-)        = ', SUM( ztmsk_tospread(:,:)*erp(:,:)*e1e2_i(:,:) )*1.e-3,' m3.s-1'
+                   WRITE(numout,*)'      SUM(erp-)        = ', SUM( ztmsk_tospread(:,:)*erp(:,:)*e1e2(:,:) )*1.e-3,' m3.s-1'
                ENDIF
-               WRITE(numout,*)'      SUM(empG)        = ', SUM( z_fwf*e1e2_i(:,:) )*1.e-3,' m3.s-1'
+               WRITE(numout,*)'      SUM(empG)        = ', SUM( z_fwf*e1e2(:,:) )*1.e-3,' m3.s-1'
                WRITE(numout,*)'      z_fwf            = ', z_fwf      ,' mm.s-1'
                WRITE(numout,*)'      z_fwf_nsrf       = ', z_fwf_nsrf ,' mm.s-1'