Changeset 11588


Ignore:
Timestamp:
2019-09-23T16:53:04+02:00 (12 months ago)
Author:
dancopsey
Message:

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

File:
1 edited

Legend:

Unmodified
Added
Removed
  • NEMO/branches/UKMO/NEMO_4.0_init_ice/src/ICE/icestp.F90

    r11581 r11588  
    252252      ! 
    253253      !                                ! Initial sea-ice state 
    254       IF( .NOT. ln_rstart .AND. nn_iceini_file /= 2 ) THEN              ! start from rest: sea-ice deduced from sst 
     254 
     255      IF( .NOT. ln_rstart ) THEN         
    255256         CALL ice_istate_init 
    256          CALL ice_istate 
     257         IF( nn_iceini_file == 2 ) THEN 
     258           WRITE(numout,*) 'Starting from restart file' 
     259           CALL ice_rst_read             ! start from a restart file 
     260         ELSE 
     261           WRITE(numout,*) 'Starting from bootstap' 
     262           CALL ice_istate               ! start from rest: sea-ice deduced from sst  
     263         ENDIF 
    257264      ELSE                                    ! start from a restart file 
     265         WRITE(numout,*) 'Starting from restart file' 
    258266         CALL ice_rst_read 
    259267      ENDIF 
Note: See TracChangeset for help on using the changeset viewer.