Changeset 8331 for branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/OPA_SRC/SBC/sbcmod.F90

Timestamp:

2017-07-13T19:17:41+02:00 (7 years ago)

Author:

clem

Message:

correct a bug introduced at r8324

File:

• branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/OPA_SRC/SBC/sbcmod.F90 (modified) (2 diffs)

branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/OPA_SRC/SBC/sbcmod.F90

@@ -210 +210 @@
       !                             !* allocate sbc arrays
       IF( sbc_oce_alloc() /= 0 )   CALL ctl_stop( 'sbc_init : unable to allocate sbc_oce arrays' )
-      IF( sbc_ice_alloc() /= 0 )   CALL ctl_stop( 'sbc_init : unable to allocate sbc_ice arrays' )              
+#if ! defined key_lim3 && ! defined key_cice
+      IF( sbc_ice_alloc() /= 0 )   CALL ctl_stop( 'sbc_init : unable to allocate sbc_ice arrays' )
+#endif
       !
       IF( .NOT.ln_isf ) THEN        !* No ice-shelf in the domain : allocate and set to zero
@@ -307 +309 @@
       !
 #if defined key_lim3
-      IF( nn_ice == 2 )   CALL ice_init                ! LIM3 initialization
+           IF    ( lk_agrif .AND. nn_ice == 0 ) THEN
+                          IF( sbc_ice_alloc() /= 0 )   CALL ctl_stop('STOP', 'sbc_ice_alloc : unable to allocate arrays' )  ! clem2017: allocate ice arrays in case agrif + lim + no-ice in child grid
+           ELSEIF( nn_ice == 2 ) THEN
+                          CALL ice_init                ! LIM3 initialization
+           ENDIF
 #endif
       IF( nn_ice == 3 )   CALL cice_sbc_init( nsbc )   ! CICE initialization