Skip to content
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

Jump to bottom

feat(gwe): adding support for the GWE model #49

Closed
wants to merge 5 commits into from
Closed

feat(gwe): adding support for the GWE model #49

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
371bdad
feat(gwe): adding support for the GWE model
emorway-usgs Jul 23, 2024
eb46768
Update apimodel.py
jlarsen-usgs Jul 23, 2024
ebadb01
Update apiexchange.py
jlarsen-usgs Jul 23, 2024
abce215
Update apiexchange.py
jlarsen-usgs Jul 23, 2024
d521341
linting it
emorway-usgs Jul 23, 2024
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
6 changes: 5 additions & 1 deletion modflowapi/extensions/apiexchange.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,9 @@ class ApiExchange(ApiMbase):
"""

def __init__(self, mf6, name):
pkg_types = {"gwf-gwf": ListPackage, "gwt-gwt": ListPackage}
pkg_types = {
"gwf-gwf": ListPackage,
"gwt-gwt": ListPackage,
"gwe-gwe": ListPackage,
}
super().__init__(mf6, name, pkg_types)
7 changes: 6 additions & 1 deletion modflowapi/extensions/apimodel.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,11 +165,16 @@ def __init__(self, mf6, name):
"sto": ArrayPackage,
"wel": ListPackage,
# gwt
"adv": ArrayPackage,
"dsp": ArrayPackage,
"cnc": ListPackage,
"ist": ArrayPackage,
"mst": ArrayPackage,
"src": ListPackage,
# gwe
"cnd": ArrayPackage,
"ctp": ListPackage,
"esl": ListPackage,
"est": ArrayPackage,
}

self.allow_convergence = True
Expand Down
24 changes: 23 additions & 1 deletion modflowapi/extensions/pakbase.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@
"auxvar",
],
# gwt model
"adv": ["diffc", "alh", "alv", "ath1", "ath2", "atv"],
"dsp": ["diffc", "alh", "alv", "ath1", "ath2", "atv"],
"cnc": [
"maxbound",
"nbound",
Expand Down Expand Up @@ -121,9 +121,31 @@
"auxname_cst",
"auxvar",
],
# gwe model
"cnd": ["alh", "alv", "ath1", "ath2", "atv", "ktw", "kts"],
"ctp": [
"maxbound",
"nbound",
"nodelist",
("bound", ("temp",)),
"naux",
"auxname_cst",
"auxvar",
],
"esl": [
"maxbound",
"nbound",
"nodelist",
("bound", ("senerrate",)),
"naux",
"auxname_cst",
"auxvar",
],
"est": ["porosity", "decay", "cps", "rhos"],
# exchange model
"gwf-gwf": ["nexg", "nodem1", "nodem2", "cl1", "cl2", "ihc"],
"gwt-gwt": ["nexg", "nodem1", "nodem2", "cl1", "cl2", "ihc"],
"gwe-gwe": ["nexg", "nodem1", "nodem2", "cl1", "cl2", "ihc"],
# simulation
"ats": [
"maxats",
Expand Down
Loading