Changeset 13477 for NEMO/trunk/src/OCE/ZDF/zdfdrg.F90

Timestamp:

2020-09-16T17:15:29+02:00 (4 years ago)

Author:

smasson

Message:

trunk: fix the use of ln_drgice_imp

File:

• NEMO/trunk/src/OCE/ZDF/zdfdrg.F90 (modified) (3 diffs)

NEMO/trunk/src/OCE/ZDF/zdfdrg.F90

@@ -238 +238 @@
       IF(lwm) WRITE ( numond, namdrg )
       !
+      IF ( ln_drgice_imp .AND.   nn_ice /= 2  )   ln_drgice_imp = .FALSE.
+      !
       IF(lwp) THEN
          WRITE(numout,*)
@@ -262 +264 @@
          &                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)
       !
@@ -270 +269 @@
       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)