Changeset 13477

Timestamp:

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

Author:

smasson

Message:

trunk: fix the use of ln_drgice_imp

Location:

NEMO/trunk/src/OCE

Files:

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

NEMO/trunk/src/OCE/SBC/sbcmod.F90

@@ -99 +99 @@
          &             nn_ice   , ln_ice_embd,                                       &
          &             ln_traqsr, ln_dm2dc ,                                         &
-         &             ln_rnf   , nn_fwb     , ln_ssr   , ln_apr_dyn,              &
-         &             ln_wave  , ln_cdgw  , ln_sdw   , ln_tauwoc  , ln_stcor  ,     &
+         &             ln_rnf   , nn_fwb   , ln_ssr   , ln_apr_dyn,                  &
+         &             ln_wave  , ln_cdgw  , ln_sdw   , ln_tauwoc , ln_stcor  ,      &
          &             ln_tauw  , nn_lsm, nn_sdrift
       !!----------------------------------------------------------------------
@@ -119 +119 @@
 #if defined key_mpp_mpi
       ncom_fsbc = nn_fsbc    ! make nn_fsbc available for lib_mpp
+#endif
+#if ! defined key_si3
+      IF( nn_ice == 2 )    nn_ice = 0  ! without key key_si3 you cannot use si3...
 #endif
       !
@@ -243 +246 @@
       ENDIF
       !
-
       IF( nn_ice == 0 ) THEN        !* No sea-ice in the domain : ice fraction is always zero
          IF( nn_components /= jp_iam_opa )   fr_i(:,:) = 0._wp    ! except for OPA in SAS-OPA coupled case

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)