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

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

@@ -33 +33 @@
    USE prtctl_trc      ! Print control passive tracers (prt_ctl_trc_init routine)
    USE lib_mpp         ! distributed memory computing library
+   USE lib_fortran     ! 
    
    IMPLICIT NONE
@@ -67 +68 @@
       !                 ! masked grid volume
       DO jk = 1, jpk
-         cvol(:,:,jk) = e1t(:,:) * e2t(:,:) * fse3t(:,:,jk) * tmask(:,:,jk) * tmask_i(:,:)
+         cvol(:,:,jk) = e1t(:,:) * e2t(:,:) * fse3t(:,:,jk) * tmask(:,:,jk) 
       END DO
 
       ! total volume of the ocean
 #if ! defined key_degrad
-      areatot = SUM( cvol(:,:,:) )
+      areatot = glob_sum( cvol(:,:,:) )
 #else
-      areatot = SUM( cvol(:,:,:) * facvol(:,:,:) )  ! degrad option: reduction by facvol
+      areatot = glob_sum( cvol(:,:,:) * facvol(:,:,:) )  ! degrad option: reduction by facvol
 #endif
-      IF( lk_mpp )   CALL mpp_sum( areatot )        ! sum over the global domain  
 
                                   CALL trc_nam      ! read passive tracers namelists
@@ -146 +146 @@
       DO jn = 1, jptra
 #if ! defined key_degrad
-         trai = trai + SUM( trn(:,:,:,jn) * cvol(:,:,:) )
+         trai = trai + glob_sum( trn(:,:,:,jn) * cvol(:,:,:) )
 #else
-         trai = trai + SUM( trn(:,:,:,jn) * cvol(:,:,:) * facvol(:,:,:) ) ! degrad option: reduction by facvol
+         trai = trai + glob_sum( trn(:,:,:,jn) * cvol(:,:,:) * facvol(:,:,:) ) ! degrad option: reduction by facvol
 #endif
       END DO      
-      IF( lk_mpp )   CALL mpp_sum( trai )     ! sum over the global domain  
-
 
       !                 ! control print