Skip to content

refactor: miscellaneous #101

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
wpbonelli merged 1 commit into from
Jul 4, 2026
Merged

refactor: miscellaneous #101

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
13 changes: 6 additions & 7 deletions modflowapi/extensions/apimodel.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
import math

import numpy as np

from ..util import is_exg
Expand Down Expand Up @@ -35,7 +37,7 @@ def package_list(self):
"""
Returns a list of package objects for the model
"""
return [package for _, package in self.package_dict.items()]
return list(self.package_dict.values())

@property
def package_names(self):
Expand All @@ -46,7 +48,7 @@ def package_names(self):

@property
def package_types(self):
return list(set([package.pkg_type for package in self.package_list]))
return list({package.pkg_type for package in self.package_list})

def _set_package_names(self):
"""
Expand Down Expand Up @@ -260,8 +262,8 @@ def shape(self):
"""
Returns a tuple of the model shape
"""
ivn = self.mf6.get_input_var_names()
if self._shape is None:
ivn = self.mf6.get_input_var_names()
shape_vars = gridshape[self.dis_type]
shape = []
for var in shape_vars:
Expand All @@ -280,10 +282,7 @@ def size(self):
Returns the number of nodes in the model
"""
if self._size is None:
size = 1
for dim in self.shape:
size *= dim
self._size = size
self._size = math.prod(self.shape)
return self._size

@property
Expand Down
47 changes: 7 additions & 40 deletions modflowapi/extensions/apisimulation.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,6 @@ def __init__(self, mf6, models, solutions, exchanges, tdis, ats):

self.tdis = tdis
self.ats = ats
self._ats_active = True
if ats is None:
self._ats_active = False

def __getattr__(self, item):
"""
Expand Down Expand Up @@ -72,7 +69,7 @@ def ats_active(self):
Returns a boolean to indicate if the ATS package is used in this
simulation.
"""
return self._ats_active
return self.ats is not None

@property
def ats_period(self):
Expand Down Expand Up @@ -134,9 +131,7 @@ def sln(self):
"""
if len(self._solutions) > 1:
return list(self._solutions.values())
else:
for sln in self._solutions.values():
return sln
return next(iter(self._solutions.values()))

@property
def model_names(self):
Expand All @@ -158,7 +153,7 @@ def models(self):
"""
Returns a list of ApiModel objects associated with the simulation
"""
return [v for _, v in self._models.items()]
return list(self._models.values())

@property
def iteration(self):
Expand Down Expand Up @@ -283,25 +278,7 @@ def load(mf6):
id_var_addr = mf6.get_var_address("ID", name)
if name.startswith("SLN"):
continue
elif (
name.startswith("GWFIM")
or name.startswith("GWTIM")
or name.startswith("GWEIM")
or name.startswith("PRTIM")
or name.startswith("CHFIM")
or name.startswith("OLFIM")
or name.startswith("SWFIM")
):
continue
elif (
name.startswith("GWFCON")
or name.startswith("GWTCON")
or name.startswith("GWECON")
or name.startswith("PRTCON")
or name.startswith("CHFCON")
or name.startswith("OLFCON")
or name.startswith("SWFCON")
):
elif name[3:5] in ("IM", "CO"):
continue
if id_var_addr not in variables:
continue
Expand All @@ -321,22 +298,14 @@ def load(mf6):
id_var_addr = mf6.get_var_address("ID", name)
if name.lower() in models or name == "TDIS":
continue
if (
name.startswith("GWFIM")
or name.startswith("GWTIM")
or name.startswith("GWEIM")
or name.startswith("PRTIM")
or name.startswith("CHFIM")
or name.startswith("OLFIM")
or name.startswith("SWFIM")
):
if name[3:5] == "IM":
continue
if id_var_addr not in variables:
continue

solution_names.append(t[0])

idp_names = [i for i in mf6.get_value("__INPUT__/SIM/NAM/SLNMNAMES")]
idp_names = list(mf6.get_value("__INPUT__/SIM/NAM/SLNMNAMES"))
solution_types = [
i[:-1].lower() for ix, i in enumerate(mf6.get_value("__INPUT__/SIM/NAM/SLNTYPE")) if idp_names[ix]
]
Expand Down Expand Up @@ -373,10 +342,8 @@ def load(mf6):
if is_exg(name) and exchange_name not in exchange_names:
exchange_names.append(exchange_name)

# sim_packages: tdis, gwf-gwf, sln
exchanges = {}
for exchange_name in exchange_names:
exchange = ApiExchange(mf6, exchange_name)
exchanges[exchange_name.lower()] = exchange
exchanges[exchange_name.lower()] = ApiExchange(mf6, exchange_name)

return ApiSimulation(mf6, models, solutions, exchanges, tdis, ats)
Loading