Skip to content

update(intersect): refactor "forgrive" parameter to "forgive" #2516

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
jlarsen-usgs merged 1 commit into from
May 23, 2025
Merged

update(intersect): refactor "forgrive" parameter to "forgive" #2516

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
5 changes: 0 additions & 5 deletions autotest/test_model_splitter.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,6 @@
@requires_exe("mf6")
def test_structured_model_splitter(function_tmpdir):
sim_path = get_example_data_path() / "mf6-freyberg"

from pathlib import Path

function_tmpdir = Path("./temp")

split_path = function_tmpdir / "split_model"

sim = MFSimulation.load(sim_ws=sim_path)
Expand Down
6 changes: 3 additions & 3 deletions flopy/discretization/modeltime.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -568,7 +568,7 @@ def get_datetime(self, kper, kstp=None, start=False):

return self._datetime_dict[(kper, kstp)]

def intersect(self, datetime_obj=None, totim=None, forgrive=False):
def intersect(self, datetime_obj=None, totim=None, forgive=False):
"""
Method to intersect a datetime or totim value with the model and
get the model stress-period and time-step associated with that
Expand Down Expand Up @@ -643,8 +643,8 @@ def intersect(self, datetime_obj=None, totim=None, forgrive=False):
)

if totim > self.totim[-1] or totim <= 0:
if forgrive:
return None
if forgive:
return None, None
if datetime_obj is None:
msg = (
f"supplied totim {totim} is outside of model's "
Expand Down
Loading