Changeset 13477 for NEMO/trunk/src
- Timestamp:
- 2020-09-16T17:15:29+02:00 (4 years ago)
- Location:
- NEMO/trunk/src/OCE
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
NEMO/trunk/src/OCE/SBC/sbcmod.F90
r13472 r13477 99 99 & nn_ice , ln_ice_embd, & 100 100 & ln_traqsr, ln_dm2dc , & 101 & ln_rnf , nn_fwb , ln_ssr , ln_apr_dyn,&102 & ln_wave , ln_cdgw , ln_sdw , ln_tauwoc , ln_stcor ,&101 & ln_rnf , nn_fwb , ln_ssr , ln_apr_dyn, & 102 & ln_wave , ln_cdgw , ln_sdw , ln_tauwoc , ln_stcor , & 103 103 & ln_tauw , nn_lsm, nn_sdrift 104 104 !!---------------------------------------------------------------------- … … 119 119 #if defined key_mpp_mpi 120 120 ncom_fsbc = nn_fsbc ! make nn_fsbc available for lib_mpp 121 #endif 122 #if ! defined key_si3 123 IF( nn_ice == 2 ) nn_ice = 0 ! without key key_si3 you cannot use si3... 121 124 #endif 122 125 ! … … 243 246 ENDIF 244 247 ! 245 246 248 IF( nn_ice == 0 ) THEN !* No sea-ice in the domain : ice fraction is always zero 247 249 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
r13472 r13477 238 238 IF(lwm) WRITE ( numond, namdrg ) 239 239 ! 240 IF ( ln_drgice_imp .AND. nn_ice /= 2 ) ln_drgice_imp = .FALSE. 241 ! 240 242 IF(lwp) THEN 241 243 WRITE(numout,*) … … 262 264 & CALL ctl_stop( 'zdf_drg_init: ln_drgice_imp=T requires ln_drgimp=T' ) 263 265 ! 264 IF ( ln_drgice_imp.AND.( nn_ice /=2 ) ) &265 & CALL ctl_stop( 'zdf_drg_init: ln_drgice_imp=T requires si3' )266 !267 266 ! !== BOTTOM drag setting ==! (applied at seafloor) 268 267 ! … … 270 269 CALL drg_init( 'BOTTOM' , mbkt , & ! <== in 271 270 & r_Cdmin_bot, r_Cdmax_bot, r_z0_bot, r_ke0_bot, rCd0_bot, rCdU_bot ) ! ==> out 272 273 271 ! 274 272 ! !== TOP drag setting ==! (applied at the top of ocean cavities)
Note: See TracChangeset
for help on using the changeset viewer.