Changeset 13445


Ignore:
Timestamp:
2020-09-01T18:25:07+02:00 (3 months ago)
Author:
acc
Message:

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

Location:
NEMO/releases/r4.0/r4.0-HEAD/src/ICE
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • NEMO/releases/r4.0/r4.0-HEAD/src/ICE/icerst.F90

    r13284 r13445  
    278278      ELSE                 ! == case of a simplified restart == ! 
    279279         !                 ! ---------------------------------- ! 
    280          CALL ctl_warn('ice_rst_read: you are using a simplified ice restart') 
     280         CALL ctl_warn('ice_rst_read: you are attempting to use an unsuitable ice restart') 
    281281         ! 
    282          CALL ice_istate_init 
     282         IF( .NOT. ln_iceini ) THEN 
     283            CALL ctl_stop('STOP', 'ice_rst_read: you need ln_ice_ini=T and nn_iceini_file=0 or 1') 
     284         ELSE 
     285            CALL ctl_warn('ice_rst_read: using ice_istate to set initial conditions instead') 
     286         ENDIF 
     287         ! 
    283288         CALL ice_istate( nit000 ) 
    284289         ! 
    285          IF( .NOT.ln_iceini .OR. nn_iceini_file == 0 ) & 
    286             &   CALL ctl_stop('STOP', 'ice_rst_read: you need ln_ice_ini=T and nn_iceini_file=0') 
    287          ! 
    288290      ENDIF 
    289291 
  • NEMO/releases/r4.0/r4.0-HEAD/src/ICE/icestp.F90

    r13284 r13445  
    257257      ! 
    258258      !                                ! Initial sea-ice state 
     259      CALL ice_istate_init 
    259260      IF ( ln_rstart .OR. nn_iceini_file == 2 ) THEN 
    260261         CALL ice_rst_read                      ! start from a restart file 
    261262      ELSE 
    262          CALL ice_istate_init 
    263263         CALL ice_istate( nit000 )              ! start from rest or read a file 
    264264      ENDIF 
Note: See TracChangeset for help on using the changeset viewer.