Changeset 11588 for NEMO/branches

Timestamp:

2019-09-23T16:53:04+02:00 (5 years ago)

Author:

dancopsey

Message:

Move test for nn_iceini_file to after it is loaded from namelist.

File:

• NEMO/branches/UKMO/NEMO_4.0_init_ice/src/ICE/icestp.F90 (modified) (1 diff)

NEMO/branches/UKMO/NEMO_4.0_init_ice/src/ICE/icestp.F90

@@ -252 +252 @@
       !
       !                                ! Initial sea-ice state
-      IF( .NOT. ln_rstart .AND. nn_iceini_file /= 2 ) THEN              ! start from rest: sea-ice deduced from sst
+
+      IF( .NOT. ln_rstart ) THEN        
          CALL ice_istate_init
-         CALL ice_istate
+         IF( nn_iceini_file == 2 ) THEN
+           WRITE(numout,*) 'Starting from restart file'
+           CALL ice_rst_read             ! start from a restart file
+         ELSE
+           WRITE(numout,*) 'Starting from bootstap'
+           CALL ice_istate               ! start from rest: sea-ice deduced from sst 
+         ENDIF
       ELSE                                    ! start from a restart file
+         WRITE(numout,*) 'Starting from restart file'
          CALL ice_rst_read
       ENDIF