Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

reconcile with dev-access-esm1.6 - util- snmin threshold thru namelist #552

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/offline/cable.nml
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@
redistrb = .FALSE. ! Turn on/off the hydraulic redistribution
wiltParam = 0.5
satuParam = 0.8
snmin = 1.0
cable_user%FWSOIL_SWITCH = 'standard' ! choices are:
! 1. standard
! 2. non-linear extrapolation
Expand Down
2 changes: 2 additions & 0 deletions src/offline/cable_driver_common.F90
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ MODULE cable_driver_common_mod
redistrb, &
wiltParam, &
satuParam, &
snmin, &
cable_user, &
gw_params, &
cable_runtime
Expand Down Expand Up @@ -93,6 +94,7 @@ MODULE cable_driver_common_mod
redistrb, &
wiltParam, &
satuParam, &
snmin, &
cable_user, & ! additional USER switches
gw_params

Expand Down
4 changes: 3 additions & 1 deletion src/util/cable_common.F90
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ MODULE cable_common_module
USE cable_runtime_opts_mod ,ONLY : cable_user
USE cable_runtime_opts_mod ,ONLY : satuparam
USE cable_runtime_opts_mod ,ONLY : wiltparam
USE cable_runtime_opts_mod ,ONLY : snmin

IMPLICIT NONE

Expand Down Expand Up @@ -207,7 +208,8 @@ MODULE cable_common_module
snow_ccnsw = 2.0, &
!jh!an:clobber - effectively force single layer snow
!snmin = 100.0, & ! for 1-layer;
snmin = 1., & ! for 3-layer;
! moved to runtime option, set through cable.nml
!snmin = 1., & ! for 3-layer;
max_ssdn = 750.0, & !
max_sconds = 2.51, & !
frozen_limit = 0.85 ! EAK Feb2011 (could be 0.95)
Expand Down
7 changes: 5 additions & 2 deletions src/util/cable_runtime_opts_mod.F90
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,11 @@ MODULE cable_runtime_opts_mod

IMPLICIT NONE

! hydraulic_redistribution parameters _soilsnow module
REAL :: wiltParam = 0.0, satuParam = 0.0
! hydraulic_redistribution parameters _soilsnow module
REAL :: wiltParam = 0.0
REAL :: satuParam = 0.0
! depth at which to switch to 3 layer snow, default is ESM1.5 value
REAL :: snmin = 1.0

! user switches turned on/off by the user thru namelists
! CABLE-2.0 user switches all in single namelist file cable.nml
Expand Down