Skip to content

Improve gwt #498

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
OnnoEbbens merged 3 commits into from
Jul 29, 2025
Merged

Improve gwt #498

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
1d46d51
add suffix to filename
OnnoEbbens Jul 23, 2025
722f983
minor changes
OnnoEbbens Jul 23, 2025
1f9885f
ruff
OnnoEbbens Jul 23, 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
2 changes: 1 addition & 1 deletion nlmod/dims/layers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2350,7 +2350,7 @@ def get_modellayers_indexer(
if npts_outside_domain > 0:
maskpts = ~pts_to_cellid.isna()
pts = pts[maskpts]
pts_to_cellid = pts_to_cellid[maskpts]
pts_to_cellid = pts_to_cellid[maskpts]
df = df.loc[maskpts.values].copy()
logger.warning(
"Warning! Dropped %d points outside the model domain.", npts_outside_domain
Expand Down
12 changes: 6 additions & 6 deletions nlmod/gwf/gwf.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ def dis(ds, gwf, length_units="METERS", pname="dis", **kwargs):
length_units : str, optional
length unit. The default is 'METERS'.
pname : str, optional
package name
package name, ignored if ds has a vertex grid (disv)

Returns
-------
Expand Down Expand Up @@ -98,10 +98,10 @@ def _dis(ds, model, length_units="METERS", pname="dis", **kwargs):
dis : flopy ModflowGwfdis or flopy ModflowGwtdis
discretisation package.
"""
logger.info("creating mf6 DIS")

if ds.gridtype == "vertex":
return disv(ds, model, length_units=length_units)
return disv(ds, model, length_units=length_units, **kwargs)

logger.info("creating mf6 DIS")

# check attributes
if "angrot" in ds.attrs and ds.attrs["angrot"] != 0.0:
Expand Down Expand Up @@ -206,10 +206,10 @@ def _disv(ds, model, length_units="METERS", pname="disv", **kwargs):
filename = f"{ds.model_name}.disv"
elif model.model_type == "gwt6":
klass = flopy.mf6.ModflowGwtdisv
filename = f"{ds.model_name}.disv"
filename = f"{ds.model_name}_gwt.disv"
elif model.model_type == "prt6":
klass = flopy.mf6.ModflowPrtdisv
filename = f"{ds.model_name}.disv"
filename = f"{ds.model_name}_prt.disv"
else:
raise ValueError("Unknown model type.")
disv = klass(
Expand Down
4 changes: 2 additions & 2 deletions nlmod/gwt/gwt.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ def dis(ds, gwt, length_units="METERS", pname="dis", **kwargs):
length_units : str, optional
length unit. The default is 'METERS'.
pname : str, optional
package name
package name, ignored if ds has a vertex grid (disv)

Returns
-------
Expand All @@ -74,7 +74,7 @@ def disv(ds, gwt, length_units="METERS", pname="disv", **kwargs):
----------
ds : xarray.Dataset
dataset with model data.
model : flopy ModflowGwt
gwt : flopy ModflowGwt
groundwater transport object.
length_units : str, optional
length unit. The default is 'METERS'.
Expand Down