Changeset 13481 for NEMO/releases

Timestamp:

2020-09-16T19:14:51+02:00 (4 years 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:

• SBC/sbcmod.F90 (modified) (1 diff)
• ZDF/zdfdrg.F90 (modified) (3 diffs)

NEMO/releases/r4.0/r4.0-HEAD/src/OCE/SBC/sbcmod.F90

@@ -130 +130 @@
 #endif
       !
+#if ! defined key_si3
+      IF( nn_ice == 2 )    nn_ice = 0  ! without key key_si3 you cannot use si3...
+#endif
+      !
       IF(lwp) THEN                  !* Control print
          WRITE(numout,*) '   Namelist namsbc (partly overwritten with CPP key setting)'

NEMO/releases/r4.0/r4.0-HEAD/src/OCE/ZDF/zdfdrg.F90

@@ -245 +245 @@
       IF(lwm) WRITE ( numond, namdrg )
       !
+      IF( ln_drgice_imp .AND. nn_ice /= 2 )   ln_drgice_imp = .FALSE.
+      !
       IF(lwp) THEN
          WRITE(numout,*)
@@ -269 +271 @@
          &                CALL ctl_stop( 'zdf_drg_init: ln_drgice_imp=T requires ln_drgimp=T' )
       !
-      IF ( ln_drgice_imp.AND.( nn_ice /=2 ) ) &
-         &  CALL ctl_stop( 'zdf_drg_init: ln_drgice_imp=T requires si3' )
-      !
       !                     !==  BOTTOM drag setting  ==!   (applied at seafloor)
       !
@@ -277 +276 @@
       CALL drg_init( 'BOTTOM'   , mbkt       ,                                         &   ! <== in
          &           r_Cdmin_bot, r_Cdmax_bot, r_z0_bot, r_ke0_bot, rCd0_bot, rCdU_bot )   ! ==> out
-
       !
       !                     !==  TOP drag setting  ==!   (applied at the top of ocean cavities)