Skip to content

fix(pakbase) unstructured storage check (#1187) #1194

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
jdhughes-dev merged 3 commits into from
Aug 17, 2021
Merged

fix(pakbase) unstructured storage check (#1187) #1194

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3303781
fix(pakbase) unstructured storage check (#1187)
cnicol-gwlogic Aug 17, 2021
d8c8f03
skip storage check if no convertible layers
cnicol-gwlogic Aug 17, 2021
d00fe3f
skip storage check if no convertible layers...
cnicol-gwlogic Aug 17, 2021
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
67 changes: 36 additions & 31 deletions flopy/pakbase.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -376,6 +376,7 @@ def _check_storage(self, chk, storage_coeff):
)

# only check specific yield for convertible layers
skip_sy_check = False
if "laytyp" in self.__dict__:
inds = np.array(
[
Expand All @@ -385,45 +386,49 @@ def _check_storage(self, chk, storage_coeff):
for l in self.laytyp
]
)
if self.ss.shape[1] is None:
# unstructured; build flat nodal property array slicers (by layer)
node_to = np.cumsum([s.array.size for s in self.ss])
node_from = np.array([0] + list(node_to[:-1]))
node_k_slices = np.array(
[
np.s_[n_from:n_to]
for n_from, n_to in zip(node_from, node_to)
]
)[inds]
sarrays["sy"] = np.asarray(
[sarrays["sy"][sl] for sl in node_k_slices]
).flatten()
active = np.asarray(
[active[sl] for sl in node_k_slices], dtype=bool
).flatten()
if inds.any():
if self.sy.shape[1] is None:
# unstructured; build flat nodal property array slicers (by layer)
node_to = np.cumsum([s.array.size for s in self.ss])
node_from = np.array([0] + list(node_to[:-1]))
node_k_slices = np.array(
[
np.s_[n_from:n_to]
for n_from, n_to in zip(node_from, node_to)
]
)[inds]
sarrays["sy"] = np.concatenate(
[sarrays["sy"][sl] for sl in node_k_slices]
).flatten()
active = np.concatenate(
[active[sl] for sl in node_k_slices]
).flatten()
else:
sarrays["sy"] = sarrays["sy"][inds, :, :]
active = active[inds, :, :]
else:
sarrays["sy"] = sarrays["sy"][inds, :, :]
active = active[inds, :, :]
skip_sy_check = True
else:
iconvert = self.iconvert.array
for ishape in np.ndindex(active.shape):
if active[ishape]:
active[ishape] = (
iconvert[ishape] > 0 or iconvert[ishape] < 0
)
chk.values(
sarrays["sy"],
active & (sarrays["sy"] < 0),
"zero or negative specific yield values",
"Error",
)
self._check_thresholds(
chk,
sarrays["sy"],
active,
chk.property_threshold_values["sy"],
"specific yield",
)
if not skip_sy_check:
chk.values(
sarrays["sy"],
active & (sarrays["sy"] < 0),
"zero or negative specific yield values",
"Error",
)
self._check_thresholds(
chk,
sarrays["sy"],
active,
chk.property_threshold_values["sy"],
"specific yield",
)


class Package(PackageInterface):
Expand Down