Skip to content

allow getting layer top/botm from ds #422

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
Mar 14, 2025
Merged

allow getting layer top/botm from ds #422

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3195da7
allow getting layer top/botm from ds
dbrakenhoff Mar 8, 2025
94c0782
address comments @rubencalje
dbrakenhoff Mar 14, 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
33 changes: 26 additions & 7 deletions nlmod/gwf/wells.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import geopandas as gpd
import numpy as np
import pandas as pd
from tqdm.auto import tqdm

from ..dims.grid import gdf_to_grid

Expand Down Expand Up @@ -132,13 +133,13 @@ def maw_from_df(
Q="Q",
rw="rw",
condeqn="THIEM",
strt=0.0,
strt=None,
aux=None,
boundnames=None,
ds=None,
**kwargs,
):
"""Add a Multi-AquiferWell (MAW) package based on input from a (Geo)DataFrame.
"""Add a Multi-Aquifer Well (MAW) package based on input from a (Geo)DataFrame.

Parameters
----------
Expand Down Expand Up @@ -199,11 +200,26 @@ def maw_from_df(
perioddata = []

iw = 0
for index, irow in df.iterrows():
for index, irow in tqdm(df.iterrows(), total=len(df), desc="Adding MAW wells"):
wlayers = np.where(multipliers[index] > 0)[0]

# [wellno, radius, bottom, strt, condeqn, ngwfnodes]
pakdata = [iw, irow[rw], irow[botm], strt, condeqn, len(wlayers)]
if strt is None:
if isinstance(irow["cellid"], (np.integer, int)):
wstrt = (
gwf.dis.top[irow["cellid"]]
if ds is None
else ds.top.values[irow["cellid"]]
)
else:
wstrt = (
gwf.dis.top[irow["cellid"][0], irow["cellid"][1]]
if ds is None
else ds.top.values[irow["cellid"][0], irow["cellid"][1]]
)
else:
wstrt = strt
pakdata = [iw, irow[rw], irow[botm], wstrt, condeqn, len(wlayers)]
for iaux in aux:
pakdata.append(irow[iaux])
if boundnames is not None:
Expand All @@ -215,10 +231,12 @@ def maw_from_df(

for iwellpart, k in enumerate(wlayers):
if k == 0:
laytop = gwf.modelgrid.top
laytop = gwf.modelgrid.top if ds is None else ds.top.values
else:
laytop = gwf.modelgrid.botm[k - 1]
laybot = gwf.modelgrid.botm[k]
laytop = (
gwf.modelgrid.botm[k - 1] if ds is None else ds.botm.values[k - 1]
)
laybot = gwf.modelgrid.botm[k] if ds is None else ds.botm.values[k]

if isinstance(irow["cellid"], int):
# vertex grid
Expand All @@ -230,6 +248,7 @@ def maw_from_df(
cellid = (k, irow["cellid"][0], irow["cellid"][1])
laytop = laytop[irow["cellid"][0], irow["cellid"][1]]
laybot = laybot[irow["cellid"][0], irow["cellid"][1]]

scrn_top = np.min([irow[top], laytop])
scrn_bot = np.max([irow[botm], laybot])

Expand Down