Changeset 10402 for NEMO/branches/2018/dev_r10164_HPC09_ESIWACE_PREP_MERGE/src/OCE/FLO

Timestamp:

2018-12-17T17:07:54+01:00 (5 years ago)

Author:

smasson

Message:

dev_r10164_HPC09_ESIWACE_PREP_MERGE: no more need of lk_mpp for mpp_sum/max/min, see #2133

Location:

NEMO/branches/2018/dev_r10164_HPC09_ESIWACE_PREP_MERGE/src/OCE/FLO

Files:

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

NEMO/branches/2018/dev_r10164_HPC09_ESIWACE_PREP_MERGE/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', flo_oce_alloc )
+      CALL mpp_sum ( 'flo_oce', flo_oce_alloc )
       IF( flo_oce_alloc /= 0 )   CALL ctl_warn('flo_oce_alloc: failed to allocate arrays')
    END FUNCTION flo_oce_alloc

NEMO/branches/2018/dev_r10164_HPC09_ESIWACE_PREP_MERGE/src/OCE/FLO/floblk.F90

@@ -330 +330 @@
       
       ! synchronisation
-      IF( lk_mpp )   CALL mpp_sum( 'floblk', zgifl , jpnfl )   ! sums over the global domain
-      IF( lk_mpp )   CALL mpp_sum( 'floblk', zgjfl , jpnfl )
-      IF( lk_mpp )   CALL mpp_sum( 'floblk', zgkfl , jpnfl )
-      IF( lk_mpp )   CALL mpp_sum( 'floblk', zagefl, jpnfl )
-      IF( lk_mpp )   CALL mpp_sum( 'floblk', iil   , jpnfl )
-      IF( lk_mpp )   CALL mpp_sum( 'floblk', 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/branches/2018/dev_r10164_HPC09_ESIWACE_PREP_MERGE/src/OCE/FLO/flodom.F90

@@ -451 +451 @@
                 zgifl(jpnfl) , zgjfl(jpnfl) , zgkfl(jpnfl)   , STAT=flo_dom_alloc )
       !
-      IF( lk_mpp             )   CALL mpp_sum ( 'flodom', flo_dom_alloc )
+      CALL mpp_sum ( 'flodom', flo_dom_alloc )
       IF( flo_dom_alloc /= 0 )   CALL ctl_warn('flo_dom_alloc: failed to allocate arrays')
    END FUNCTION flo_dom_alloc

NEMO/branches/2018/dev_r10164_HPC09_ESIWACE_PREP_MERGE/src/OCE/FLO/florst.F90

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

NEMO/branches/2018/dev_r10164_HPC09_ESIWACE_PREP_MERGE/src/OCE/FLO/flowri.F90

@@ -51 +51 @@
                 zlon(jpnfl) , zlat(jpnfl) , zdep(jpnfl) , STAT=flo_wri_alloc)
       !  
-      IF( lk_mpp             )   CALL mpp_sum ( 'flowri', flo_wri_alloc )
+      CALL mpp_sum ( 'flowri', flo_wri_alloc )
       IF( flo_wri_alloc /= 0 )   CALL ctl_warn('flo_wri_alloc: failed to allocate arrays.')
    END FUNCTION flo_wri_alloc