Skip to content

Return a new Dataset from discretize_buisdrainage() #483

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

Merged
dbrakenhoff merged 2 commits into from
Jun 19, 2025
Merged

Return a new Dataset from discretize_buisdrainage() #483

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
69219c0
Return a new Dataset from `discretize_buisdrainage()`
rubencalje Jun 18, 2025
41b19f3
Improve error-message
rubencalje Jun 18, 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
24 changes: 14 additions & 10 deletions nlmod/read/nhi.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
import rioxarray

from ..dims.resample import structured_da_to_ds
from ..util import get_ds_empty

logger = logging.getLogger(__name__)

Expand Down Expand Up @@ -123,18 +124,19 @@ def add_buisdrainage(

warnings.warn(
"'add_buisdrainage' is deprecated and will be removed in a future version. "
"Use 'nlmod.read.hni.discretize_buisdrainage' to project the buisdrainage on the model grid",
"Use 'ds.update(nlmod.read.hni.discretize_buisdrainage(ds))' to project the "
"buisdrainage on the model grid",
DeprecationWarning,
)

return discretize_buisdrainage(
ds_out = discretize_buisdrainage(
ds,
pathname,
cond_var,
depth_var,
cond_method,
depth_method,
)
return ds.update(ds_out)


def discretize_buisdrainage(
Expand Down Expand Up @@ -193,6 +195,8 @@ def discretize_buisdrainage(
if ds.rio.crs is None:
ds = ds.rio.write_crs(28992)

ds_out = get_ds_empty(ds, keep_coords=("y", "x"))

# use cond_methd for conductance
# (default is "average" to account for locations without pipe drainage, where the
# conductance is 0)
Expand All @@ -203,9 +207,9 @@ def discretize_buisdrainage(
cond = cond.where(~(np.isinf(cond) | np.isnan(cond)), 0.0)
cond = cond.rio.write_crs(buisdrain_c.rio.crs)
# resample to model grid
ds[cond_var] = structured_da_to_ds(cond, ds, method=cond_method)
ds_out[cond_var] = structured_da_to_ds(cond, ds, method=cond_method)
# multiply by area to get a conductance
ds[cond_var] = ds[cond_var] * ds["area"]
ds_out[cond_var] = ds_out[cond_var] * ds["area"]

# use depth_method to retrieve the depth
# (default is "mode" for depth that occurs most in each cell)
Expand All @@ -214,22 +218,22 @@ def discretize_buisdrainage(
if mask_and_scale:
nodata = np.nan
else:
nodata = buisdrain_d.attrs["_FillValue"]
nodata = int(buisdrain_d.attrs["_FillValue"])
# set buisdrain_d to nodata where it is 0
mask = buisdrain_d != 0
buisdrain_d = buisdrain_d.where(mask, nodata).rio.write_crs(buisdrain_d.rio.crs)
# resample to model grid
ds[depth_var] = structured_da_to_ds(
ds_out[depth_var] = structured_da_to_ds(
buisdrain_d, ds, method=depth_method, nodata=nodata
)
if not mask_and_scale:
# set nodata values to NaN
ds[depth_var] = ds[depth_var].where(ds[depth_var] != nodata)
ds_out[depth_var] = ds_out[depth_var].where(ds_out[depth_var] != nodata)

# from cm to m
ds[depth_var] = ds[depth_var] / 100.0
ds_out[depth_var] = ds_out[depth_var] / 100.0

return ds
return ds_out


def get_gwo_wells(
Expand Down
Loading