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.

Sign up for GitHub

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

Jump to bottom

restart_variable #6

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
+24 −2
Open

restart_variable #6

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a5d79bd
Modify write_nml_outflows as it write "[" in the nml file
cvergaras May 13, 2024
3682f9f
Added restart_variables to init_profiles_dict
cvergaras Jun 9, 2024
5d54589
added subm_elev to Inflows
cvergaras Jun 22, 2024
fa85cfb
subm-elev added
cvergaras Jun 22, 2024
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
26 changes: 24 additions & 2 deletions glmpy/nml.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -508,6 +508,10 @@ def _write_nml_init_profiles(self, init_profiles: dict) -> str:
self.nml_param_val(
init_profiles, "wq_init_vals", self.nml_list
) +
self.nml_param_val(
init_profiles, "restart_variables", self.nml_list
)
+
"/"
)

Expand Down Expand Up @@ -649,6 +653,7 @@ def _write_nml_inflow(self, inflow: dict) -> str:
"subm_flag",
lambda x: self.nml_list(x, self.nml_bool)
) +
self.nml_param_val(inflow, "subm_elev", self.nml_list) +
self.nml_param_val(inflow, "strm_hf_angle", self.nml_list) +
self.nml_param_val(inflow, "strmbd_slope", self.nml_list) +
self.nml_param_val(inflow, "strmbd_drag", self.nml_list) +
Expand Down Expand Up @@ -679,7 +684,11 @@ def _write_nml_outflow(self, outflow: dict) -> str:
outflow_str = (
"&outflow\n" +
self.nml_param_val(outflow, "num_outlet")+
self.nml_param_val(outflow, "outflow_fl", self.nml_str) +
self.nml_param_val(
outflow,
"outflow_fl",
lambda x: self.nml_list(x, self.nml_str)
) +
self.nml_param_val(outflow, "time_fmt", self.nml_str) +
self.nml_param_val(outflow, "outflow_factor", self.nml_list) +
self.nml_param_val(
Expand Down Expand Up @@ -1742,6 +1751,7 @@ def __init__(
num_wq_vars: Union[int, None] = None,
wq_names: Union[List[str], str, None] = None,
wq_init_vals: Union[List[float], float, None] = None,
restart_variables: Union[List[float], float, None] = None,
):
self.lake_depth = lake_depth
self.num_depths = num_depths
Expand All @@ -1751,6 +1761,7 @@ def __init__(
self.num_wq_vars = num_wq_vars
self.wq_names = wq_names
self.wq_init_vals = wq_init_vals
self.restart_variables = restart_variables

def __call__(
self,
Expand Down Expand Up @@ -1802,6 +1813,7 @@ def __call__(
self.the_depths = self._single_value_to_list(self.the_depths)
self.wq_names = self._single_value_to_list(self.wq_names)
self.wq_init_vals = self._single_value_to_list(self.wq_init_vals)
self.restart_variables = self._single_value_to_list(self.restart_variables)

if check_errors:
warnings.warn(
Expand All @@ -1819,7 +1831,8 @@ def __call__(
"the_sals": self.the_sals,
"num_wq_vars": self.num_wq_vars,
"wq_names": self.wq_names,
"wq_init_vals": self.wq_init_vals
"wq_init_vals": self.wq_init_vals,
"restart_variables": self.restart_variables
}

return init_profiles_dict
Expand Down Expand Up @@ -2650,6 +2663,9 @@ class NMLInflow(NMLBase):
subm_flag : Union[List[bool], bool, None]
Switch indicating if the inflow is entering as a submerged input. A
list if `num_inflows > 1`. Default is `None`.
subm_elev : Union[List[float], float, None]
Elevations from bottom of lake as subm_elev = 0.0 to top as subm_elev = lake_level, of submerged inflows.
list if `num_inflows > 1`. Default is `None`.
strm_hf_angle : Union[List[float], float, None]
Angle describing the width of an inflow river channel ("half angle"). A
list if `num_inflows > 1`. Default is `None`.
Expand Down Expand Up @@ -2690,6 +2706,7 @@ class NMLInflow(NMLBase):
... 'Inflow1','Inflow2','Inflow3','Inflow4','Inflow5','Inflow6'
... ],
... "subm_flag": [False, False, False, True, False, False],
... "subm_elev": [65.0, 65.0, 65.0, 5.0, 65.0, 65.0]
... "strm_hf_angle": [85.0, 85.0, 85.0, 85.0, 85.0, 85.0],
... "strmbd_slope": [4.0, 4.0, 4.0, 4.0, 4.0, 4.0],
... "strmbd_drag": [0.0160, 0.0160, 0.0160, 0.0160, 0.0160, 0.0160],
Expand All @@ -2711,6 +2728,7 @@ def __init__(
num_inflows: Union[int, None] = None,
names_of_strms: Union[List[str], str, None] = None,
subm_flag: Union[List[bool], bool, None] = None,
subm_elev: Union[List[float], float, None] = None,
strm_hf_angle: Union[List[float], float, None] = None,
strmbd_slope: Union[List[float], float, None] = None,
strmbd_drag: Union[List[float], float, None] = None,
Expand All @@ -2724,6 +2742,7 @@ def __init__(
self.num_inflows = num_inflows
self.names_of_strms = names_of_strms
self.subm_flag = subm_flag
self.subm_elev = subm_elev
self.strm_hf_angle = strm_hf_angle
self.strmbd_slope = strmbd_slope
self.strmbd_drag = strmbd_drag
Expand Down Expand Up @@ -2783,6 +2802,7 @@ def __call__(
'Inflow1', 'Inflow2', 'Inflow3', 'Inflow4', 'Inflow5'
],
'subm_flag': None,
'subm_elev': None,
'strm_hf_angle': None,
'strmbd_slope': None,
'strmbd_drag': None,
Expand Down Expand Up @@ -2818,6 +2838,7 @@ def __call__(
"num_inflows": self.num_inflows,
"names_of_strms": self.names_of_strms,
"subm_flag": self.subm_flag,
"subm_elev": self.subm_elev,
"strm_hf_angle": self.strm_hf_angle,
"strmbd_slope": self.strmbd_slope,
"strmbd_drag": self.strmbd_drag,
Expand Down Expand Up @@ -3071,6 +3092,7 @@ def __call__(
'crest_factor': None
}
"""
self.outflow_fl = self._single_value_to_list(self.outflow_fl)
self.outflow_factor = self._single_value_to_list(self.outflow_factor)
self.outflow_thick_limit = self._single_value_to_list(
self.outflow_thick_limit
Expand Down
Loading