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

update variable names to v2.2 data model #211

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

update variable names to v2.2 data model #211

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
354b088
update variable names to v2.2 data model
JordanLaserGit Dec 5, 2024
e5b3403
add variable checks
JordanLaserGit Jan 8, 2025
0cd9781
fix typos
JordanLaserGit Jan 8, 2025
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
45 changes: 36 additions & 9 deletions python/ngen_config_gen/src/ngen/config_gen/models/cfe.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,50 +55,77 @@ def hydrofabric_linked_data_hook(
"""
# beta exponent on Clapp-Hornberger (1978) soil water relations
# NOTE: it seems all values each layer of `bexp_soil_layers_stag` are the same.
x_data = data.get("mode.bexp_soil_layers_stag=1",None)
if x_data is None: x_data = data.get("bexp_soil_layers_stag=1",None)
if x_data is None: raise Exception(f"Neither mode.bexp_soil_layers_stag=1 nor bexp_soil_layers_stag=1 were found in attributes")
self.data["soil_params_b"] = FloatUnitPair(
value=data["bexp_soil_layers_stag=1"],
value=x_data,
unit=EMPTY,
)

# saturated hydraulic conductivity
# NOTE: it seems all values each layer of `dksat_soil_layers_stag` are the same.
x_data = data.get("geom_mean.dksat_soil_layers_stag=1",None)
if x_data is None: x_data = data.get("dksat_soil_layers_stag=1",None)
if x_data is None: raise Exception(f"Neither geom_mean.dksat_soil_layers_stag=1 nor dksat_soil_layers_stag=1 were found in attributes")
self.data["soil_params_satdk"] = FloatUnitPair(
value=data["dksat_soil_layers_stag=1"],
value=x_data,
unit=M_PER_S,
)

# saturated capillary head
# NOTE: it seems all values each layer of `psisat_soil_layers_stag` are the same.
x_data = data.get("geom_mean.psisat_soil_layers_stag=1",None)
if x_data is None: x_data = data.get("psisat_soil_layers_stag=1",None)
if x_data is None: raise Exception(f"Neither geom_mean.psisat_soil_layers_stag=1 nor psisat_soil_layers_stag=1 were found in attributes")
self.data["soil_params_satpsi"] = FloatUnitPair(
value=data["psisat_soil_layers_stag=1"],
value=x_data,
unit=METERS,
)

# this factor (0-1) modifies the gradient of the hydraulic head at the soil bottom. 0=no-flow.
self.data["soil_params_slop"] = FloatUnitPair(value=data["slope"], unit=M_PER_M)
x_data = data.get("mean.slope",None)
if x_data is None: x_data = data.get("slope",None)
if x_data is None: raise Exception(f"Neither mean.slope nor slope were found in attributes")
self.data["soil_params_slop"] = FloatUnitPair(value=x_data, unit=M_PER_M)

# saturated soil moisture content
# NOTE: it seems all values each layer of `smcmax_soil_layers_stag` are the same.
x_data = data.get("mean.smcmax_soil_layers_stag=1",None)
if x_data is None: x_data = data.get("smcmax_soil_layers_stag=1",None)
if x_data is None: raise Exception(f"Neither mean.smcmax_soil_layers_stag=1 nor smcmax_soil_layers_stag=1 were found in attributes")
self.data["soil_params_smcmax"] = FloatUnitPair(
value=data["smcmax_soil_layers_stag=1"],
value=x_data,
unit=M_PER_M,
)

# wilting point soil moisture content
# NOTE: it seems all values each layer of `smcwlt_soil_layers_stag` are the same.
x_data = data.get("mean.smcwlt_soil_layers_stag=1",None)
if x_data is None: x_data = data.get("smcwlt_soil_layers_stag=1",None)
if x_data is None: raise Exception(f"Neither mean.smcwlt_soil_layers_stag=1 nor smcwlt_soil_layers_stag=1 were found in attributes")
self.data["soil_params_wltsmc"] = FloatUnitPair(
value=data["smcwlt_soil_layers_stag=1"],
value=x_data,
unit=M_PER_M,
)

# maximum storage in the conceptual reservoir
self.data["max_gw_storage"] = FloatUnitPair(value=data["gw_Zmax"], unit=METERS)
x_data = data.get("mean.Zmax",None)
if x_data is None: x_data = data.get("gw_Zmax",None)
if x_data is None: raise Exception(f"Neither mean.Zmax nor gw_Zmax were found in attributes")
self.data["max_gw_storage"] = FloatUnitPair(value=x_data, unit=METERS)

# the primary outlet coefficient
self.data["cgw"] = FloatUnitPair(value=data["gw_Coeff"], unit=M_PER_H)
x_data = data.get("mean.Coeff",None)
if x_data is None: x_data = data.get("gw_Coeff",None)
if x_data is None: raise Exception(f"Neither mean.Coeff nor gw_Coeff were found in attributes")
self.data["cgw"] = FloatUnitPair(value=x_data, unit=M_PER_H)

# exponent parameter (1.0 for linear reservoir)
self.data["expon"] = FloatUnitPair(value=data["gw_Expon"], unit=EMPTY)
x_data = data.get("mode.Expon",None)
if x_data is None: x_data = data.get("gw_Expon",None)
if x_data is None: raise Exception(f"Neither mode.Expon nor gw_Expon were found in attributes")
self.data["expon"] = FloatUnitPair(value=x_data, unit=EMPTY)

def _v2_defaults(self) -> None:
"""
Expand Down
19 changes: 15 additions & 4 deletions python/ngen_config_gen/src/ngen/config_gen/models/pet.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,10 +46,21 @@ def hydrofabric_linked_data_hook(
"""
if version != "2.0":
raise RuntimeError("only support v2 hydrofabric")

self.data["longitude_degrees"] = data["X"]
self.data["latitude_degrees"] = data["Y"]
self.data["site_elevation_m"] = data["elevation_mean"]

x_data = data.get("X",None)
if x_data is None: x_data = data.get("centroid_x",None)
if x_data is None: raise Exception(f"Neither X nor centroid_x were found in attributes")
self.data["longitude_degrees"] = x_data

x_data = data.get("Y",None)
if x_data is None: x_data = data.get("centroid_y",None)
if x_data is None: raise Exception(f"Neither Y nor centroid_y were found in attributes")
self.data["latitude_degrees"] = x_data

x_data = data.get("elevation_mean",None)
if x_data is None: x_data = data.get("mean.elevation",None)
if x_data is None: raise Exception(f"Neither elevation_mean nor mean.elevation were found in attributes")
self.data["site_elevation_m"] = x_data

def _v2_defaults(self) -> None:
self.data["yes_wrf"] = False
Expand Down