Changeset 4616 for branches/2014/dev_CNRS0_NOC1_LDF/NEMOGCM/NEMO/OPA_SRC/DIA/diafwb.F90

Timestamp:

2014-04-06T17:28:25+02:00 (10 years ago)

Author:

gm

Message:

#1260 : see the associated wiki page for explanation

File:

• branches/2014/dev_CNRS0_NOC1_LDF/NEMOGCM/NEMO/OPA_SRC/DIA/diafwb.F90 (modified) (6 diffs)

branches/2014/dev_CNRS0_NOC1_LDF/NEMOGCM/NEMO/OPA_SRC/DIA/diafwb.F90

@@ -9 +9 @@
    !!----------------------------------------------------------------------
 #if ! defined key_coupled
- 
-   !!----------------------------------------------------------------------
-   !!   Only for ORCA2 ORCA1 and ORCA025
+   !!----------------------------------------------------------------------
+   !!   Only for ORCA2 ORCA1 and ORCA025 and not coupled case
    !!----------------------------------------------------------------------
    !!----------------------------------------------------------------------
@@ -21 +20 @@
    USE sbc_oce         ! ???
    USE zdf_oce         ! ocean vertical physics
+   !
    USE in_out_manager  ! I/O manager
    USE lib_mpp         ! distributed memory computing library
+   USE lib_fortran    ! Fortran utilities
    USE timing          ! preformance summary
 
@@ -44 +45 @@
    !! Software governed by the CeCILL licence (NEMOGCM/NEMO_CeCILL.txt)
    !!----------------------------------------------------------------------
-
 CONTAINS
 
@@ -77 +77 @@
          a_salb   = 0.e0 ! valeur de sal au debut de la simulation
          ! sshb used because diafwb called after tranxt (i.e. after the swap)
-         a_sshb = SUM( e1t(:,:) * e2t(:,:) * sshb(:,:) * tmask_i(:,:) )
-         IF( lk_mpp )   CALL mpp_sum( a_sshb )      ! sum over the global domain
+         a_sshb = glob_sum(  e1e2t(:,:) * sshb(:,:)  )     ! sum over the global domain
 
          DO jk = 1, jpkm1
             DO jj = 2, jpjm1
                DO ji = fs_2, fs_jpim1   ! vector opt.
-                  zwei  = e1t(ji,jj) * e2t(ji,jj) * fse3t(ji,jj,jk) * tmask(ji,jj,jk) * tmask_i(ji,jj)
-                  a_salb = a_salb + ( tsb(ji,jj,jk,jp_sal) - zsm0 ) * zwei
+                  zwei   = e1e2t(ji,jj) * fse3t(ji,jj,jk) * tmask(ji,jj,jk) * tmask_i(ji,jj)
+                  a_salb = a_salb + zwei * ( tsb(ji,jj,jk,jp_sal) - zsm0 )
                END DO
             END DO
@@ -91 +90 @@
       ENDIF
       
-      a_fwf    = SUM( e1t(:,:) * e2t(:,:) * ( emp(:,:)-rnf(:,:) ) * tmask_i(:,:) ) 
-      IF( lk_mpp )   CALL mpp_sum( a_fwf    )       ! sum over the global domain
+      a_fwf = glob_sum(  e1e2t(:,:) * ( emp(:,:)-rnf(:,:) )  )    ! sum over the global domain
 
       IF( kt == nitend ) THEN
@@ -101 +99 @@
          zfwfnew = 0.e0
          ! Mean sea level at nitend
-         a_sshn = SUM( e1t(:,:) * e2t(:,:) * sshn(:,:) * tmask_i(:,:) )
-         IF( lk_mpp )   CALL mpp_sum( a_sshn )      ! sum over the global domain
-         zarea  = SUM( e1t(:,:) * e2t(:,:) *             tmask_i(:,:) )
-         IF( lk_mpp )   CALL mpp_sum( zarea  )      ! sum over the global domain
+         a_sshn = glob_sum( e1e2t(:,:) * sshn(:,:) )     ! sum over the global domain
+         zarea  = glob_sum( e1e2t(:,:) )                 ! sum over the global domain (tmask_i included)
          
          DO jk = 1, jpkm1   
             DO jj = 2, jpjm1
                DO ji = fs_2, fs_jpim1   ! vector opt.
-                  zwei  = e1t(ji,jj) * e2t(ji,jj) * fse3t(ji,jj,jk) * tmask(ji,jj,jk) * tmask_i(ji,jj)
-                  a_saln = a_saln + ( tsn(ji,jj,jk,jp_sal) - zsm0 ) * zwei
-                  zvol  = zvol  + zwei
+                  zwei  = e1e2t(ji,jj) * fse3t(ji,jj,jk) * tmask(ji,jj,jk) * tmask_i(ji,jj)
+                  a_saln = a_saln + zwei * ( tsn(ji,jj,jk,jp_sal) - zsm0 )
+                  zvol   = zvol   + zwei
                END DO
             END DO