Ignore:
Timestamp:
2019-12-10T12:57:49+01:00 (22 months ago)
Author:
mathiot
Message:

update ENHANCE-02_ISF_nemo to 12072 (sette in progress)

File:
1 edited

Legend:

Unmodified
Added
Removed
  • NEMO/branches/2019/ENHANCE-02_ISF_nemo/src/OCE/SBC/sbcmod.F90

    r11489 r12143  
    108108      REWIND( numnam_ref )          !* Namelist namsbc in reference namelist : Surface boundary 
    109109      READ  ( numnam_ref, namsbc, IOSTAT = ios, ERR = 901) 
    110 901   IF( ios /= 0 )   CALL ctl_nam ( ios , 'namsbc in reference namelist', lwp ) 
     110901   IF( ios /= 0 )   CALL ctl_nam ( ios , 'namsbc in reference namelist' ) 
    111111      REWIND( numnam_cfg )          !* Namelist namsbc in configuration namelist : Parameters of the run 
    112112      READ  ( numnam_cfg, namsbc, IOSTAT = ios, ERR = 902 ) 
    113 902   IF( ios >  0 )   CALL ctl_nam ( ios , 'namsbc in configuration namelist', lwp ) 
     113902   IF( ios >  0 )   CALL ctl_nam ( ios , 'namsbc in configuration namelist' ) 
    114114      IF(lwm) WRITE( numond, namsbc ) 
    115115      ! 
     
    299299      ! 
    300300      !                             !* check consistency between model timeline and nn_fsbc 
    301       IF( MOD( nitend - nit000 + 1, nn_fsbc) /= 0 .OR.   & 
    302           MOD( nstock             , nn_fsbc) /= 0 ) THEN 
    303          WRITE(ctmp1,*) 'sbc_init : experiment length (', nitend - nit000 + 1, ') or nstock (', nstock,   & 
    304             &           ' is NOT a multiple of nn_fsbc (', nn_fsbc, ')' 
    305          CALL ctl_stop( ctmp1, 'Impossible to properly do model restart' ) 
     301      IF( ln_rst_list .OR. nn_stock /= -1 ) THEN   ! we will do restart files 
     302         IF( MOD( nitend - nit000 + 1, nn_fsbc) /= 0 ) THEN 
     303            WRITE(ctmp1,*) 'sbc_init : experiment length (', nitend - nit000 + 1, ') is NOT a multiple of nn_fsbc (', nn_fsbc, ')' 
     304            CALL ctl_stop( ctmp1, 'Impossible to properly do model restart' ) 
     305         ENDIF 
     306         IF( .NOT. ln_rst_list .AND. MOD( nn_stock, nn_fsbc) /= 0 ) THEN   ! we don't use nn_stock if ln_rst_list 
     307            WRITE(ctmp1,*) 'sbc_init : nn_stock (', nn_stock, ') is NOT a multiple of nn_fsbc (', nn_fsbc, ')' 
     308            CALL ctl_stop( ctmp1, 'Impossible to properly do model restart' ) 
     309         ENDIF 
    306310      ENDIF 
    307311      ! 
Note: See TracChangeset for help on using the changeset viewer.