Skip to content

fix(lakpak_utils): fix telev and belev for horizontal connections #1168

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
merged 1 commit into from
Aug 5, 2021
Merged

fix(lakpak_utils): fix telev and belev for horizontal connections #1168

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 6 additions & 6 deletions autotest/t049_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,9 +78,9 @@ def test_modpath():
success, buff = mp.run_model(silent=False)
except:
success = False
assert success, (
"forward modpath model run did not terminate successfully"
)
assert (
success
), "forward modpath model run did not terminate successfully"

mpnam = "freybergmpp"
mpp = flopy.modpath.Modpath6(
Expand All @@ -106,9 +106,9 @@ def test_modpath():
success, buff = mpp.run_model(silent=False)
except:
success = False
assert success, (
"backward modpath model run did not terminate successfully"
)
assert (
success
), "backward modpath model run did not terminate successfully"

# load modpath output files
if run:
Expand Down
20 changes: 12 additions & 8 deletions flopy/mf6/utils/lakpak_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,44 +211,48 @@ def __structured_lake_connections(
# back face
if i > 0:
ci = (k, i - 1, j)
cit = (k + 1, i - 1, j)
if np.ma.is_masked(lake_map[ci]) and idomain[ci] > 0:
cellids.append(ci)
claktypes.append("horizontal")
belevs.append(elevations[k + 1, i, j])
televs.append(elevations[k, i, j])
belevs.append(elevations[cit])
televs.append(elevations[ci])
connlens.append(0.5 * dy[i - 1])
connwidths.append(dx[j])

# left face
if j > 0:
ci = (k, i, j - 1)
cit = (k + 1, i, j - 1)
if np.ma.is_masked(lake_map[ci]) and idomain[ci] > 0:
cellids.append(ci)
claktypes.append("horizontal")
belevs.append(elevations[k + 1, i, j])
televs.append(elevations[k, i, j])
belevs.append(elevations[cit])
televs.append(elevations[ci])
connlens.append(0.5 * dx[j - 1])
connwidths.append(dy[i])

# right face
if j < ncol - 1:
ci = (k, i, j + 1)
cit = (k + 1, i, j + 1)
if np.ma.is_masked(lake_map[ci]) and idomain[ci] > 0:
cellids.append(ci)
claktypes.append("horizontal")
belevs.append(elevations[k + 1, i, j])
televs.append(elevations[k, i, j])
belevs.append(elevations[cit])
televs.append(elevations[ci])
connlens.append(0.5 * dx[j + 1])
connwidths.append(dy[i])

# front face
if i < nrow - 1:
ci = (k, i + 1, j)
cit = (k + 1, i + 1, j)
if np.ma.is_masked(lake_map[ci]) and idomain[ci] > 0:
cellids.append(ci)
claktypes.append("horizontal")
belevs.append(elevations[k + 1, i, j])
televs.append(elevations[k, i, j])
belevs.append(elevations[cit])
televs.append(elevations[ci])
connlens.append(0.5 * dy[i + 1])
connwidths.append(dx[j])

Expand Down