Changeset 10425 for NEMO/trunk/src/OCE/FLO

Timestamp:

2018-12-19T22:54:16+01:00 (5 years ago)

Author:

smasson

Message:

trunk: merge back dev_r10164_HPC09_ESIWACE_PREP_MERGE@10424 into the trunk

Location:

NEMO/trunk/src/OCE/FLO

Files:

• flo_oce.F90 (modified) (1 diff)
• floblk.F90 (modified) (1 diff)
• flodom.F90 (modified) (3 diffs)
• florst.F90 (modified) (2 diffs)
• flowri.F90 (modified) (2 diffs)

NEMO/trunk/src/OCE/FLO/flo_oce.F90

@@ -64 +64 @@
          &      tpifl(jpnfl)    , tpjfl(jpnfl)  , tpkfl(jpnfl)   , STAT=flo_oce_alloc )
       !
-      IF( lk_mpp             )   CALL mpp_sum ( flo_oce_alloc )
-      IF( flo_oce_alloc /= 0 )   CALL ctl_warn('flo_oce_alloc: failed to allocate arrays')
+      CALL mpp_sum ( 'flo_oce', flo_oce_alloc )
+      IF( flo_oce_alloc /= 0 )   CALL ctl_stop( 'STOP', 'flo_oce_alloc: failed to allocate arrays' )
    END FUNCTION flo_oce_alloc
 

NEMO/trunk/src/OCE/FLO/floblk.F90

@@ -330 +330 @@
       
       ! synchronisation
-      IF( lk_mpp )   CALL mpp_sum( zgifl , jpnfl )   ! sums over the global domain
-      IF( lk_mpp )   CALL mpp_sum( zgjfl , jpnfl )
-      IF( lk_mpp )   CALL mpp_sum( zgkfl , jpnfl )
-      IF( lk_mpp )   CALL mpp_sum( zagefl, jpnfl )
-      IF( lk_mpp )   CALL mpp_sum( iil   , jpnfl )
-      IF( lk_mpp )   CALL mpp_sum( ijl   , jpnfl )
+      CALL mpp_sum( 'floblk', zgifl , jpnfl )   ! sums over the global domain
+      CALL mpp_sum( 'floblk', zgjfl , jpnfl )
+      CALL mpp_sum( 'floblk', zgkfl , jpnfl )
+      CALL mpp_sum( 'floblk', zagefl, jpnfl )
+      CALL mpp_sum( 'floblk', iil   , jpnfl )
+      CALL mpp_sum( 'floblk', ijl   , jpnfl )
       
       ! Test to know if a  float hasn't integrated enought time

NEMO/trunk/src/OCE/FLO/flodom.F90

@@ -193 +193 @@
       !----------------------------------------------
       IF( lk_mpp )   THEN 
-         CALL mpp_sum(ihtest,jpnfl)
-         CALL mpp_sum(ivtest,jpnfl)
+         CALL mpp_sum('flodom', ihtest,jpnfl)
+         CALL mpp_sum('flodom', ivtest,jpnfl)
       ENDIF
       DO jfl = kfl_start,kfl_end
@@ -252 +252 @@
       ! The sum of all the arrays zgifl, zgjfl, zgkfl give 3 arrays with the positions of all the floats.
       IF( lk_mpp )   THEN 
-         CALL mpp_sum( zgjfl, ifl )   ! sums over the global domain
-         CALL mpp_sum( zgkfl, ifl )
+         CALL mpp_sum( 'flodom', zgjfl, ifl )   ! sums over the global domain
+         CALL mpp_sum( 'flodom', zgkfl, ifl )
       ENDIF
             
@@ -451 +451 @@
                 zgifl(jpnfl) , zgjfl(jpnfl) , zgkfl(jpnfl)   , STAT=flo_dom_alloc )
       !
-      IF( lk_mpp             )   CALL mpp_sum ( flo_dom_alloc )
-      IF( flo_dom_alloc /= 0 )   CALL ctl_warn('flo_dom_alloc: failed to allocate arrays')
+      CALL mpp_sum ( 'flodom', flo_dom_alloc )
+      IF( flo_dom_alloc /= 0 )   CALL ctl_stop( 'STOP', 'flo_dom_alloc: failed to allocate arrays' )
    END FUNCTION flo_dom_alloc
 

NEMO/trunk/src/OCE/FLO/florst.F90

@@ -39 +39 @@
       ALLOCATE( iperproc(jpnij), STAT=flo_rst_alloc )
       !  
-      IF( lk_mpp             )   CALL mpp_sum ( flo_rst_alloc )
-      IF( flo_rst_alloc /= 0 )   CALL ctl_warn('flo_rst_alloc: failed to allocate arrays.')
+      CALL mpp_sum ( 'florst', flo_rst_alloc )
+      IF( flo_rst_alloc /= 0 )   CALL ctl_stop( 'STOP', 'flo_rst_alloc: failed to allocate arrays.' )
    END FUNCTION flo_rst_alloc
 
@@ -109 +109 @@
                ENDIF
             END DO
-            CALL mpp_sum( iperproc, jpnij )
+            CALL mpp_sum( 'florst', iperproc, jpnij )
             !
             IF(lwp) THEN

NEMO/trunk/src/OCE/FLO/flowri.F90

@@ -51 +51 @@
                 zlon(jpnfl) , zlat(jpnfl) , zdep(jpnfl) , STAT=flo_wri_alloc)
       !  
-      IF( lk_mpp             )   CALL mpp_sum ( flo_wri_alloc )
-      IF( flo_wri_alloc /= 0 )   CALL ctl_warn('flo_wri_alloc: failed to allocate arrays.')
+      CALL mpp_sum ( 'flowri', flo_wri_alloc )
+      IF( flo_wri_alloc /= 0 )   CALL ctl_stop( 'STOP', 'flo_wri_alloc: failed to allocate arrays.' )
    END FUNCTION flo_wri_alloc
 
@@ -153 +153 @@
       !Only proc 0 writes all positions : SUM of positions on all procs
       IF( lk_mpp ) THEN
-         CALL mpp_sum( zlon, jpnfl )   ! sums over the global domain
-         CALL mpp_sum( zlat, jpnfl )   ! sums over the global domain
-         CALL mpp_sum( zdep, jpnfl )   ! sums over the global domain
-         CALL mpp_sum( ztem, jpnfl )   ! sums over the global domain
-         CALL mpp_sum( zsal, jpnfl )   ! sums over the global domain
-         CALL mpp_sum( zrho, jpnfl )   ! sums over the global domain
+         CALL mpp_sum( 'flowri', zlon, jpnfl )   ! sums over the global domain
+         CALL mpp_sum( 'flowri', zlat, jpnfl )   ! sums over the global domain
+         CALL mpp_sum( 'flowri', zdep, jpnfl )   ! sums over the global domain
+         CALL mpp_sum( 'flowri', ztem, jpnfl )   ! sums over the global domain
+         CALL mpp_sum( 'flowri', zsal, jpnfl )   ! sums over the global domain
+         CALL mpp_sum( 'flowri', zrho, jpnfl )   ! sums over the global domain
       ENDIF