Changeset 13481


Ignore:
Timestamp:
2020-09-16T19:14:51+02:00 (6 months ago)
Author:
clem
Message:

r4.0-HEAD: backward compatibility following commit r13477 from the trunk

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

Legend:

Unmodified
Added
Removed
  • NEMO/releases/r4.0/r4.0-HEAD/src/OCE/SBC/sbcmod.F90

    r13284 r13481  
    130130#endif 
    131131      ! 
     132#if ! defined key_si3 
     133      IF( nn_ice == 2 )    nn_ice = 0  ! without key key_si3 you cannot use si3... 
     134#endif 
     135      ! 
    132136      IF(lwp) THEN                  !* Control print 
    133137         WRITE(numout,*) '   Namelist namsbc (partly overwritten with CPP key setting)' 
  • NEMO/releases/r4.0/r4.0-HEAD/src/OCE/ZDF/zdfdrg.F90

    r13284 r13481  
    245245      IF(lwm) WRITE ( numond, namdrg ) 
    246246      ! 
     247      IF( ln_drgice_imp .AND. nn_ice /= 2 )   ln_drgice_imp = .FALSE. 
     248      ! 
    247249      IF(lwp) THEN 
    248250         WRITE(numout,*) 
     
    269271         &                CALL ctl_stop( 'zdf_drg_init: ln_drgice_imp=T requires ln_drgimp=T' ) 
    270272      ! 
    271       IF ( ln_drgice_imp.AND.( nn_ice /=2 ) ) & 
    272          &  CALL ctl_stop( 'zdf_drg_init: ln_drgice_imp=T requires si3' ) 
    273       ! 
    274273      !                     !==  BOTTOM drag setting  ==!   (applied at seafloor) 
    275274      ! 
     
    277276      CALL drg_init( 'BOTTOM'   , mbkt       ,                                         &   ! <== in 
    278277         &           r_Cdmin_bot, r_Cdmax_bot, r_z0_bot, r_ke0_bot, rCd0_bot, rCdU_bot )   ! ==> out 
    279  
    280278      ! 
    281279      !                     !==  TOP drag setting  ==!   (applied at the top of ocean cavities) 
Note: See TracChangeset for help on using the changeset viewer.