Changeset 13445 for NEMO/releases/r4.0/r4.0-HEAD/src/ICE/icerst.F90

Timestamp:

2020-09-01T18:25:07+02:00 (4 years ago)

Author:

acc

Message:

r4.0-HEAD. Simple fix to enable the nn_iceini_file=2 option to work as intended. This fixes #2517

File:

• NEMO/releases/r4.0/r4.0-HEAD/src/ICE/icerst.F90 (modified) (1 diff)

NEMO/releases/r4.0/r4.0-HEAD/src/ICE/icerst.F90

@@ -278 +278 @@
       ELSE                 ! == case of a simplified restart == !
          !                 ! ---------------------------------- !
-         CALL ctl_warn('ice_rst_read: you are using a simplified ice restart')
+         CALL ctl_warn('ice_rst_read: you are attempting to use an unsuitable ice restart')
          !
-         CALL ice_istate_init
+         IF( .NOT. ln_iceini ) THEN
+            CALL ctl_stop('STOP', 'ice_rst_read: you need ln_ice_ini=T and nn_iceini_file=0 or 1')
+         ELSE
+            CALL ctl_warn('ice_rst_read: using ice_istate to set initial conditions instead')
+         ENDIF
+         !
          CALL ice_istate( nit000 )
          !
-         IF( .NOT.ln_iceini .OR. nn_iceini_file == 0 ) &
-            &   CALL ctl_stop('STOP', 'ice_rst_read: you need ln_ice_ini=T and nn_iceini_file=0')
-         !
       ENDIF