Skip to content

Commit 84c0ee8

Browse files
wpbonelliwpbonelli
committed
Merge remote-tracking branch 'origin/master' into v3.5.0
2 parents 338f6d0 + 45cb0fa commit 84c0ee8

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

79 files changed

+110
-77
lines changed

‎.docs/md/version_changes.md

Lines changed: 32 additions & 0 deletions

‎CITATION.cff

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ message: If you use this software, please cite both the article from preferred-c
44
type: software
55
title: FloPy
66
version: 3.5.0.dev0
7-
date-released: '2023-07-13'
7+
date-released: '2023-09-30'
88
doi: 10.5066/F7BK19FH
99
abstract: A Python package to create, run, and post-process MODFLOW-based models.
1010
repository-artifact: https://pypi.org/project/flopy

‎README.md

Lines changed: 1 addition & 1 deletion

‎autotest/regression/test_mf6.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3085,7 +3085,7 @@ def test028_create_tests_sfr(function_tmpdir, example_data_path):
30853085
delc=5000.0,
30863086
top=top,
30873087
botm=botm,
3088-
idomain=idomain,
3088+
# idomain=idomain,
30893089
filename=f"{model_name}.dis",
30903090
)
30913091
strt = testutils.read_std_array(os.path.join(pth, "strt.txt"), "float")

‎autotest/test_binaryfile.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
from modflow_devtools.markers import requires_exe
1010

