diff --git a/nlmod/dims/layers.py b/nlmod/dims/layers.py index d505a13c..fc13e0eb 100644 --- a/nlmod/dims/layers.py +++ b/nlmod/dims/layers.py @@ -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 diff --git a/nlmod/gwf/gwf.py b/nlmod/gwf/gwf.py index 39e26379..ce84ac28 100644 --- a/nlmod/gwf/gwf.py +++ b/nlmod/gwf/gwf.py @@ -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 ------- @@ -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: @@ -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( diff --git a/nlmod/gwt/gwt.py b/nlmod/gwt/gwt.py index 26ad4aad..e633b807 100644 --- a/nlmod/gwt/gwt.py +++ b/nlmod/gwt/gwt.py @@ -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 ------- @@ -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'.