Skip to content

Commit 1342aa3

Browse files
committed
release: version 3.3.4
1 parent 5098c56 commit 1342aa3

File tree

140 files changed

+9015
-8704
lines changed

Some content is hidden

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

140 files changed

+9015
-8704
lines changed

README.md

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
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.3.4 &mdash; release candidate
5-
[![Build Status](https://travis-ci.org/modflowpy/flopy.svg?branch=develop)](https://travis-ci.org/modflowpy/flopy)
4+
### Version 3.3.4
5+
[![Build Status](https://travis-ci.org/modflowpy/flopy.svg?branch=master)](https://travis-ci.org/modflowpy/flopy)
66
[![codecov](https://codecov.io/gh/modflowpy/flopy/branch/develop/graph/badge.svg)](https://codecov.io/gh/modflowpy/flopy)
77
[![Codacy Badge](https://app.codacy.com/project/badge/Grade/b23a5edd021b4aa19e947545ab49e577)](https://www.codacy.com/manual/jdhughes-usgs/flopy?utm_source=github.com&amp;utm_medium=referral&amp;utm_content=modflowpy/flopy&amp;utm_campaign=Badge_Grade)
88
[![Documentation Status](https://readthedocs.org/projects/flopy/badge/?version=latest)](https://flopy.readthedocs.io/en/latest/?badge=latest)
@@ -11,7 +11,7 @@
1111
[![Anaconda-Server Badge](https://anaconda.org/conda-forge/flopy/badges/version.svg)](https://anaconda.org/conda-forge/flopy)
1212
[![PyPI Version](https://img.shields.io/pypi/v/flopy.png)](https://pypi.python.org/pypi/flopy)
1313

14-
[![Binder](https://mybinder.org/badge_logo.svg)](https://mybinder.org/v2/gh/modflowpy/flopy.git/develop)
14+
[![Binder](https://mybinder.org/badge_logo.svg)](https://mybinder.org/v2/gh/modflowpy/flopy.git/master)
1515

1616
Introduction
1717
-----------------------------------------------
@@ -145,7 +145,7 @@ How to Cite
145145

146146
##### ***Software/Code citation for FloPy:***
147147

148-
[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., and Brakenhoff, Davíd, 2021, FloPy v3.3.4 &mdash; release candidate: U.S. Geological Survey Software Release, 05 August 2021, http://dx.doi.org/10.5066/F7BK19FH](http://dx.doi.org/10.5066/F7BK19FH)
148+
[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., and Brakenhoff, Davíd, 2021, FloPy v3.3.4: U.S. Geological Survey Software Release, 06 August 2021, http://dx.doi.org/10.5066/F7BK19FH](http://dx.doi.org/10.5066/F7BK19FH)
149149

150150

151151
MODFLOW Resources
@@ -160,12 +160,13 @@ MODFLOW Resources
160160
Disclaimer
161161
----------
162162

163-
This software is preliminary or provisional and is subject to revision. It is
164-
being provided to meet the need for timely best science. The software has not
165-
received final approval by the U.S. Geological Survey (USGS). No warranty,
166-
expressed or implied, is made by the USGS or the U.S. Government as to the
167-
functionality of the software and related material nor shall the fact of release
168-
constitute any such warranty. The software is provided on the condition that
169-
neither the USGS nor the U.S. Government shall be held liable for any damages
170-
resulting from the authorized or unauthorized use of the software.
163+
This software has been approved for release by the U.S. Geological Survey
164+
(USGS). Although the software has been subjected to rigorous review, the USGS
165+
reserves the right to update the software as needed pursuant to further analysis
166+
and review. No warranty, expressed or implied, is made by the USGS or the U.S.
167+
Government as to the functionality of the software and related material nor
168+
shall the fact of release constitute any such warranty. Furthermore, the
169+
software is released on condition that neither the USGS nor the U.S. Government
170+
shall be held liable for any damages resulting from its authorized or
171+
unauthorized use.
171172

code.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[
22
{
3-
"status": "Release Candidate",
3+
"status": "Production",
44
"languages": [
55
"python"
66
],
@@ -31,7 +31,7 @@
3131
"laborHours": -1,
3232
"version": "3.3.4",
3333
"date": {
34-
"metadataLastUpdated": "2021-02-18"
34+
"metadataLastUpdated": "2021-08-06"
3535
},
3636
"organization": "U.S. Geological Survey",
3737
"permissions": {

docs/PyPi_release.md

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,10 @@ For general modeling issues, please consult a modeling forum, such as the [MODFL
99
Documentation
1010
-----------------------------------------------
1111

12-
FloPy code documentation is available at [https://flopy.readthedocs.io](https://flopy.readthedocs.io)
12+
Documentation is available on [Read the Docs](https://flopy.readthedocs.io)
13+
and includes information on FloPy; tutorials for using FloPy with MODFLOW 6
14+
and previous versions of MODFLOW, MT3DMS, MT3D-USGS, MODPATH, and ZONEBUDGET;
15+
and code documentation.
1316

1417

1518
Contributing
@@ -27,18 +30,19 @@ How to Cite
2730

2831
*Software/Code citation for FloPy:*
2932

30-
[Bakker, Mark, Post, Vincent, Langevin, C. D., Hughes, J. D., White, J. T., Leaf, A. T., Paulinski, S. R., Larsen, J. D., Toews, M. W., Morway, E. D., Bellino, J. C., Starn, J. J., and Fienen, M. N., 2021, FloPy v3.3.4 &mdash; release candidate: U.S. Geological Survey Software Release, 18 February 2021, http://dx.doi.org/10.5066/F7BK19FH](http://dx.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., and Brakenhoff, Davíd, 2021, FloPy v3.3.4: U.S. Geological Survey Software Release, 06 August 2021, http://dx.doi.org/10.5066/F7BK19FH](http://dx.doi.org/10.5066/F7BK19FH)
3134

3235

3336
Disclaimer
3437
----------
3538

36-
This software is preliminary or provisional and is subject to revision. It is
37-
being provided to meet the need for timely best science. The software has not
38-
received final approval by the U.S. Geological Survey (USGS). No warranty,
39-
expressed or implied, is made by the USGS or the U.S. Government as to the
40-
functionality of the software and related material nor shall the fact of release
41-
constitute any such warranty. The software is provided on the condition that
42-
neither the USGS nor the U.S. Government shall be held liable for any damages
43-
resulting from the authorized or unauthorized use of the software.
39+
This software has been approved for release by the U.S. Geological Survey
40+
(USGS). Although the software has been subjected to rigorous review, the USGS
41+
reserves the right to update the software as needed pursuant to further analysis
42+
and review. No warranty, expressed or implied, is made by the USGS or the U.S.
43+
Government as to the functionality of the software and related material nor
44+
shall the fact of release constitute any such warranty. Furthermore, the
45+
software is released on condition that neither the USGS nor the U.S. Government
46+
shall be held liable for any damages resulting from its authorized or
47+
unauthorized use.
4448

docs/notebook_examples.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Examples
55

66
The following jupyter Notebooks contain examples for using FloPy pre- and post-processing capabilities with a variety of MODFLOW-based models. The FloPy example notebooks can be opened and run using Pangeo by clicking on the launch binder link below.
77

8-
[![Binder](https://mybinder.org/badge_logo.svg)](https://mybinder.org/v2/gh/modflowpy/flopy.git/develop)
8+
[![Binder](https://mybinder.org/badge_logo.svg)](https://mybinder.org/v2/gh/modflowpy/flopy.git/master)
99

1010
#### MODFLOW-2000, MODFLOW-2005, MODFLOW-NWT, MODFLOW-USG, MODPATH, MT3DMS, MT3D-USGS, and SEAWAT
1111

docs/version_changes.md

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,45 @@
11
FloPy Changes
22
-----------------------------------------------
3+
### Version 3.3.4
4+
5+
* New features:
6+
7+
* [feat(mf6-lake)](https://github.com/modflowpy/flopy/commit/73a44059d18ee37f16d8e8fc90c231a0c9b16cf7): Add helper function to create lake connections (#1163). Committed by jdhughes-usgs on 2021-08-04.
8+
* [feat(data storage)](https://github.com/modflowpy/flopy/commit/08b95ea0b4b582567bbc99ff89f9923910a33d70): Data automatically stored internally when simulation or model relative path changed (#1126) (#1157). Committed by spaulins-usgs on 2021-07-29.
9+
* [feat(get_reduced_pumping)](https://github.com/modflowpy/flopy/commit/86b270d2cc085f92373c1623cb61a23d2befc70e): Update to read external pumping reduction files (#1162). Committed by Joshua Larsen on 2021-07-29.
10+
* [feat(raster)](https://github.com/modflowpy/flopy/commit/3ffedb45c4fa017ff64a4d579314c12386696068): Add option to extrapolate using ``nearest`` method (#1159). Committed by jdhughes-usgs on 2021-07-26.
11+
* [Feat(ZoneBudget6)](https://github.com/modflowpy/flopy/commit/04fe7e4a3c67cb068de444a2979a3528ccbc3e60): Added zonebudget6 class to zonbud.py (#1149). Committed by Joshua Larsen on 2021-07-12.
12+
* [feat(grid)](https://github.com/modflowpy/flopy/commit/0560a4d444c1f0ecd90319c41a6942c8e78dac26): Add thickness method for all grid types (#1138). Committed by jdhughes-usgs on 2021-06-25.
13+
* [feat(flopy for mf6 docs)](https://github.com/modflowpy/flopy/commit/fbba027a6c6c59553b0030f6bac2b9f68a14198c): Documentation added and improved for flopy (#1121). Committed by spaulins-usgs on 2021-06-01.
14+
* [Feat(.output)](https://github.com/modflowpy/flopy/commit/df843e00dc9df208e5b16e7a0523456f1e80c004): Added output property method to mf6 packages and models (#1100). Committed by Joshua Larsen on 2021-04-23.
15+
16+
17+
* Bug fixes:
18+
19+
* [fix(flopy_io)](https://github.com/modflowpy/flopy/commit/5098c56085ee8498654ecf76aa5c71f1067466b6): Limit fixed point format string to fixed column widths (#1172). Committed by jdhughes-usgs on 2021-08-06.
20+
* [fix(modpath7)](https://github.com/modflowpy/flopy/commit/9020bf362ea6418a39c12def5c74eb98ecc51746): Address #993 and #1053 (#1170). Committed by jdhughes-usgs on 2021-08-05.
21+
* [fix(lakpak_utils)](https://github.com/modflowpy/flopy/commit/08dfff9420a50e66994575344cfd75a9fb7b1173): Fix telev and belev for horizontal connections (#1168). Committed by jdhughes-usgs on 2021-08-05.
22+
* [fix(mfsfr2.check)](https://github.com/modflowpy/flopy/commit/cf5ee1c885da2294a385cc3e436aa7a9c68cd143): Make reach_connection_gaps.chk.csv a normal csv file (#1151). Committed by Mike Taves on 2021-07-27.
23+
* [fix(modflow/mfrch,mfevt)](https://github.com/modflowpy/flopy/commit/b780bfb9721156fbdd9a96d99cf7b084d99ab452): Mfusg rch,evt load and write fixes (#1148). Committed by Chris Nicol on 2021-07-13.
24+
* [fix(Raster)](https://github.com/modflowpy/flopy/commit/679c8844704a4e9b337af06c1826984c2715371f): Update default dtypes to include unsigned integers (#1147). Committed by Joshua Larsen on 2021-07-12.
25+
* [fix(utils/check)](https://github.com/modflowpy/flopy/commit/345e0fbfdc007b688982c09bfa82841d56ac5cf7): File check for mfusg unstructured models (#1145). Committed by Chris Nicol on 2021-07-09.
26+
* [fix(list parsing)](https://github.com/modflowpy/flopy/commit/148087e2b6f989d8625a2d345fbe1069b58bd99b): Fixed errors caused by parsing certain lists with keywords in the middle (#1135). Committed by spaulins-usgs on 2021-06-25.
27+
* [fix(plotutil.py, grid.py)](https://github.com/modflowpy/flopy/commit/e566845172380e3eae06981ca180923d2362ee56): Fix .plot() method using mflay parameter (#1134). Committed by Joshua Larsen on 2021-06-16.
28+
* [fix(map.py)](https://github.com/modflowpy/flopy/commit/4cfb11db25c17f70708b47bec79f88479d35a3fe): Fix slow plotting routines (#1118). Committed by Joshua Larsen on 2021-06-11.
29+
* [fix(plot_pathline)](https://github.com/modflowpy/flopy/commit/fa98069de665fcbd45c4b468bef9ac484833c2f9): Update modpath intersection routines (#1112). Committed by Joshua Larsen on 2021-06-11.
30+
* [fix(gridgen)](https://github.com/modflowpy/flopy/commit/ce5dcf9254bc5714d3b4bd5e888bdf4860cd5ecb): Mfusg helper function not indexing correctly (#1124). Committed by langevin-usgs on 2021-05-28.
31+
* [fix(numpy)](https://github.com/modflowpy/flopy/commit/6c328e1d57a07b452b08575806c1ef78c1277fe4): Aliases of builtin types is deprecated (#1105). Committed by Mike Taves on 2021-05-07.
32+
* [fix(mfsfr2.py)](https://github.com/modflowpy/flopy/commit/870c5773307761af977934a0b6fdfa84e7f30e72): Dataset 6b and 6c write routine, remove blank lines (#1101). Committed by Joshua Larsen on 2021-04-26.
33+
* [fix(performance)](https://github.com/modflowpy/flopy/commit/4104cf5e6a35e2a1fd6183442962ae5cb258fa7a): Implemented performance improvements including improvements suggested by @briochh (#1092) (#1097). Committed by spaulins-usgs on 2021-04-12.
34+
* [fix(package write)](https://github.com/modflowpy/flopy/commit/58cb48e7a6240d2a01039b5a5ab3c67c5111662c): Allow user to define and write empty stress period blocks to package files (#1091) (#1093). Committed by scottrp on 2021-04-08.
35+
* [fix(imports)](https://github.com/modflowpy/flopy/commit/36426534fae226570884f82a93a42374bd0019da): Fix shapely and geojson imports (#1083). Committed by jdhughes-usgs on 2021-03-20.
36+
* [fix(shapely)](https://github.com/modflowpy/flopy/commit/ff7b8223a9184ffbe6460ae857be45533d5c874a): Handle deprecation warnings from shapely 1.8 (#1069). Committed by Mike Taves on 2021-03-19.
37+
* [fix(mp7particledata)](https://github.com/modflowpy/flopy/commit/44ebec2cd6a4a79a2f3f7165eae8ced7da0340c8): Update dtype comparison for unstructured partlocs (#1071). Committed by rodrperezi on 2021-03-19.
38+
* [fix(get_file_entry)](https://github.com/modflowpy/flopy/commit/5604ef78fb8b2366fc7d5d827e68413ac602c7fa): None text removed from empty stress period data with aux variable (#1080) (#1081). Committed by scottrp on 2021-03-19.
39+
* [fix(data check)](https://github.com/modflowpy/flopy/commit/179fc4e06b6317f12adcc826597f9586317fc7c0): Minimum number of data columns check fixed (#1062) (#1067). Committed by spaulins-usgs on 2021-03-17.
40+
* [fix(plotutil)](https://github.com/modflowpy/flopy/commit/605366bba794a7ca75b67ef956dc232e20c79c48): Number of plottable layers should be from util3d.shape[0] (#1077). Committed by Mike Taves on 2021-03-15.
41+
* [fix(data check)](https://github.com/modflowpy/flopy/commit/cb04f9d2ac55f3cbc320ef212945f69045222366): Minimum number of data columns check fixed (#1062) (#1065). Committed by spaulins-usgs on 2021-02-19.
42+
343
### Version 3.3.3
444

545
* New features:

examples/FAQ/load_existing_mf2005.ipynb

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@
99
"name": "stdout",
1010
"output_type": "stream",
1111
"text": [
12-
"3.8.6 | packaged by conda-forge | (default, Oct 7 2020, 18:42:56) \n",
13-
"[Clang 10.0.1 ]\n",
14-
"flopy version: 3.3.3\n"
12+
"3.8.10 (default, May 19 2021, 11:01:55) \n",
13+
"[Clang 10.0.0 ]\n",
14+
"flopy version: 3.3.4\n"
1515
]
1616
}
1717
],
@@ -173,7 +173,7 @@
173173
"name": "python",
174174
"nbconvert_exporter": "python",
175175
"pygments_lexer": "ipython3",
176-
"version": "3.8.6"
176+
"version": "3.8.10"
177177
}
178178
},
179179
"nbformat": 4,

examples/FAQ/load_existing_model_wAUX.ipynb

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@
99
"name": "stdout",
1010
"output_type": "stream",
1111
"text": [
12-
"3.8.6 | packaged by conda-forge | (default, Oct 7 2020, 18:42:56) \n",
13-
"[Clang 10.0.1 ]\n",
14-
"flopy version: 3.3.3\n"
12+
"3.8.10 (default, May 19 2021, 11:01:55) \n",
13+
"[Clang 10.0.0 ]\n",
14+
"flopy version: 3.3.4\n"
1515
]
1616
}
1717
],
@@ -144,7 +144,7 @@
144144
"name": "python",
145145
"nbconvert_exporter": "python",
146146
"pygments_lexer": "ipython3",
147-
"version": "3.8.6"
147+
"version": "3.8.10"
148148
}
149149
},
150150
"nbformat": 4,

examples/FAQ/mf2005_does_not_exist.ipynb

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@
99
"name": "stdout",
1010
"output_type": "stream",
1111
"text": [
12-
"3.8.6 | packaged by conda-forge | (default, Oct 7 2020, 18:42:56) \n",
13-
"[Clang 10.0.1 ]\n",
14-
"flopy version: 3.3.3\n"
12+
"3.8.10 (default, May 19 2021, 11:01:55) \n",
13+
"[Clang 10.0.0 ]\n",
14+
"flopy version: 3.3.4\n"
1515
]
1616
}
1717
],
@@ -146,7 +146,7 @@
146146
"name": "python",
147147
"nbconvert_exporter": "python",
148148
"pygments_lexer": "ipython3",
149-
"version": "3.8.6"
149+
"version": "3.8.10"
150150
}
151151
},
152152
"nbformat": 4,

0 commit comments

Comments
 (0)