1111
import flopy
12+
from flopy.modflow import Modflow
1213
from flopy.utils import (
1314
BinaryHeader,
1415
CellBudgetFile,

‎code.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
"laborHours": -1,
3232
"version": "3.5.0.dev0",
3333
"date": {
34-
"metadataLastUpdated": "2023-07-13"
34+
"metadataLastUpdated": "2023-09-30"
3535
},
3636
"organization": "U.S. Geological Survey",
3737
"permissions": {

‎docs/PyPI_release.md

Lines changed: 1 addition & 1 deletion

‎flopy/mf6/modflow/mfems.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY
22
# mf6/utils/createpackages.py
3-
# FILE created on June 29, 2023 14:20:38 UTC
3+
# FILE created on September 30, 2023 14:44:04 UTC
44
from .. import mfpackage
55

66

‎flopy/mf6/modflow/mfgnc.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY
22
# mf6/utils/createpackages.py
3-
# FILE created on June 29, 2023 14:20:38 UTC
3+
# FILE created on September 30, 2023 14:44:04 UTC
44
from .. import mfpackage
55
from ..data.mfdatautil import ListTemplateGenerator
66

‎flopy/mf6/modflow/mfgwf.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY
22
# mf6/utils/createpackages.py
3-
# FILE created on June 29, 2023 14:20:38 UTC
3+
# FILE created on September 30, 2023 14:44:04 UTC
44
from .. import mfmodel
55
from ..data.mfdatautil import ArrayTemplateGenerator, ListTemplateGenerator
66

‎flopy/mf6/modflow/mfgwfapi.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY
22
# mf6/utils/createpackages.py
3-
# FILE created on June 29, 2023 14:20:38 UTC
3+
# FILE created on September 30, 2023 14:44:04 UTC
44
from .. import mfpackage
55
from ..data.mfdatautil import ListTemplateGenerator
66

‎flopy/mf6/modflow/mfgwfbuy.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY
22
# mf6/utils/createpackages.py
3-
# FILE created on June 29, 2023 14:20:38 UTC
3+
# FILE created on September 30, 2023 14:44:04 UTC
44
from .. import mfpackage
55
from ..data.mfdatautil import ListTemplateGenerator
66

‎flopy/mf6/modflow/mfgwfchd.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY
22
# mf6/utils/createpackages.py
3-
# FILE created on August 29, 2023 20:06:54 UTC
3+
# FILE created on September 30, 2023 14:44:04 UTC
44
from .. import mfpackage
55
from ..data.mfdatautil import ListTemplateGenerator
66

‎flopy/mf6/modflow/mfgwfcsub.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY
22
# mf6/utils/createpackages.py
3-
# FILE created on June 29, 2023 14:20:38 UTC
3+
# FILE created on September 30, 2023 14:44:04 UTC
44
from .. import mfpackage
55
from ..data.mfdatautil import ArrayTemplateGenerator, ListTemplateGenerator
66

‎flopy/mf6/modflow/mfgwfdis.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY
22
# mf6/utils/createpackages.py
3-
# FILE created on June 29, 2023 14:20:38 UTC
3+
# FILE created on September 30, 2023 14:44:04 UTC
44
from .. import mfpackage
55
from ..data.mfdatautil import ArrayTemplateGenerator
66

‎flopy/mf6/modflow/mfgwfdisu.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY
22
# mf6/utils/createpackages.py
3-
# FILE created on June 29, 2023 14:20:38 UTC
3+
# FILE created on September 30, 2023 14:44:04 UTC
44
from .. import mfpackage
55
from ..data.mfdatautil import ArrayTemplateGenerator, ListTemplateGenerator
66

‎flopy/mf6/modflow/mfgwfdisv.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY
22
# mf6/utils/createpackages.py
3-
# FILE created on June 29, 2023 14:20:38 UTC
3+
# FILE created on September 30, 2023 14:44:04 UTC
44
from .. import mfpackage
55
from ..data.mfdatautil import ArrayTemplateGenerator, ListTemplateGenerator
66

‎flopy/mf6/modflow/mfgwfdrn.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY
22
# mf6/utils/createpackages.py
3-
# FILE created on August 29, 2023 20:06:54 UTC
3+
# FILE created on September 30, 2023 14:44:04 UTC
44
from .. import mfpackage
55
from ..data.mfdatautil import ListTemplateGenerator
66

‎flopy/mf6/modflow/mfgwfevt.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY
22
# mf6/utils/createpackages.py
3-
# FILE created on August 29, 2023 20:06:54 UTC
3+
# FILE created on September 30, 2023 14:44:04 UTC
44
from .. import mfpackage
55
from ..data.mfdatautil import ListTemplateGenerator
66

‎flopy/mf6/modflow/mfgwfevta.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY
22
# mf6/utils/createpackages.py
3-
# FILE created on August 29, 2023 20:06:54 UTC
3+
# FILE created on September 30, 2023 14:44:04 UTC
44
from .. import mfpackage
55
from ..data.mfdatautil import ArrayTemplateGenerator, ListTemplateGenerator
66

‎flopy/mf6/modflow/mfgwfghb.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY
22
# mf6/utils/createpackages.py
3-
# FILE created on August 29, 2023 20:06:54 UTC
3+
# FILE created on September 30, 2023 14:44:04 UTC
44
from .. import mfpackage
55
from ..data.mfdatautil import ListTemplateGenerator
66

‎flopy/mf6/modflow/mfgwfgnc.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY
22
# mf6/utils/createpackages.py
3-
# FILE created on June 29, 2023 14:20:38 UTC
3+
# FILE created on September 30, 2023 14:44:04 UTC
44
from .. import mfpackage
55
from ..data.mfdatautil import ListTemplateGenerator
66

‎flopy/mf6/modflow/mfgwfgwf.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY
22
# mf6/utils/createpackages.py
3-
# FILE created on June 29, 2023 14:20:38 UTC
3+
# FILE created on September 30, 2023 14:44:04 UTC
44
from .. import mfpackage
55
from ..data.mfdatautil import ListTemplateGenerator
66

‎flopy/mf6/modflow/mfgwfgwt.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY
22
# mf6/utils/createpackages.py
3-
# FILE created on June 29, 2023 14:20:38 UTC
3+
# FILE created on September 30, 2023 14:44:04 UTC
44
from .. import mfpackage
55

66

‎flopy/mf6/modflow/mfgwfhfb.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY
22
# mf6/utils/createpackages.py
3-
# FILE created on June 29, 2023 14:20:38 UTC
3+
# FILE created on September 30, 2023 14:44:04 UTC
44
from .. import mfpackage
55
from ..data.mfdatautil import ListTemplateGenerator
66

‎flopy/mf6/modflow/mfgwfic.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY
22
# mf6/utils/createpackages.py
3-
# FILE created on June 29, 2023 14:20:38 UTC
3+
# FILE created on September 30, 2023 14:44:04 UTC
44
from .. import mfpackage
55
from ..data.mfdatautil import ArrayTemplateGenerator
66

‎flopy/mf6/modflow/mfgwflak.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY
22
# mf6/utils/createpackages.py
3-
# FILE created on September 26, 2023 15:51:55 UTC
3+
# FILE created on September 30, 2023 14:44:04 UTC
44
from .. import mfpackage
55
from ..data.mfdatautil import ListTemplateGenerator
66

‎flopy/mf6/modflow/mfgwfmaw.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY
22
# mf6/utils/createpackages.py
3-
# FILE created on September 26, 2023 15:51:55 UTC
3+
# FILE created on September 30, 2023 14:44:04 UTC
44
from .. import mfpackage
55
from ..data.mfdatautil import ListTemplateGenerator
66

‎flopy/mf6/modflow/mfgwfmvr.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY
22
# mf6/utils/createpackages.py
3-
# FILE created on June 29, 2023 14:20:38 UTC
3+
# FILE created on September 30, 2023 14:44:04 UTC
44
from .. import mfpackage
55
from ..data.mfdatautil import ListTemplateGenerator
66

‎flopy/mf6/modflow/mfgwfnam.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY
22
# mf6/utils/createpackages.py
3-
# FILE created on June 29, 2023 14:20:38 UTC
3+
# FILE created on September 30, 2023 14:44:04 UTC
44
from .. import mfpackage
55
from ..data.mfdatautil import ListTemplateGenerator
66

‎flopy/mf6/modflow/mfgwfnpf.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY
22
# mf6/utils/createpackages.py
3-
# FILE created on June 29, 2023 14:20:38 UTC
3+
# FILE created on September 30, 2023 14:44:04 UTC
44
from .. import mfpackage
55
from ..data.mfdatautil import ArrayTemplateGenerator, ListTemplateGenerator
66

‎flopy/mf6/modflow/mfgwfoc.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY
22
# mf6/utils/createpackages.py
3-
# FILE created on June 29, 2023 14:20:38 UTC
3+
# FILE created on September 30, 2023 14:44:04 UTC
44
from .. import mfpackage
55
from ..data.mfdatautil import ListTemplateGenerator
66

‎flopy/mf6/modflow/mfgwfrch.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY
22
# mf6/utils/createpackages.py
3-
# FILE created on August 29, 2023 20:06:54 UTC
3+
# FILE created on September 30, 2023 14:44:04 UTC
44
from .. import mfpackage
55
from ..data.mfdatautil import ListTemplateGenerator
66

‎flopy/mf6/modflow/mfgwfrcha.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY
22
# mf6/utils/createpackages.py
3-
# FILE created on August 29, 2023 20:06:54 UTC
3+
# FILE created on September 30, 2023 14:44:04 UTC
44
from .. import mfpackage
55
from ..data.mfdatautil import ArrayTemplateGenerator, ListTemplateGenerator
66

‎flopy/mf6/modflow/mfgwfriv.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY
22
# mf6/utils/createpackages.py
3-
# FILE created on August 29, 2023 20:06:54 UTC
3+
# FILE created on September 30, 2023 14:44:04 UTC
44
from .. import mfpackage
55
from ..data.mfdatautil import ListTemplateGenerator
66

‎flopy/mf6/modflow/mfgwfsfr.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY
22
# mf6/utils/createpackages.py
3-
# FILE created on September 26, 2023 15:51:55 UTC
3+
# FILE created on September 30, 2023 14:44:04 UTC
44
from .. import mfpackage
55
from ..data.mfdatautil import ListTemplateGenerator
66

‎flopy/mf6/modflow/mfgwfsto.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY
22
# mf6/utils/createpackages.py
3-
# FILE created on June 29, 2023 14:20:38 UTC
3+
# FILE created on September 30, 2023 14:44:04 UTC
44
from .. import mfpackage
55
from ..data.mfdatautil import ArrayTemplateGenerator, ListTemplateGenerator
66

‎flopy/mf6/modflow/mfgwfuzf.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY
22
# mf6/utils/createpackages.py
3-
# FILE created on September 26, 2023 15:51:55 UTC
3+
# FILE created on September 30, 2023 14:44:04 UTC
44
from .. import mfpackage
55
from ..data.mfdatautil import ListTemplateGenerator
66

‎flopy/mf6/modflow/mfgwfvsc.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY
22
# mf6/utils/createpackages.py
3-
# FILE created on June 29, 2023 14:20:38 UTC
3+
# FILE created on September 30, 2023 14:44:04 UTC
44
from .. import mfpackage
55
from ..data.mfdatautil import ListTemplateGenerator
66

‎flopy/mf6/modflow/mfgwfwel.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY
22
# mf6/utils/createpackages.py
3-
# FILE created on August 29, 2023 20:06:54 UTC
3+
# FILE created on September 30, 2023 14:44:04 UTC
44
from .. import mfpackage
55
from ..data.mfdatautil import ListTemplateGenerator
66

‎flopy/mf6/modflow/mfgwt.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY
22
# mf6/utils/createpackages.py
3-
# FILE created on June 29, 2023 14:20:38 UTC
3+
# FILE created on September 30, 2023 14:44:04 UTC
44
from .. import mfmodel
55
from ..data.mfdatautil import ArrayTemplateGenerator, ListTemplateGenerator
66

‎flopy/mf6/modflow/mfgwtadv.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY
22
# mf6/utils/createpackages.py
3-
# FILE created on June 29, 2023 14:20:38 UTC
3+
# FILE created on September 30, 2023 14:44:04 UTC
44
from .. import mfpackage
55

66

‎flopy/mf6/modflow/mfgwtapi.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY
22
# mf6/utils/createpackages.py
3-
# FILE created on June 29, 2023 14:20:38 UTC
3+
# FILE created on September 30, 2023 14:44:04 UTC
44
from .. import mfpackage
55
from ..data.mfdatautil import ListTemplateGenerator
66

‎flopy/mf6/modflow/mfgwtcnc.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY
22
# mf6/utils/createpackages.py
3-
# FILE created on June 29, 2023 14:20:38 UTC
3+
# FILE created on September 30, 2023 14:44:04 UTC
44
from .. import mfpackage
55
from ..data.mfdatautil import ListTemplateGenerator
66

‎flopy/mf6/modflow/mfgwtdis.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY
22
# mf6/utils/createpackages.py
3-
# FILE created on June 29, 2023 14:20:38 UTC
3+
# FILE created on September 30, 2023 14:44:04 UTC
44
from .. import mfpackage
55
from ..data.mfdatautil import ArrayTemplateGenerator
66

0 commit comments

Comments
 (0)