Changeset 10425 for NEMO/trunk/src/OCE/BDY/bdy_oce.F90

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

File:

• NEMO/trunk/src/OCE/BDY/bdy_oce.F90 (modified) (3 diffs)

NEMO/trunk/src/OCE/BDY/bdy_oce.F90

@@ -12 +12 @@
    !!----------------------------------------------------------------------
    USE par_oce         ! ocean parameters
-   USE lib_mpp         ! distributed memory computing
 
    IMPLICIT NONE
@@ -148 +147 @@
    FUNCTION bdy_oce_alloc()
       !!----------------------------------------------------------------------
-      USE lib_mpp, ONLY: ctl_warn, mpp_sum
+      USE lib_mpp, ONLY: ctl_stop, mpp_sum
       !
       INTEGER :: bdy_oce_alloc
@@ -161 +160 @@
       bdyvmask(:,:) = 1._wp
       ! 
-      IF( lk_mpp             )   CALL mpp_sum ( bdy_oce_alloc )
-      IF( bdy_oce_alloc /= 0 )   CALL ctl_warn('bdy_oce_alloc: failed to allocate arrays.')
+      CALL mpp_sum ( 'bdy_oce', bdy_oce_alloc )
+      IF( bdy_oce_alloc /= 0 )   CALL ctl_stop( 'STOP', 'bdy_oce_alloc: failed to allocate arrays.' )
       !
    END FUNCTION bdy_oce_alloc