Configuration file and parameter read-in changes #48
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There are 4 main (mostly minor) config/param changes here:
exponent_primary
andexponent_secondary
are now optional params read-in from*_config.txt
; defaults to1.0
otherwise.gw_storage
andsoil_storage
no longer allow option to read-in as percentage%
, but only literal value.*_config.txt
to match ranges from NWM*_config.txt
Additions
soil_params.expon
andsoil_params.expon_secondary
added to all (7)cat_*_bmi_config*.txt
config filescat_*_bmi_config*.txt
.Changes
exponent_primary
andexponent_secondary
read-in viaread_init_config_cfe()
. Otherwise, set default value to1.0
gw_storage
andsoil_storage
must only be literal values in config*_max
and%
char removed) in all (7)cat_*_bmi_config*.txt
init_soil_reservoir()
read_init_config_cfe()
&init_soil_reservoir()
, change slightly as*_is_ratio
,max_storage
, etc. not being usedCgw
andmax_gw_storage
values were significantly too large, adjusted to comply with NWM ranges for all (7)cat_*_bmi_config*.txt
.read_init_config_cfe()
checks for [units]soil_params.depth=2.0[m]
or if unitlesssoil_params.b=4.05[]
or similarly, justsoil_params.b=4.05
soil_params.satdk
Removals
init_reservoir_storage()
function obsolete with literal values.soil_params.mult
for all config.txtTesting
make_and_run_bmi.sh
results the same before and after changes.Todos
// old code
commented out once PR approved