Changeset 10425 for NEMO/trunk/src/ICE/ice.F90

Timestamp:

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

Author:

smasson

Message:

trunk: merge back dev_r10164_HPC09_ESIWACE_PREP_MERGE@10424 into the trunk

File:

• NEMO/trunk/src/ICE/ice.F90 (modified) (2 diffs)

NEMO/trunk/src/ICE/ice.F90

@@ -207 +207 @@
    REAL(wp), PUBLIC, PARAMETER ::   epsi20 = 1.e-20_wp  !: small number 
 
+   !                                     !!** some other parameters for advection using the ULTIMATE-MACHO scheme
+   LOGICAL, PUBLIC, DIMENSION(2) :: l_split_advumx = .FALSE.    ! force one iteration at the first time-step
 
    !                                     !!** define arrays
@@ -463 +465 @@
 
       ice_alloc = MAXVAL( ierr(:) )
-      IF( ice_alloc /= 0 )   CALL ctl_warn('ice_alloc: failed to allocate arrays.')
+      IF( ice_alloc /= 0 )   CALL ctl_stop( 'STOP', 'ice_alloc: failed to allocate arrays.' )
       !
    END FUNCTION ice_alloc