Changeset 11927 for NEMO/branches/UKMO/NEMO_4.0.1_fix_cpl/src/ICE/icerst.F90

Timestamp:

2019-11-19T15:49:40+01:00 (4 years ago)

Author:

dancopsey

Message:

Fix compile errors and resolve conflicts

File:

• NEMO/branches/UKMO/NEMO_4.0.1_fix_cpl/src/ICE/icerst.F90 (modified) (1 diff)

NEMO/branches/UKMO/NEMO_4.0.1_fix_cpl/src/ICE/icerst.F90

@@ -274 +274 @@
          CALL ice_istate( nit000 )
          !
-         IF( .NOT.ln_iceini .OR. .NOT.ln_iceini_file ) &
-            &   CALL ctl_stop('STOP', 'ice_rst_read: you need ln_ice_ini=T and ln_iceini_file=T')
+         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