Skip to content

Commit 18ac4f9

Browse files
wpbonelliwpbonelli
authored
Merge pull request #2510 from modflowpy/post-release-3.9.3-reset
Post release 3.9.3 reset
2 parents 69f6e09 + e778d67 commit 18ac4f9

File tree

225 files changed

+34475
-11591
lines changed

Some content is hidden

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

225 files changed

+34475
-11591
lines changed

‎.docs/md/version_changes.md

+29
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,33 @@
11
# Changelog
2+
### Version 3.9.3
3+
4+
#### New features
5+
6+
* [feat(modeltime)](https://github.com/modflowpy/flopy/commit/932bdcc8c07a10148cf733c02ba9190167239066): Add from_headers and reverse methods (#2481). Committed by wpbonelli on 2025-03-29.
7+
* [feat](https://github.com/modflowpy/flopy/commit/d8048a868b51d75039f0c3c097429144c6d44714): Add the angldegx to the kw dictionary produced by the get_disu_kwargs method (#2484). Committed by Sunny Titus on 2025-04-14.
8+
9+
#### Bug fixes
10+
11+
* [fix(resolve_exe)](https://github.com/modflowpy/flopy/commit/ca3adb34031285bc795b58fa42c4965d67278adc): Typecast exe name to string before passing to _resolve (#2457). Committed by martclanor on 2025-02-20.
12+
* [fix(HeadFile,CellBudgetFile)](https://github.com/modflowpy/flopy/commit/39d8d32625151979d78b82e709fa46ca4f5f7d9f): Fix tdis reversal (#2460). Committed by wpbonelli on 2025-02-25.
13+
* [fix(output_util.py)](https://github.com/modflowpy/flopy/commit/61e52f03ff69ec50b03a17c863738ad4a3c1dc4b): Trap grb in MF6Output (#2468). Committed by wpbonelli on 2025-03-07.
14+
* [fix(binaryfile)](https://github.com/modflowpy/flopy/commit/02ab7f1ff18a5c03f06d98fe1b35d6d6f7ad12df): Tdis in head/budget reversal methods (#2475). Committed by wpbonelli on 2025-03-18.
15+
* [fix(binaryfile)](https://github.com/modflowpy/flopy/commit/0eba4babad994a7cd73a3853714b9ff3bb326c90): Fix head/budget file reversal (#2483). Committed by wpbonelli on 2025-04-01.
16+
* [fix(flopy/utils/sfroutputfile.py::SfrFile.get_results)](https://github.com/modflowpy/flopy/commit/bf02be00ded034d2765948c7d7b075bf9d6ed4f1): Refactor deprecated DataFrame.append() call to pandas.concat() (#2491). Committed by aleaf on 2025-04-21.
17+
* [fix(model_splitter.py)](https://github.com/modflowpy/flopy/commit/838b37cc999c713aa7e71c4215f7535c5c9df27b): Add trap for obs packages in bc packages (#2493). Committed by Joshua Larsen on 2025-04-22.
18+
* [fix(evt)](https://github.com/modflowpy/flopy/commit/dcba9cf5ca1d8b946b568748f713a6dcf21e2bc3): Optional field mishandling (#2490). Committed by mjreno on 2025-04-23.
19+
* [fix](https://github.com/modflowpy/flopy/commit/0d9c91489a6a9df2c2c51c962e59cb5e9dd4ff2b): Update numpy array comparisons to use isin (#2504). Committed by Emmanuel Ferdman on 2025-05-06.
20+
* [fix(column lengths)](https://github.com/modflowpy/flopy/commit/351c5b72401b5de52d230ef9f0897f58e4edf475): Autoscale array write to ncol for structured multi-model simulations (#2507). Committed by Joshua Larsen on 2025-05-12.
21+
22+
#### Refactoring
23+
24+
* [refactor(resolve_exe)](https://github.com/modflowpy/flopy/commit/c61643fd8d61e6e4866527104324a6c468eb0e41): Also fix tests (#2464). Committed by Mike Taves on 2025-03-03.
25+
* [refactor(createpackages)](https://github.com/modflowpy/flopy/commit/c5b5a41f626ad24d8f0e564a83ab8dc673cc9b7b): Use jinja for mf6 module code generation (#2333). Committed by wpbonelli on 2025-03-07.
26+
* [refactor(Mf6Splitter)](https://github.com/modflowpy/flopy/commit/20829b704b20be5175119fcd685fe808c55d51b6): Change how node mapping is stored and loaded (#2465). Committed by Joshua Larsen on 2025-03-14.
27+
* [refactor(gridutil)](https://github.com/modflowpy/flopy/commit/48f46fb87a1a23bc13a41be881f3852fdab7d682): Improve arg handling in get_disu_kwargs (#2480). Committed by wpbonelli on 2025-04-01.
28+
* [refactor(model_splitter.py)](https://github.com/modflowpy/flopy/commit/14640530dd46598d8d76417b6b640db0850cbf80): Support for SSM and ATS (#2505). Committed by Joshua Larsen on 2025-05-08.
29+
* [refactor(codegen)](https://github.com/modflowpy/flopy/commit/69f6e09a8bea004454e9a83b76e5b37f8c0a7810): Move dfn utils from devtools (#2508). Committed by wpbonelli on 2025-05-13.
30+
231
### Version 3.9.2
332

433
#### New features

‎CITATION.cff

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ message: If you use this software, please cite both the article from preferred-c
33
references, and the software itself.
44
type: software
55
title: FloPy
6-
version: 3.10.0.dev2
7-
date-released: '2025-02-12'
6+
version: 3.10.0.dev3
7+
date-released: '2025-05-13'
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

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
<img src="https://raw.githubusercontent.com/modflowpy/flopy/master/examples/images/flopy3.png" alt="flopy3" style="width:50;height:20">
33

4-
### Version 3.10.0.dev2
4+
### Version 3.10.0.dev3
55
[![flopy continuous integration](https://github.com/modflowpy/flopy/actions/workflows/commit.yml/badge.svg?branch=develop)](https://github.com/modflowpy/flopy/actions/workflows/commit.yml)
66
[![Read the Docs](https://github.com/modflowpy/flopy/actions/workflows/rtd.yml/badge.svg?branch=develop)](https://github.com/modflowpy/flopy/actions/workflows/rtd.yml)
77

@@ -150,7 +150,7 @@ How to Cite
150150

151151
##### ***Software/Code citation for FloPy:***
152152

153-
[Bakker, Mark, Post, Vincent, Hughes, J. D., Langevin, C. D., White, J. T., Leaf, A. T., Paulinski, S. R., Bellino, J. C., Morway, E. D., Toews, M. W., Larsen, J. D., Fienen, M. N., Starn, J. J., Brakenhoff, D. A., and Bonelli, W. P., 2025, FloPy v3.10.0.dev2: U.S. Geological Survey Software Release, 12 February 2025, https://doi.org/10.5066/F7BK19FH](https://doi.org/10.5066/F7BK19FH)
153+
[Bakker, Mark, Post, Vincent, Hughes, J. D., Langevin, C. D., White, J. T., Leaf, A. T., Paulinski, S. R., Bellino, J. C., Morway, E. D., Toews, M. W., Larsen, J. D., Fienen, M. N., Starn, J. J., Brakenhoff, D. A., and Bonelli, W. P., 2025, FloPy v3.10.0.dev3: U.S. Geological Survey Software Release, 13 May 2025, https://doi.org/10.5066/F7BK19FH](https://doi.org/10.5066/F7BK19FH)
154154

155155

156156
Additional FloPy Related Publications

‎docs/PyPI_release.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,4 +30,4 @@ How to Cite
3030

3131
*Software/Code citation for FloPy:*
3232

33-
[Bakker, Mark, Post, Vincent, Hughes, J. D., Langevin, C. D., White, J. T., Leaf, A. T., Paulinski, S. R., Bellino, J. C., Morway, E. D., Toews, M. W., Larsen, J. D., Fienen, M. N., Starn, J. J., Brakenhoff, D. A., and Bonelli, W. P., 2025, FloPy v3.10.0.dev2: U.S. Geological Survey Software Release, 12 February 2025, https://doi.org/10.5066/F7BK19FH](https://doi.org/10.5066/F7BK19FH)
33+
[Bakker, Mark, Post, Vincent, Hughes, J. D., Langevin, C. D., White, J. T., Leaf, A. T., Paulinski, S. R., Bellino, J. C., Morway, E. D., Toews, M. W., Larsen, J. D., Fienen, M. N., Starn, J. J., Brakenhoff, D. A., and Bonelli, W. P., 2025, FloPy v3.10.0.dev3: U.S. Geological Survey Software Release, 13 May 2025, https://doi.org/10.5066/F7BK19FH](https://doi.org/10.5066/F7BK19FH)

‎flopy/mf6/data/dfn/gwe-dis.dfn

+42
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,48 @@ optional true
1717
longname do not write binary grid file
1818
description keyword to deactivate writing of the binary grid file.
1919

20+
block options
21+
name grb_filerecord
22+
type record grb6 fileout grb6_filename
23+
reader urword
24+
tagged true
25+
optional true
26+
longname
27+
description
28+
29+
block options
30+
name grb6
31+
type keyword
32+
in_record true
33+
reader urword
34+
tagged true
35+
optional false
36+
longname grb keyword
37+
description keyword to specify that record corresponds to a binary grid file.
38+
extended true
39+
40+
block options
41+
name fileout
42+
type keyword
43+
in_record true
44+
reader urword
45+
tagged true
46+
optional false
47+
longname file keyword
48+
description keyword to specify that an output filename is expected next.
49+
50+
block options
51+
name grb6_filename
52+
type string
53+
preserve_case true
54+
in_record true
55+
reader urword
56+
optional false
57+
tagged false
58+
longname file name of GRB information
59+
description defines a binary grid output file. If this option is not provided, the output file will have the same name as the discretization input file, plus extension ``.grb''.
60+
extended true
61+
2062
block options
2163
name xorigin
2264
type double precision

‎flopy/mf6/data/dfn/gwe-disu.dfn

+42
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,48 @@ optional true
1616
longname do not write binary grid file
1717
description keyword to deactivate writing of the binary grid file.
1818

19+
block options
20+
name grb_filerecord
21+
type record grb6 fileout grb6_filename
22+
reader urword
23+
tagged true
24+
optional true
25+
longname
26+
description
27+
28+
block options
29+
name grb6
30+
type keyword
31+
in_record true
32+
reader urword
33+
tagged true
34+
optional false
35+
longname grb keyword
36+
description keyword to specify that record corresponds to a binary grid file.
37+
extended true
38+
39+
block options
40+
name fileout
41+
type keyword
42+
in_record true
43+
reader urword
44+
tagged true
45+
optional false
46+
longname file keyword
47+
description keyword to specify that an output filename is expected next.
48+
49+
block options
50+
name grb6_filename
51+
type string
52+
preserve_case true
53+
in_record true
54+
reader urword
55+
optional false
56+
tagged false
57+
longname file name of GRB information
58+
description defines a binary grid output file. If this option is not provided, the output file will have the same name as the discretization input file, plus extension ``.grb''.
59+
extended true
60+
1961
block options
2062
name xorigin
2163
type double precision

‎flopy/mf6/data/dfn/gwe-disv.dfn

+42
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,48 @@ optional true
1717
longname do not write binary grid file
1818
description keyword to deactivate writing of the binary grid file.
1919

20+
block options
21+
name grb_filerecord
22+
type record grb6 fileout grb6_filename
23+
reader urword
24+
tagged true
25+
optional true
26+
longname
27+
description
28+
29+
block options
30+
name grb6
31+
type keyword
32+
in_record true
33+
reader urword
34+
tagged true
35+
optional false
36+
longname grb keyword
37+
description keyword to specify that record corresponds to a binary grid file.
38+
extended true
39+
40+
block options
41+
name fileout
42+
type keyword
43+
in_record true
44+
reader urword
45+
tagged true
46+
optional false
47+
longname file keyword
48+
description keyword to specify that an output filename is expected next.
49+
50+
block options
51+
name grb6_filename
52+
type string
53+
preserve_case true
54+
in_record true
55+
reader urword
56+
optional false
57+
tagged false
58+
longname file name of GRB information
59+
description defines a binary grid output file. If this option is not provided, the output file will have the same name as the discretization input file, plus extension ``.grb''.
60+
extended true
61+
2062
block options
2163
name xorigin
2264
type double precision

‎flopy/mf6/data/dfn/gwf-buy.dfn

+1-1
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ tagged false
131131
shape
132132
reader urword
133133
longname modelname
134-
description name of GWT model used to simulate a species that will be used in the density equation of state. This name will have no effect if the simulation does not include a GWT model that corresponds to this GWF model.
134+
description name of a GWT or GWE model used to simulate a species that will be used in the density equation of state. This name will have no effect if the simulation does not include a GWT or GWE model that corresponds to this GWF model.
135135

136136
block packagedata
137137
name auxspeciesname

‎flopy/mf6/data/dfn/gwf-dis.dfn

+42
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,48 @@ optional true
1717
longname do not write binary grid file
1818
description keyword to deactivate writing of the binary grid file.
1919

20+
block options
21+
name grb_filerecord
22+
type record grb6 fileout grb6_filename
23+
reader urword
24+
tagged true
25+
optional true
26+
longname
27+
description
28+
29+
block options
30+
name grb6
31+
type keyword
32+
in_record true
33+
reader urword
34+
tagged true
35+
optional false
36+
longname grb keyword
37+
description keyword to specify that record corresponds to a binary grid file.
38+
extended true
39+
40+
block options
41+
name fileout
42+
type keyword
43+
in_record true
44+
reader urword
45+
tagged true
46+
optional false
47+
longname file keyword
48+
description keyword to specify that an output filename is expected next.
49+
50+
block options
51+
name grb6_filename
52+
type string
53+
preserve_case true
54+
in_record true
55+
reader urword
56+
optional false
57+
tagged false
58+
longname file name of GRB information
59+
description defines a binary grid output file. If this option is not provided, the output file will have the same name as the discretization input file, plus extension ``.grb''.
60+
extended true
61+
2062
block options
2163
name xorigin
2264
type double precision

‎flopy/mf6/data/dfn/gwf-disu.dfn

+42
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,48 @@ optional true
1616
longname do not write binary grid file
1717
description keyword to deactivate writing of the binary grid file.
1818

19+
block options
20+
name grb_filerecord
21+
type record grb6 fileout grb6_filename
22+
reader urword
23+
tagged true
24+
optional true
25+
longname
26+
description
27+
28+
block options
29+
name grb6
30+
type keyword
31+
in_record true
32+
reader urword
33+
tagged true
34+
optional false
35+
longname grb keyword
36+
description keyword to specify that record corresponds to a binary grid file.
37+
extended true
38+
39+
block options
40+
name fileout
41+
type keyword
42+
in_record true
43+
reader urword
44+
tagged true
45+
optional false
46+
longname file keyword
47+
description keyword to specify that an output filename is expected next.
48+
49+
block options
50+
name grb6_filename
51+
type string
52+
preserve_case true
53+
in_record true
54+
reader urword
55+
optional false
56+
tagged false
57+
longname file name of GRB information
58+
description defines a binary grid output file. If this option is not provided, the output file will have the same name as the discretization input file, plus extension ``.grb''.
59+
extended true
60+
1961
block options
2062
name xorigin
2163
type double precision

‎flopy/mf6/data/dfn/gwf-disv.dfn

+42
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,48 @@ optional true
1717
longname do not write binary grid file
1818
description keyword to deactivate writing of the binary grid file.
1919

20+
block options
21+
name grb_filerecord
22+
type record grb6 fileout grb6_filename
23+
reader urword
24+
tagged true
25+
optional true
26+
longname
27+
description
28+
29+
block options
30+
name grb6
31+
type keyword
32+
in_record true
33+
reader urword
34+
tagged true
35+
optional false
36+
longname grb keyword
37+
description keyword to specify that record corresponds to a binary grid file.
38+
extended true
39+
40+
block options
41+
name fileout
42+
type keyword
43+
in_record true
44+
reader urword
45+
tagged true
46+
optional false
47+
longname file keyword
48+
description keyword to specify that an output filename is expected next.
49+
50+
block options
51+
name grb6_filename
52+
type string
53+
preserve_case true
54+
in_record true
55+
reader urword
56+
optional false
57+
tagged false
58+
longname file name of GRB information
59+
description defines a binary grid output file. If this option is not provided, the output file will have the same name as the discretization input file, plus extension ``.grb''.
60+
extended true
61+
2062
block options
2163
name xorigin
2264
type double precision

‎flopy/mf6/data/dfn/gwf-maw.dfn

+3-3
Original file line numberDiff line numberDiff line change
@@ -370,7 +370,7 @@ tagged false
370370
in_record true
371371
reader urword
372372
longname well bottom
373-
description bottom elevation of the multi-aquifer well. If CONDEQN is SPECIFIED, THIEM, SKIN, or COMPOSITE, BOTTOM is set to the cell bottom in the lowermost GWF cell connection in cases where the specified well bottom is above the bottom of this GWF cell. If CONDEQN is MEAN, BOTTOM is set to the lowermost GWF cell connection screen bottom in cases where the specified well bottom is above this value. The bottom elevation defines the lowest well head that will be simulated when the NEWTON UNDER\_RELAXATION option is specified in the GWF model name file. The bottom elevation is also used to calculate volumetric storage in the well.
373+
description bottom elevation of the multi-aquifer well. If CONDEQN is SPECIFIED, THIEM, SKIN, or CUMULATIVE, BOTTOM is set to the cell bottom in the lowermost GWF cell connection in cases where the specified well bottom is above the bottom of this GWF cell. If CONDEQN is MEAN, BOTTOM is set to the lowermost GWF cell connection screen bottom in cases where the specified well bottom is above this value. The bottom elevation defines the lowest well head that will be simulated when the NEWTON UNDER\_RELAXATION option is specified in the GWF model name file. The bottom elevation is also used to calculate volumetric storage in the well.
374374

375375
block packagedata
376376
name strt
@@ -475,7 +475,7 @@ tagged false
475475
in_record true
476476
reader urword
477477
longname screen top
478-
description value that defines the top elevation of the screen for the multi-aquifer well connection. If CONDEQN is SPECIFIED, THIEM, SKIN, or COMPOSITE, SCRN\_TOP can be any value and is set to the top of the cell. If CONDEQN is MEAN, SCRN\_TOP is set to the multi-aquifer well connection cell top if the specified value is greater than the cell top. The program will terminate with an error if the screen top is less than the screen bottom.
478+
description value that defines the top elevation of the screen for the multi-aquifer well connection. If CONDEQN is SPECIFIED, THIEM, SKIN, or CUMULATIVE, SCRN\_TOP can be any value and is set to the top of the cell. If CONDEQN is MEAN, SCRN\_TOP is set to the multi-aquifer well connection cell top if the specified value is greater than the cell top. The program will terminate with an error if the screen top is less than the screen bottom.
479479

480480
block connectiondata
481481
name scrn_bot
@@ -485,7 +485,7 @@ tagged false
485485
in_record true
486486
reader urword
487487
longname screen bottom
488-
description value that defines the bottom elevation of the screen for the multi-aquifer well connection. If CONDEQN is SPECIFIED, THIEM, SKIN, or COMPOSITE, SCRN\_BOT can be any value and is set to the bottom of the cell. If CONDEQN is MEAN, SCRN\_BOT is set to the multi-aquifer well connection cell bottom if the specified value is less than the cell bottom. The program will terminate with an error if the screen bottom is greater than the screen top.
488+
description value that defines the bottom elevation of the screen for the multi-aquifer well connection. If CONDEQN is SPECIFIED, THIEM, SKIN, or CUMULATIVE, SCRN\_BOT can be any value and is set to the bottom of the cell. If CONDEQN is MEAN, SCRN\_BOT is set to the multi-aquifer well connection cell bottom if the specified value is less than the cell bottom. The program will terminate with an error if the screen bottom is greater than the screen top.
489489

490490
block connectiondata
491491
name hk_skin

0 commit comments

Comments
 (0)