Changeset 10297 for NEMO/branches/2018/dev_r10164_HPC09_ESIWACE_PREP_MERGE/src/TOP

Timestamp:

2018-11-12T16:20:57+01:00 (5 years ago)

Author:

smasson

Message:

dev_r10164_HPC09_ESIWACE_PREP_MERGE: action 2a: add report calls of mppmin/max/sum, see #2133

Location:

NEMO/branches/2018/dev_r10164_HPC09_ESIWACE_PREP_MERGE/src/TOP

Files:

• PISCES/P4Z/p4zsink.F90 (modified) (1 diff)
• PISCES/trcini_pisces.F90 (modified) (2 diffs)
• TRP/trdmxl_trc.F90 (modified) (1 diff)
• trcini.F90 (modified) (1 diff)
• trcnam.F90 (modified) (3 diffs)
• trcrst.F90 (modified) (1 diff)
• trcsub.F90 (modified) (1 diff)

NEMO/branches/2018/dev_r10164_HPC09_ESIWACE_PREP_MERGE/src/TOP/PISCES/P4Z/p4zsink.F90

@@ -124 +124 @@
         END DO
         IF( lk_mpp ) THEN
-           CALL mpp_max( iiter1 )
-           CALL mpp_max( iiter2 )
+           CALL mpp_max( 'p4zsink', iiter1 )
+           CALL mpp_max( 'p4zsink', iiter2 )
         ENDIF
         iiter1 = MIN( iiter1, niter1max )

NEMO/branches/2018/dev_r10164_HPC09_ESIWACE_PREP_MERGE/src/TOP/PISCES/trcini_pisces.F90

@@ -117 +117 @@
       ENDIF
       !
-      IF( lk_mpp    )   CALL mpp_sum( ierr )
+      IF( lk_mpp    )   CALL mpp_sum( 'trcini_pisces', ierr )
       IF( ierr /= 0 )   CALL ctl_stop( 'STOP', 'pisces_alloc: unable to allocate PISCES arrays' )
       !
@@ -299 +299 @@
       ierr = ierr + p2z_exp_alloc()
       !
-      IF( lk_mpp    )   CALL mpp_sum( ierr )
+      IF( lk_mpp    )   CALL mpp_sum( 'trcini_pisces', ierr )
       IF( ierr /= 0 )   CALL ctl_stop( 'STOP', 'p2z_ini: unable to allocate LOBSTER arrays' )
 

NEMO/branches/2018/dev_r10164_HPC09_ESIWACE_PREP_MERGE/src/TOP/TRP/trdmxl_trc.F90

@@ -64 +64 @@
          &      ndextrd1(jpi*jpj), nidtrd(jptra), nh_t(jptra),  STAT=trd_mxl_trc_alloc)
          !
-      IF( lk_mpp                )   CALL mpp_sum ( trd_mxl_trc_alloc )
+      IF( lk_mpp                )   CALL mpp_sum ( 'trdmxl_trc', trd_mxl_trc_alloc )
       IF( trd_mxl_trc_alloc /=0 )   CALL ctl_warn('trd_mxl_trc_alloc: failed to allocate arrays')
       !

NEMO/branches/2018/dev_r10164_HPC09_ESIWACE_PREP_MERGE/src/TOP/trcini.F90

@@ -289 +289 @@
 #endif
       !
-      IF( lk_mpp    )   CALL mpp_sum( ierr )
+      IF( lk_mpp    )   CALL mpp_sum( 'trcini', ierr )
       IF( ierr /= 0 )   CALL ctl_stop( 'STOP', 'top_alloc : unable to allocate standard ocean arrays' )
       !

NEMO/branches/2018/dev_r10164_HPC09_ESIWACE_PREP_MERGE/src/TOP/trcnam.F90

@@ -23 +23 @@
    USE trdtrc_oce  !
    USE iom         ! I/O manager
+   USE lib_mpp, ONLY: ncom_dttrc
 
    IMPLICIT NONE
@@ -76 +77 @@
       ENDIF
       !
-      rdttrc = rdt * FLOAT( nn_dttrc )          ! passive tracer time-step
+      rdttrc = rdt * FLOAT( nn_dttrc )          ! passive tracer time-step      
       ! 
       IF(lwp) THEN                              ! control print
@@ -128 +129 @@
       ENDIF
       !
-    END SUBROUTINE trc_nam_run
+#if defined key_mpp_mpi
+      ncom_dttrc = nn_dttrc    ! make nn_fsbc available for lib_mpp
+#endif
+      !
+   END SUBROUTINE trc_nam_run
 
 

NEMO/branches/2018/dev_r10164_HPC09_ESIWACE_PREP_MERGE/src/TOP/trcrst.F90

@@ -320 +320 @@
          zmax  = MAXVAL( trn(:,:,:,jn), mask= ((tmask*SPREAD(tmask_i,DIM=3,NCOPIES=jpk).NE.0.)) )
          IF( lk_mpp ) THEN
-            CALL mpp_min( zmin )      ! min over the global domain
-            CALL mpp_max( zmax )      ! max over the global domain
+            CALL mpp_min( 'trcrst', zmin )      ! min over the global domain
+            CALL mpp_max( 'trcrst', zmax )      ! max over the global domain
          END IF
          zmean  = ztraf / areatot

NEMO/branches/2018/dev_r10164_HPC09_ESIWACE_PREP_MERGE/src/TOP/trcsub.F90

@@ -308 +308 @@
 
       ierr =  trc_sub_alloc    ()
-      IF( lk_mpp    )   CALL mpp_sum( ierr )
+      IF( lk_mpp    )   CALL mpp_sum( 'trcsub', ierr )
       IF( ierr /= 0 )   CALL ctl_stop( 'STOP', 'top_sub_alloc : unable to allocate standard ocean arrays' )