Gael-de-Sailly
/
flopy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into develop 

# Conflicts:
#	.github/workflows/ci.yml
#	.github/workflows/rtd.yml
#	README.md
#	docs/PyPi_release.md
#	docs/USGS_release.md
#	examples/Notebooks/flopy3.3_PlotCrossSection.ipynb
#	examples/Notebooks/flopy3.3_PlotMapView.ipynb
#	examples/Notebooks/flopy3_PlotArrayExample.ipynb
#	examples/Notebooks/flopy3_grid_intersection_demo.ipynb
#	examples/Notebooks/flopy3_modpath6_example.ipynb
#	flopy/version.py
develop
jdhughes-usgs 2020-10-27 10:15:08 -04:00
parent 013af7381a 09afe6096d
commit a71b5a1513
61 changed files with 3697 additions and 2235 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/ci.yml vendored
View File

@ -6,7 +6,7 @@ on:
push:
branches: [master, develop]
pull_request:
branches: [develop]
branches: [master, develop]
jobs:

4
.github/workflows/rtd.yml vendored
View File

@ -2,9 +2,9 @@ name: Read the Docs
on:
push:
branches: [ master, develop ]
branches: [master, develop]
pull_request:
branches: [ develop ]
branches: [master, develop]
jobs:

25
README.md
View File

@ -1,8 +1,8 @@
<img src="https://raw.githubusercontent.com/modflowpy/flopy/master/examples/images/flopy3.png" alt="flopy3" style="width:50;height:20">
### Version 3.3.2 &mdash; release candidate
![Build Status](https://github.com/modflowpy/flopy/workflows/flopy%20continuous%20integration/badge.svg)
### Version 3.3.2
[![Build Status](https://travis-ci.org/modflowpy/flopy.svg?branch=master)](https://travis-ci.org/modflowpy/flopy)
[![codecov](https://codecov.io/gh/modflowpy/flopy/branch/develop/graph/badge.svg)](https://codecov.io/gh/modflowpy/flopy)
[![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)
[![Documentation Status](https://readthedocs.org/projects/flopy/badge/?version=latest)](https://flopy.readthedocs.io/en/latest/?badge=latest)
@ -11,7 +11,7 @@
[![Anaconda-Server Badge](https://anaconda.org/conda-forge/flopy/badges/version.svg)](https://anaconda.org/conda-forge/flopy)
[![PyPI Version](https://img.shields.io/pypi/v/flopy.png)](https://pypi.python.org/pypi/flopy)
[![Binder](https://mybinder.org/badge_logo.svg)](https://mybinder.org/v2/gh/modflowpy/flopy.git/develop)
[![Binder](https://mybinder.org/badge_logo.svg)](https://mybinder.org/v2/gh/modflowpy/flopy.git/master)
Introduction
-----------------------------------------------
@ -139,7 +139,7 @@ How to Cite
##### ***Software/Code citation for FloPy:***
[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., 2020, FloPy v3.3.2 &mdash; release candidate: U.S. Geological Survey Software Release, 26 June 2020, http://dx.doi.org/10.5066/F7BK19FH](http://dx.doi.org/10.5066/F7BK19FH)
[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., 2020, FloPy v3.3.2: U.S. Geological Survey Software Release, 26 October 2020, http://dx.doi.org/10.5066/F7BK19FH](http://dx.doi.org/10.5066/F7BK19FH)
MODFLOW Resources
@ -154,12 +154,13 @@ MODFLOW Resources
Disclaimer
----------
This software is preliminary or provisional and is subject to revision. It is
being provided to meet the need for timely best science. The software has not
received final approval by the U.S. Geological Survey (USGS). No warranty,
expressed or implied, is made by the USGS or the U.S. Government as to the
functionality of the software and related material nor shall the fact of release
constitute any such warranty. The software is provided on the condition that
neither the USGS nor the U.S. Government shall be held liable for any damages
resulting from the authorized or unauthorized use of the software.
This software has been approved for release by the U.S. Geological Survey
(USGS). Although the software has been subjected to rigorous review, the USGS
reserves the right to update the software as needed pursuant to further analysis
and review. No warranty, expressed or implied, is made by the USGS or the U.S.
Government as to the functionality of the software and related material nor
shall the fact of release constitute any such warranty. Furthermore, the
software is released on condition that neither the USGS nor the U.S. Government
shall be held liable for any damages resulting from its authorized or
unauthorized use.

2
code.json
View File

@ -31,7 +31,7 @@
"laborHours": -1,
"version": "3.3.2",
"date": {
"metadataLastUpdated": "2020-06-26"
"metadataLastUpdated": "2020-10-26"
},
"organization": "U.S. Geological Survey",
"permissions": {

23
docs/PyPi_release.md
View File

@ -9,13 +9,13 @@ For general modeling issues, please consult a modeling forum, such as the [MODFL
Documentation
-----------------------------------------------
FloPy code documentation is available at [https://modflowpy.github.io/flopydoc/](https://modflowpy.github.io/flopydoc/)
FloPy code documentation is available at [https://flopy.readthedocs.io](https://flopy.readthedocs.io)
Contributing
------------------------------------------------
Bug reports, code contributions, or improvements to the documentation are welcome from the community. Prior to contributing, please read up on our guidelines for [contributing](https://github.com/modflowpy/flopy/blob/develop/CONTRIBUTING.md) and then check out one of our issues in the [hotlist: community-help](https://github.com/modflowpy/flopy/labels/hotlist%3A%20community%20help).
Bug reports, code contributions, or improvements to the documentation are welcome from the community. Prior to contributing, please read up on our guidelines for [contributing](https://github.com/modflowpy/flopy/blob/master/CONTRIBUTING.md) and then check out one of our issues in the [hotlist: community-help](https://github.com/modflowpy/flopy/labels/hotlist%3A%20community%20help).
How to Cite
@ -27,18 +27,19 @@ How to Cite
*Software/Code citation for FloPy:*
[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., 2020, FloPy v3.3.2 &mdash; release candidate: U.S. Geological Survey Software Release, 26 June 2020, http://dx.doi.org/10.5066/F7BK19FH](http://dx.doi.org/10.5066/F7BK19FH)
[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., 2020, FloPy v3.3.2: U.S. Geological Survey Software Release, 26 October 2020, http://dx.doi.org/10.5066/F7BK19FH](http://dx.doi.org/10.5066/F7BK19FH)
Disclaimer
----------
This software is preliminary or provisional and is subject to revision. It is
being provided to meet the need for timely best science. The software has not
received final approval by the U.S. Geological Survey (USGS). No warranty,
expressed or implied, is made by the USGS or the U.S. Government as to the
functionality of the software and related material nor shall the fact of release
constitute any such warranty. The software is provided on the condition that
neither the USGS nor the U.S. Government shall be held liable for any damages
resulting from the authorized or unauthorized use of the software.
This software has been approved for release by the U.S. Geological Survey
(USGS). Although the software has been subjected to rigorous review, the USGS
reserves the right to update the software as needed pursuant to further analysis
and review. No warranty, expressed or implied, is made by the USGS or the U.S.
Government as to the functionality of the software and related material nor
shall the fact of release constitute any such warranty. Furthermore, the
software is released on condition that neither the USGS nor the U.S. Government
shall be held liable for any damages resulting from its authorized or
unauthorized use.

23
docs/USGS_release.md
View File

@ -23,7 +23,7 @@ header-includes:
- \fancyhead[CE, CO]{FloPy Release Notes}
- \fancyfoot[LE, RO]{FloPy version 3.3.2}
- \fancyfoot[CO, CE]{\thepage\ of \pageref{LastPage}}
- \fancyfoot[RE, LO]{06/26/2020}
- \fancyfoot[RE, LO]{10/26/2020}
geometry: margin=0.75in
---
@ -38,7 +38,7 @@ For general modeling issues, please consult a modeling forum, such as the [MODFL
Documentation
-----------------------------------------------
FloPy code documentation is available at [https://modflowpy.github.io/flopydoc/](https://modflowpy.github.io/flopydoc/)
FloPy code documentation is available at [https://flopy.readthedocs.io](https://flopy.readthedocs.io)
Contributing
@ -56,20 +56,21 @@ How to Cite
##### ***Software/Code citation for FloPy:***
[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., 2020, FloPy v3.3.2 &mdash; release candidate: U.S. Geological Survey Software Release, 26 June 2020, http://dx.doi.org/10.5066/F7BK19FH](http://dx.doi.org/10.5066/F7BK19FH)
[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., 2020, FloPy v3.3.2: U.S. Geological Survey Software Release, 26 October 2020, http://dx.doi.org/10.5066/F7BK19FH](http://dx.doi.org/10.5066/F7BK19FH)
Disclaimer
----------
This software is preliminary or provisional and is subject to revision. It is
being provided to meet the need for timely best science. The software has not
received final approval by the U.S. Geological Survey (USGS). No warranty,
expressed or implied, is made by the USGS or the U.S. Government as to the
functionality of the software and related material nor shall the fact of release
constitute any such warranty. The software is provided on the condition that
neither the USGS nor the U.S. Government shall be held liable for any damages
resulting from the authorized or unauthorized use of the software.
This software has been approved for release by the U.S. Geological Survey
(USGS). Although the software has been subjected to rigorous review, the USGS
reserves the right to update the software as needed pursuant to further analysis
and review. No warranty, expressed or implied, is made by the USGS or the U.S.
Government as to the functionality of the software and related material nor
shall the fact of release constitute any such warranty. Furthermore, the
software is released on condition that neither the USGS nor the U.S. Government
shall be held liable for any damages resulting from its authorized or
unauthorized use.
Installation
-----------------------------------------------

BIN
docs/USGS_release.pdf
View File

Binary file not shown.

29
examples/FAQ/load_existing_mf2005.ipynb
View File

@ -9,9 +9,9 @@
"name": "stdout",
"output_type": "stream",
"text": [
"3.6.4 | packaged by conda-forge | (default, Dec 23 2017, 16:54:01) \n",
"[GCC 4.2.1 Compatible Apple LLVM 6.1.0 (clang-602.0.53)]\n",
"flopy version: 3.2.9\n"
"3.7.7 (default, Mar 26 2020, 10:32:53) \n",
"[Clang 4.0.1 (tags/RELEASE_401/final)]\n",
"flopy version: 3.3.2\n"
]
}
],
@ -77,10 +77,10 @@
" for 2 stress periods\n",
"adding Package: DIS\n",
" DIS package load...success\n",
" LIST package load...skipped\n",
"loading bas6 package file...\n",
"adding Package: BAS6\n",
" BAS6 package load...success\n",
" LIST package load...skipped\n",
"loading bcf package file...\n",
" loading ipakcb, HDRY, IWDFLG, WETFCT, IWETIT, IHDWET...\n",
" loading LAYCON...\n",
@ -94,12 +94,16 @@
" BCF6 package load...success\n",
"loading wel package file...\n",
" loading <class 'flopy.modflow.mfwel.ModflowWel'> for kper 1\n",
" implicit itmpp in ../data/mf2005_test/bcf2ss.wel\n",
" loading <class 'flopy.modflow.mfwel.ModflowWel'> for kper 2\n",
" implicit itmpp in ../data/mf2005_test/bcf2ss.wel\n",
"adding Package: WEL\n",
" WEL package load...success\n",
"loading riv package file...\n",
" loading <class 'flopy.modflow.mfriv.ModflowRiv'> for kper 1\n",
" implicit itmpp in ../data/mf2005_test/bcf2ss.riv\n",
" loading <class 'flopy.modflow.mfriv.ModflowRiv'> for kper 2\n",
" implicit itmpp in ../data/mf2005_test/bcf2ss.riv\n",
"adding Package: RIV\n",
" RIV package load...success\n",
"loading rch package file...\n",
@ -107,14 +111,23 @@
"adding Package: RCH\n",
" RCH package load...success\n",
"loading pcg package file...\n",
" explicit ihcofadd in file\n",
"adding Package: PCG\n",
" PCG package load...success\n",
"loading oc package file...\n",
"head file name will be generated by flopy\n",
"drawdown file name will be generated by flopy\n",
"adding Package: OC\n",
" OC package load...success\n",
"Warning: external file unit 30 does not exist in ext_unit_dict.\n",
"Warning: external file unit 50 does not exist in ext_unit_dict.\n",
"Warning: external file unit 0 does not exist in ext_unit_dict.\n",
"\n",
"WARNING:\n",
" External file unit 30 does not exist in ext_unit_dict.\n",
"\n",
"WARNING:\n",
" External file unit 50 does not exist in ext_unit_dict.\n",
"\n",
"WARNING:\n",
" External file unit 0 does not exist in ext_unit_dict.\n",
"\n",
" The following 8 packages were successfully loaded.\n",
" bcf2ss.dis\n",
@ -160,7 +173,7 @@
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
"version": "3.6.4"
"version": "3.7.7"
}
},
"nbformat": 4,

8
examples/FAQ/load_existing_model_wAUX.ipynb
View File

@ -9,9 +9,9 @@
"name": "stdout",
"output_type": "stream",
"text": [
"3.6.4 | packaged by conda-forge | (default, Dec 23 2017, 16:54:01) \n",
"[GCC 4.2.1 Compatible Apple LLVM 6.1.0 (clang-602.0.53)]\n",
"flopy version: 3.2.9\n"
"3.7.7 (default, Mar 26 2020, 10:32:53) \n",
"[Clang 4.0.1 (tags/RELEASE_401/final)]\n",
"flopy version: 3.3.2\n"
]
}
],
@ -144,7 +144,7 @@
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
"version": "3.6.4"
"version": "3.7.7"
}
},
"nbformat": 4,

10
examples/FAQ/mf2005_does_not_exist.ipynb
View File

@ -9,9 +9,9 @@
"name": "stdout",
"output_type": "stream",
"text": [
"3.6.4 | packaged by conda-forge | (default, Dec 23 2017, 16:54:01) \n",
"[GCC 4.2.1 Compatible Apple LLVM 6.1.0 (clang-602.0.53)]\n",
"flopy version: 3.2.9\n"
"3.7.7 (default, Mar 26 2020, 10:32:53) \n",
"[Clang 4.0.1 (tags/RELEASE_401/final)]\n",
"flopy version: 3.3.2\n"
]
}
],
@ -103,7 +103,7 @@
{
"data": {
"text/plain": [
"'/Users/jdhughes/anaconda3/bin:/Users/jdhughes/anaconda3/bin:/Users/jdhughes/.local/bin:/Users/jdhughes/anaconda/bin:/Applications/CMake.app/Contents/bin:/Users/jdhughes/Documents/Development/bin/mac:/opt/local/bin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/sbin:/opt/X11/bin:/usr/local/git/bin:/Library/TeX/texbin'"
"'/anaconda3/bin:/anaconda3/condabin:/Users/jdhughes/.local/bin://Users/jdhughes/Documents/Development/bin/mac:/opt/local/bin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/sbin:/Library/TeX/texbin:/usr/local/share/dotnet:/opt/X11/bin:~/.dotnet/tools:/Library/Frameworks/Mono.framework/Versions/Current/Commands'"
]
},
"execution_count": 4,
@ -146,7 +146,7 @@
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
"version": "3.6.4"
"version": "3.7.7"
}
},
"nbformat": 4,

46
examples/Notebooks/flopy3.3_PlotCrossSection.ipynb
View File

File diff suppressed because one or more lines are too long

78
examples/Notebooks/flopy3.3_PlotMapView.ipynb
View File

File diff suppressed because one or more lines are too long

17
examples/Notebooks/flopy3_LoadSWRBinaryData.ipynb
View File

File diff suppressed because one or more lines are too long

133
examples/Notebooks/flopy3_MT3D-USGS_example.ipynb
View File

File diff suppressed because one or more lines are too long

71
examples/Notebooks/flopy3_MT3DMS_examples.ipynb
View File

File diff suppressed because one or more lines are too long

13
examples/Notebooks/flopy3_ModelCheckerExample.ipynb
View File

@ -18,10 +18,9 @@
"name": "stdout",
"output_type": "stream",
"text": [
"flopy is installed in /Users/jdhughes/Documents/Development/flopy_git/flopy_fork/flopy\n",
"3.7.3 | packaged by conda-forge | (default, Jul 1 2019, 14:38:56) \n",
"3.7.7 (default, Mar 26 2020, 10:32:53) \n",
"[Clang 4.0.1 (tags/RELEASE_401/final)]\n",
"flopy version: 3.3.1\n"
"flopy version: 3.3.2\n"
]
}
],
@ -293,7 +292,7 @@
{
"data": {
"text/plain": [
"<flopy.utils.check.check at 0x11fbee400>"
"<flopy.utils.check.check at 0x121b89d50>"
]
},
"execution_count": 7,
@ -334,7 +333,7 @@
{
"data": {
"text/plain": [
"<flopy.utils.check.check at 0x11fbeeef0>"
"<flopy.utils.check.check at 0x121b89450>"
]
},
"execution_count": 8,
@ -398,7 +397,7 @@
{
"data": {
"text/plain": [
"<flopy.utils.check.check at 0x11fc5a0f0>"
"<flopy.utils.check.check at 0x121b90b10>"
]
},
"execution_count": 9,
@ -550,7 +549,7 @@
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
"version": "3.7.3"
"version": "3.7.7"
}
},
"nbformat": 4,

31
examples/Notebooks/flopy3_Modflow_postprocessing_example.ipynb
View File

File diff suppressed because one or more lines are too long

9
examples/Notebooks/flopy3_PEST.ipynb
View File

@ -18,11 +18,10 @@
"name": "stdout",
"output_type": "stream",
"text": [
"flopy is installed in /Users/jdhughes/Documents/Development/flopy_git/flopy_fork/flopy\n",
"3.7.3 | packaged by conda-forge | (default, Jul 1 2019, 14:38:56) \n",
"3.7.7 (default, Mar 26 2020, 10:32:53) \n",
"[Clang 4.0.1 (tags/RELEASE_401/final)]\n",
"numpy version: 1.17.3\n",
"flopy version: 3.3.1\n"
"numpy version: 1.19.2\n",
"flopy version: 3.3.2\n"
]
}
],
@ -752,7 +751,7 @@
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
"version": "3.7.3"
"version": "3.7.7"
}
},
"nbformat": 4,

751
examples/Notebooks/flopy3_PlotArrayExample.ipynb
View File

File diff suppressed because one or more lines are too long

25
examples/Notebooks/flopy3_SEAWAT_henry_problem.ipynb
View File

File diff suppressed because one or more lines are too long

7
examples/Notebooks/flopy3_SFR2_load.ipynb
View File

@ -18,10 +18,9 @@
"name": "stdout",
"output_type": "stream",
"text": [
"flopy is installed in /Users/jdhughes/Documents/Development/flopy_git/flopy_fork/flopy\n",
"3.7.3 | packaged by conda-forge | (default, Jul 1 2019, 14:38:56) \n",
"3.7.7 (default, Mar 26 2020, 10:32:53) \n",
"[Clang 4.0.1 (tags/RELEASE_401/final)]\n",
"flopy version: 3.3.1\n"
"flopy version: 3.3.2\n"
]
}
],
@ -931,7 +930,7 @@
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
"version": "3.7.3"
"version": "3.7.7"
}
},
"nbformat": 4,

15
examples/Notebooks/flopy3_SpatialReference_demo.ipynb
View File

File diff suppressed because one or more lines are too long

19
examples/Notebooks/flopy3_WatertableRecharge_example.ipynb
View File

File diff suppressed because one or more lines are too long

19
examples/Notebooks/flopy3_Zaidel_example.ipynb
View File

File diff suppressed because one or more lines are too long

17
examples/Notebooks/flopy3_ZoneBudget_example.ipynb
View File

File diff suppressed because one or more lines are too long

48
examples/Notebooks/flopy3_array_outputformat_options.ipynb
View File

@ -25,12 +25,11 @@
"name": "stdout",
"output_type": "stream",
"text": [
"flopy is installed in /Users/jdhughes/Documents/Development/flopy_git/flopy_fork/flopy\n",
"3.7.3 | packaged by conda-forge | (default, Jul 1 2019, 14:38:56) \n",
"3.7.7 (default, Mar 26 2020, 10:32:53) \n",
"[Clang 4.0.1 (tags/RELEASE_401/final)]\n",
"numpy version: 1.17.3\n",
"matplotlib version: 3.1.1\n",
"flopy version: 3.3.1\n"
"numpy version: 1.19.2\n",
"matplotlib version: 3.3.0\n",
"flopy version: 3.3.2\n"
]
}
],
@ -92,11 +91,11 @@
" Version 1.12.00 2/3/2017 \n",
"\n",
" Using NAME file: freyberg.nam \n",
" Run start date and time (yyyy/mm/dd hh:mm:ss): 2020/06/26 9:31:29\n",
" Run start date and time (yyyy/mm/dd hh:mm:ss): 2020/10/26 15:54:14\n",
"\n",
" Solving: Stress period: 1 Time step: 1 Ground-Water Flow Eqn.\n",
" Run end date and time (yyyy/mm/dd hh:mm:ss): 2020/06/26 9:31:29\n",
" Elapsed run time: 0.016 Seconds\n",
" Run end date and time (yyyy/mm/dd hh:mm:ss): 2020/10/26 15:54:14\n",
" Elapsed run time: 0.011 Seconds\n",
"\n",
" Normal termination of simulation\n",
"Output file located: freyberg.hds\n",
@ -221,13 +220,18 @@
" Version 1.12.00 2/3/2017 \n",
"\n",
" Using NAME file: freyberg.nam \n",
" Run start date and time (yyyy/mm/dd hh:mm:ss): 2020/06/26 9:31:29\n",
" Run start date and time (yyyy/mm/dd hh:mm:ss): 2020/10/26 15:54:14\n",
"\n",
" Solving: Stress period: 1 Time step: 1 Ground-Water Flow Eqn.\n",
" Run end date and time (yyyy/mm/dd hh:mm:ss): 2020/06/26 9:31:29\n",
" Elapsed run time: 0.016 Seconds\n",
"\n",
" Normal termination of simulation\n"
"forrtl: severe (59): list-directed I/O syntax error, unit 29, file /Users/jdhughes/Documents/Development/flopy_git/flopy_fork/examples/Notebooks/data/freyberg.dis\n",
"Image PC Routine Line Source \n",
"mf2005 000000010B01F23A Unknown Unknown Unknown\n",
"mf2005 000000010B05AF3F Unknown Unknown Unknown\n",
"mf2005 000000010B0597F3 Unknown Unknown Unknown\n",
"mf2005 000000010AC08816 _u2drel_ 890 utl7.f\n",
"mf2005 000000010AB17252 _sgwf2bas7ardis_ 759 gwf2bas7.f\n",
"mf2005 000000010AB0F058 _gwf2bas7ar_ 217 gwf2bas7.f\n",
"mf2005 000000010AE1A7B2 _MAIN__ 75 mf2005.f\n",
"mf2005 000000010AAF58AE Unknown Unknown Unknown\n"
]
}
],
@ -333,11 +337,17 @@
" Version 1.12.00 2/3/2017 \n",
"\n",
" Using NAME file: freyberg.nam \n",
" Run start date and time (yyyy/mm/dd hh:mm:ss): 2020/06/26 9:31:29\n",
"\n",
" Run start date and time (yyyy/mm/dd hh:mm:ss): 2020/10/26 15:54:14\n",
"\n"
]
},
{
"name": "stdout",
"output_type": "stream",
"text": [
" Solving: Stress period: 1 Time step: 1 Ground-Water Flow Eqn.\n",
" Run end date and time (yyyy/mm/dd hh:mm:ss): 2020/06/26 9:31:29\n",
" Elapsed run time: 0.014 Seconds\n",
" Run end date and time (yyyy/mm/dd hh:mm:ss): 2020/10/26 15:54:14\n",
" Elapsed run time: 0.010 Seconds\n",
"\n",
" Normal termination of simulation\n"
]
@ -391,7 +401,7 @@
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
"version": "3.7.3"
"version": "3.7.7"
}
},
"nbformat": 4,

27
examples/Notebooks/flopy3_demo_of_modelgrid_classes.ipynb
View File

File diff suppressed because one or more lines are too long

31
examples/Notebooks/flopy3_drain_return.ipynb
View File

File diff suppressed because one or more lines are too long

97
examples/Notebooks/flopy3_export.ipynb
View File

@ -18,10 +18,9 @@
"name": "stdout",
"output_type": "stream",
"text": [
"flopy is installed in /Users/jdhughes/Documents/Development/flopy_git/flopy_fork/flopy\n",
"3.7.3 | packaged by conda-forge | (default, Jul 1 2019, 14:38:56) \n",
"3.7.7 (default, Mar 26 2020, 10:32:53) \n",
"[Clang 4.0.1 (tags/RELEASE_401/final)]\n",
"flopy version: 3.3.1\n"
"flopy version: 3.3.2\n"
]
}
],
@ -178,7 +177,13 @@
"initialize_geometry::proj4_str = +proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs\n",
"initialize_geometry::self.grid_crs = +proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs +type=crs\n",
"initialize_geometry::nc_crs = epsg:4326\n",
"transforming coordinates using = proj=noop ellps=GRS80\n",
"transforming coordinates using = proj=noop ellps=GRS80\n"
]
},
{
"name": "stdout",
"output_type": "stream",
"text": [
"initialize_geometry::proj4_str = +proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs\n",
"initialize_geometry::self.grid_crs = +proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs +type=crs\n",
"initialize_geometry::nc_crs = epsg:4326\n",
@ -188,7 +193,7 @@
{
"data": {
"text/plain": [
"<flopy.export.netcdf.NetCdf at 0x11e6accc0>"
"<flopy.export.netcdf.NetCdf at 0x126addf10>"
]
},
"execution_count": 8,
@ -315,7 +320,7 @@
{
"data": {
"text/plain": [
"<flopy.export.netcdf.NetCdf at 0x11e3255c0>"
"<flopy.export.netcdf.NetCdf at 0x12e428750>"
]
},
"execution_count": 12,
@ -360,8 +365,8 @@
"text/plain": [
"<class 'netCDF4._netCDF4.Dataset'>\n",
"root group (NETCDF4 data model, file format HDF5):\n",
" Conventions: CF-1.6, ACDD-1.3, flopy 3.3.1\n",
" date_created: 2020-06-26T13:32:00Z\n",
" Conventions: CF-1.6, ACDD-1.3, flopy 3.3.2\n",
" date_created: 2020-10-26T19:54:00Z\n",
" geospatial_vertical_positive: up\n",
" geospatial_vertical_min: -25.0\n",
" geospatial_vertical_max: 4.832500457763672\n",
@ -382,7 +387,7 @@
" flopy_sr_proj4_str: +proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs\n",
" start_datetime: 7/4/1776\n",
" dimensions(sizes): time(1097), layer(3), y(40), x(20)\n",
" variables(dimensions): int32 crs(), float64 time(time), float64 elevation(layer,y,x), float64 longitude(y,x), float64 latitude(y,x), float64 x_proj(y,x), float64 y_proj(y,x), float32 layer(layer), float32 delc(y), float32 delr(x), |S1 VerticalTransform(), float32 wel_flux(time,layer,y,x), float32 hani(layer,y,x), float32 hk(layer,y,x), float32 ss(layer,y,x), float32 sy(layer,y,x), float32 vka(layer,y,x), float32 vkcb(layer,y,x)\n",
" variables(dimensions): int32 crs(), float64 time(time), float64 elevation(layer, y, x), float64 longitude(y, x), float64 latitude(y, x), float64 x_proj(y, x), float64 y_proj(y, x), float32 layer(layer), float32 delc(y), float32 delr(x), |S1 VerticalTransform(), float32 wel_flux(time, layer, y, x), float32 hani(layer, y, x), float32 hk(layer, y, x), float32 ss(layer, y, x), float32 sy(layer, y, x), float32 vka(layer, y, x), float32 vkcb(layer, y, x)\n",
" groups: "
]
},
@ -425,8 +430,8 @@
"text/plain": [
"<class 'netCDF4._netCDF4.Dataset'>\n",
"root group (NETCDF4 data model, file format HDF5):\n",
" Conventions: CF-1.6, ACDD-1.3, flopy 3.3.1\n",
" date_created: 2020-06-26T13:32:00Z\n",
" Conventions: CF-1.6, ACDD-1.3, flopy 3.3.2\n",
" date_created: 2020-10-26T19:54:00Z\n",
" geospatial_vertical_positive: up\n",
" geospatial_vertical_min: -25.0\n",
" geospatial_vertical_max: 4.832500457763672\n",
@ -447,7 +452,7 @@
" flopy_sr_proj4_str: +proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs\n",
" start_datetime: 7/4/1776\n",
" dimensions(sizes): time(1097), layer(3), y(40), x(20)\n",
" variables(dimensions): int32 crs(), float64 time(time), float64 elevation(layer,y,x), float64 longitude(y,x), float64 latitude(y,x), float64 x_proj(y,x), float64 y_proj(y,x), float32 layer(layer), float32 delc(y), float32 delr(x), |S1 VerticalTransform(), float32 botm(layer,y,x), float32 thickness(layer,y,x), float32 model_top(y,x), int32 ibound(layer,y,x), float32 strt(layer,y,x), float32 rech(time,layer,y,x), float32 wel_flux(time,layer,y,x), float32 hani(layer,y,x), float32 hk(layer,y,x), float32 ss(layer,y,x), float32 sy(layer,y,x), float32 vka(layer,y,x), float32 vkcb(layer,y,x), float32 drn_elev(time,layer,y,x), float32 drn_cond(time,layer,y,x)\n",
" variables(dimensions): int32 crs(), float64 time(time), float64 elevation(layer, y, x), float64 longitude(y, x), float64 latitude(y, x), float64 x_proj(y, x), float64 y_proj(y, x), float32 layer(layer), float32 delc(y), float32 delr(x), |S1 VerticalTransform(), float32 botm(layer, y, x), float32 thickness(layer, y, x), float32 model_top(y, x), int32 ibound(layer, y, x), float32 strt(layer, y, x), float32 rech(time, layer, y, x), float32 wel_flux(time, layer, y, x), float32 hani(layer, y, x), float32 hk(layer, y, x), float32 ss(layer, y, x), float32 sy(layer, y, x), float32 vka(layer, y, x), float32 vkcb(layer, y, x), float32 drn_elev(time, layer, y, x), float32 drn_cond(time, layer, y, x)\n",
" groups: "
]
},
@ -484,8 +489,20 @@
"initialize_geometry::proj4_str = +proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs\n",
"initialize_geometry::self.grid_crs = +proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs +type=crs\n",
"initialize_geometry::nc_crs = epsg:4326\n",
"transforming coordinates using = proj=noop ellps=GRS80\n",
"error getting data for cell_by_cell_flowstorage at time 1.0:list index out of range\n",
"transforming coordinates using = proj=noop ellps=GRS80\n"
]
},
{
"name": "stdout",
"output_type": "stream",
"text": [
"error getting data for cell_by_cell_flowstorage at time 1.0:list index out of range\n"
]
},
{
"name": "stdout",
"output_type": "stream",
"text": [
"error getting data for cell_by_cell_flowstorage at time 1097.0:list index out of range\n"
]
},
@ -494,8 +511,8 @@
"text/plain": [
"<class 'netCDF4._netCDF4.Dataset'>\n",
"root group (NETCDF4 data model, file format HDF5):\n",
" Conventions: CF-1.6, ACDD-1.3, flopy 3.3.1\n",
" date_created: 2020-06-26T13:33:00Z\n",
" Conventions: CF-1.6, ACDD-1.3, flopy 3.3.2\n",
" date_created: 2020-10-26T19:54:00Z\n",
" geospatial_vertical_positive: up\n",
" geospatial_vertical_min: -25.0\n",
" geospatial_vertical_max: 4.832500457763672\n",
@ -516,7 +533,7 @@
" flopy_sr_proj4_str: +proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs\n",
" start_datetime: 7/4/1776\n",
" dimensions(sizes): time(1097), layer(3), y(40), x(20)\n",
" variables(dimensions): int32 crs(), float64 time(time), float64 elevation(layer,y,x), float64 longitude(y,x), float64 latitude(y,x), float64 x_proj(y,x), float64 y_proj(y,x), float32 layer(layer), float32 delc(y), float32 delr(x), |S1 VerticalTransform(), float32 head(time,layer,y,x), float32 constant_head(time,layer,y,x), float32 flow_right_face(time,layer,y,x), float32 flow_front_face(time,layer,y,x), float32 flow_lower_face(time,layer,y,x), float32 storage(time,layer,y,x)\n",
" variables(dimensions): int32 crs(), float64 time(time), float64 elevation(layer, y, x), float64 longitude(y, x), float64 latitude(y, x), float64 x_proj(y, x), float64 y_proj(y, x), float32 layer(layer), float32 delc(y), float32 delr(x), |S1 VerticalTransform(), float32 head(time, layer, y, x), float32 constant_head(time, layer, y, x), float32 flow_right_face(time, layer, y, x), float32 flow_front_face(time, layer, y, x), float32 flow_lower_face(time, layer, y, x), float32 storage(time, layer, y, x)\n",
" groups: "
]
},
@ -597,8 +614,20 @@
"initialize_geometry::proj4_str = +proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs\n",
"initialize_geometry::self.grid_crs = +proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs +type=crs\n",
"initialize_geometry::nc_crs = epsg:4326\n",
"transforming coordinates using = proj=noop ellps=GRS80\n",
"error getting data for cell_by_cell_flowstorage at time 1.0:list index out of range\n",
"transforming coordinates using = proj=noop ellps=GRS80\n"
]
},
{
"name": "stdout",
"output_type": "stream",
"text": [
"error getting data for cell_by_cell_flowstorage at time 1.0:list index out of range\n"
]
},
{
"name": "stdout",
"output_type": "stream",
"text": [
"error getting data for cell_by_cell_flowstorage at time 1097.0:list index out of range\n"
]
},
@ -607,8 +636,8 @@
"text/plain": [
"<class 'netCDF4._netCDF4.Dataset'>\n",
"root group (NETCDF4 data model, file format HDF5):\n",
" Conventions: CF-1.6, ACDD-1.3, flopy 3.3.1\n",
" date_created: 2020-06-26T13:33:00Z\n",
" Conventions: CF-1.6, ACDD-1.3, flopy 3.3.2\n",
" date_created: 2020-10-26T19:54:00Z\n",
" geospatial_vertical_positive: up\n",
" geospatial_vertical_min: -25.0\n",
" geospatial_vertical_max: 4.832500457763672\n",
@ -629,7 +658,7 @@
" flopy_sr_proj4_str: +proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs\n",
" start_datetime: 7/4/1776\n",
" dimensions(sizes): time(1097), layer(3), y(40), x(20)\n",
" variables(dimensions): int32 crs(), float64 time(time), float64 elevation(layer,y,x), float64 longitude(y,x), float64 latitude(y,x), float64 x_proj(y,x), float64 y_proj(y,x), float32 layer(layer), float32 delc(y), float32 delr(x), |S1 VerticalTransform(), float32 head(time,layer,y,x), float32 constant_head(time,layer,y,x), float32 flow_right_face(time,layer,y,x), float32 flow_front_face(time,layer,y,x), float32 flow_lower_face(time,layer,y,x), float32 storage(time,layer,y,x), float32 budget_zones(time,layer,y,x)\n",
" variables(dimensions): int32 crs(), float64 time(time), float64 elevation(layer, y, x), float64 longitude(y, x), float64 latitude(y, x), float64 x_proj(y, x), float64 y_proj(y, x), float32 layer(layer), float32 delc(y), float32 delr(x), |S1 VerticalTransform(), float32 head(time, layer, y, x), float32 constant_head(time, layer, y, x), float32 flow_right_face(time, layer, y, x), float32 flow_front_face(time, layer, y, x), float32 flow_lower_face(time, layer, y, x), float32 storage(time, layer, y, x), float32 budget_zones(time, layer, y, x)\n",
" groups: zonebudget"
]
},
@ -1201,8 +1230,20 @@
"initialize_geometry::proj4_str = +proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs\n",
"initialize_geometry::self.grid_crs = +proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs +type=crs\n",
"initialize_geometry::nc_crs = epsg:4326\n",
"transforming coordinates using = proj=noop ellps=GRS80\n",
"error getting data for cell_by_cell_flowstorage at time 1.0:list index out of range\n",
"transforming coordinates using = proj=noop ellps=GRS80\n"
]
},
{
"name": "stdout",
"output_type": "stream",
"text": [
"error getting data for cell_by_cell_flowstorage at time 1.0:list index out of range\n"
]
},
{
"name": "stdout",
"output_type": "stream",
"text": [
"error getting data for cell_by_cell_flowstorage at time 1097.0:list index out of range\n"
]
},
@ -1211,8 +1252,8 @@
"text/plain": [
"<class 'netCDF4._netCDF4.Dataset'>\n",
"root group (NETCDF4 data model, file format HDF5):\n",
" Conventions: CF-1.6, ACDD-1.3, flopy 3.3.1\n",
" date_created: 2020-06-26T13:33:00Z\n",
" Conventions: CF-1.6, ACDD-1.3, flopy 3.3.2\n",
" date_created: 2020-10-26T19:54:00Z\n",
" geospatial_vertical_positive: up\n",
" geospatial_vertical_min: -25.0\n",
" geospatial_vertical_max: 4.832500457763672\n",
@ -1233,7 +1274,7 @@
" flopy_sr_proj4_str: +proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs\n",
" start_datetime: 7/4/1776\n",
" dimensions(sizes): time(1097), layer(3), y(40), x(20)\n",
" variables(dimensions): int32 crs(), float64 time(time), float64 elevation(layer,y,x), float64 longitude(y,x), float64 latitude(y,x), float64 x_proj(y,x), float64 y_proj(y,x), float32 layer(layer), float32 delc(y), float32 delr(x), |S1 VerticalTransform(), float32 head(time,layer,y,x), float32 constant_head(time,layer,y,x), float32 flow_right_face(time,layer,y,x), float32 flow_front_face(time,layer,y,x), float32 flow_lower_face(time,layer,y,x), float32 storage(time,layer,y,x), float32 budget_zones(time,layer,y,x)\n",
" variables(dimensions): int32 crs(), float64 time(time), float64 elevation(layer, y, x), float64 longitude(y, x), float64 latitude(y, x), float64 x_proj(y, x), float64 y_proj(y, x), float32 layer(layer), float32 delc(y), float32 delr(x), |S1 VerticalTransform(), float32 head(time, layer, y, x), float32 constant_head(time, layer, y, x), float32 flow_right_face(time, layer, y, x), float32 flow_front_face(time, layer, y, x), float32 flow_lower_face(time, layer, y, x), float32 storage(time, layer, y, x), float32 budget_zones(time, layer, y, x)\n",
" groups: zonebudget"
]
},
@ -1274,7 +1315,7 @@
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
"version": "3.7.3"
"version": "3.7.7"
}
},
"nbformat": 4,

31
examples/Notebooks/flopy3_external_file_handling.ipynb
View File

@ -18,11 +18,10 @@
"name": "stdout",
"output_type": "stream",
"text": [
"flopy is installed in /Users/jdhughes/Documents/Development/flopy_git/flopy_fork/flopy\n",
"3.7.3 | packaged by conda-forge | (default, Jul 1 2019, 14:38:56) \n",
"3.7.7 (default, Mar 26 2020, 10:32:53) \n",
"[Clang 4.0.1 (tags/RELEASE_401/final)]\n",
"numpy version: 1.17.3\n",
"flopy version: 3.3.1\n"
"numpy version: 1.19.2\n",
"flopy version: 3.3.2\n"
]
}
],
@ -712,7 +711,7 @@
{
"data": {
"text/plain": [
"['# Name file for MODFLOW-2005, generated by Flopy version 3.3.1.\\n',\n",
"['# Name file for MODFLOW-2005, generated by Flopy version 3.3.2.\\n',\n",
" '#xll:0.0; yll:0.0; rotation:0.0; units:meters; lenuni:2; start_datetime:1-1-1970\\n',\n",
" 'LIST 2 modflowtest.list\\n',\n",
" 'DIS 11 modflowtest.dis\\n',\n",
@ -804,7 +803,13 @@
"Util2d:botm layer 9: resetting 'how' to external\n",
"Util2d:botm layer 10: resetting 'how' to external\n",
"Util2d:ss layer 1: resetting 'how' to external\n",
"Util2d:ss layer 2: resetting 'how' to external\n",
"Util2d:ss layer 2: resetting 'how' to external\n"
]
},
{
"name": "stdout",
"output_type": "stream",
"text": [
"Util2d:ss layer 3: resetting 'how' to external\n",
"Util2d:ss layer 4: resetting 'how' to external\n",
"Util2d:ss layer 5: resetting 'how' to external\n",
@ -829,7 +834,7 @@
{
"data": {
"text/plain": [
"['# Name file for MODFLOW-2005, generated by Flopy version 3.3.1.\\n',\n",
"['# Name file for MODFLOW-2005, generated by Flopy version 3.3.2.\\n',\n",
" '#xll:0.0; yll:0.0; rotation:0.0; units:meters; lenuni:2; start_datetime:1-1-1970\\n',\n",
" 'LIST 2 modflowtest.list\\n',\n",
" 'DIS 11 modflowtest.dis\\n',\n",
@ -1063,7 +1068,13 @@
"Util2d:ss layer 3: resetting 'how' to external\n",
"Util2d:ss layer 4: resetting 'how' to external\n",
"Util2d:ss layer 5: resetting 'how' to external\n",
"Util2d:ss layer 6: resetting 'how' to external\n",
"Util2d:ss layer 6: resetting 'how' to external\n"
]
},
{
"name": "stdout",
"output_type": "stream",
"text": [
"Util2d:ss layer 7: resetting 'how' to external\n",
"Util2d:ss layer 8: resetting 'how' to external\n",
"Util2d:ss layer 9: resetting 'how' to external\n",
@ -1176,7 +1187,7 @@
{
"data": {
"text/plain": [
"['# Name file for MODFLOW-2005, generated by Flopy version 3.3.1.\\n',\n",
"['# Name file for MODFLOW-2005, generated by Flopy version 3.3.2.\\n',\n",
" '#xll:0.0; yll:0.0; rotation:0.0; units:meters; lenuni:2; start_datetime:1-1-1970\\n',\n",
" 'LIST 2 modflowtest.list\\n',\n",
" 'DIS 11 modflowtest.dis\\n',\n",
@ -1262,7 +1273,7 @@
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
"version": "3.7.3"
"version": "3.7.7"
}
},
"nbformat": 4,

15
examples/Notebooks/flopy3_get_transmissivities_example.ipynb
View File

File diff suppressed because one or more lines are too long

97
examples/Notebooks/flopy3_grid_intersection_demo.ipynb
View File

File diff suppressed because one or more lines are too long

37
examples/Notebooks/flopy3_gridgen.ipynb
View File

File diff suppressed because one or more lines are too long

31
examples/Notebooks/flopy3_lake_example.ipynb
View File

File diff suppressed because one or more lines are too long

78
examples/Notebooks/flopy3_mf6_A_simple-model.ipynb
View File

File diff suppressed because one or more lines are too long

261
examples/Notebooks/flopy3_mf6_B_complex-model.ipynb
View File

File diff suppressed because one or more lines are too long

1946
examples/Notebooks/flopy3_mf6_obs_ts_tas.ipynb
View File

File diff suppressed because it is too large Load Diff

61
examples/Notebooks/flopy3_mf6_tutorial.ipynb
View File

File diff suppressed because one or more lines are too long

69
examples/Notebooks/flopy3_mnw2package_example.ipynb
View File

@ -18,12 +18,11 @@
"name": "stdout",
"output_type": "stream",
"text": [
"flopy is installed in /Users/jdhughes/Documents/Development/flopy_git/flopy_fork/flopy\n",
"3.7.3 | packaged by conda-forge | (default, Jul 1 2019, 14:38:56) \n",
"3.7.7 (default, Mar 26 2020, 10:32:53) \n",
"[Clang 4.0.1 (tags/RELEASE_401/final)]\n",
"numpy version: 1.17.3\n",
"pandas version: 0.25.2\n",
"flopy version: 3.3.1\n"
"numpy version: 1.19.2\n",
"pandas version: 1.0.5\n",
"flopy version: 3.3.2\n"
]
}
],
@ -783,8 +782,8 @@
{
"data": {
"text/plain": [
"{'well1': <flopy.modflow.mfmnw2.Mnw at 0x12650ca58>,\n",
" 'well2': <flopy.modflow.mfmnw2.Mnw at 0x1264db630>}"
"{'well1': <flopy.modflow.mfmnw2.Mnw at 0x11f5b08d0>,\n",
" 'well2': <flopy.modflow.mfmnw2.Mnw at 0x11efc52d0>}"
]
},
"execution_count": 14,
@ -804,7 +803,8 @@
{
"data": {
"text/plain": [
"{'nper': 3, 'mnwpackage': \n",
"{'nper': 3,\n",
" 'mnwpackage': \n",
" Multi-Node Well 2 Package Class\n",
" \n",
" Parameters\n",
@ -933,22 +933,55 @@
" gwt = False ('bool)\n",
" ipakcb = 0 ('int)\n",
" itmp (list, items = 3)\n",
" mnw = {'well1': <flopy.modflow.mfmnw2.Mnw object at 0x12650ca58>, 'well2': <flopy.modflow.mfmnw2.Mnw object at 0x1264db630>} ('dict)\n",
" mnw = {'well1': <flopy.modflow.mfmnw2.Mnw object at 0x11f5b08d0>, 'well2': <flopy.modflow.mfmnw2.Mnw object at 0x11efc52d0>} ('dict)\n",
" mnwmax = 2 ('int)\n",
" mnwprnt = 0 ('int)\n",
" node_data (array, shape = 3,)\n",
" nodtot = 3 ('int)\n",
" nper = 3 ('int)\n",
" stress_period_data = <flopy.utils.util_list.MfList object at 0x12650c320> ('flopy.utils.util_list.MfList)\n",
" stress_period_data = <flopy.utils.util_list.MfList object at 0x11eec8ad0> ('flopy.utils.util_list.MfList)\n",
" structured = True ('bool)\n",
" unit_number = 34, 'aux': [], 'wellid': 'well1', 'nnodes': -2, 'losstype': 'skin', 'pumploc': -1, 'qlimit': 0, 'ppflag': 0, 'pumpcap': 0, 'rw': [1.0,\n",
" 0.5], 'rskin': [2.0, 2.0], 'kskin': [5.0,\n",
" 5.0], 'B': [None], 'C': [0], 'P': [2.0], 'cwc': [None], 'pp': [1], 'k': [0], 'i': [1,\n",
" 1], 'j': [1, 1], 'ztop': [9.5, 7.1], 'zbotm': [7.1,\n",
" 5.1], 'pumplay': 0, 'pumprow': 0, 'pumpcol': 0, 'zpump': 6.2, 'hlim': None, 'qcut': None, 'qfrcmn': None, 'qfrcmx': None, 'hlift': None, 'liftq0': None, 'liftqmax': None, 'hwtol': None, 'liftn': None, 'qn': None, 'stress_period_data': rec.array([(0, 1, 1, 0, 0., 0, 0., 0., 0, 0., 0.),\n",
" unit_number = 34,\n",
" 'aux': [],\n",
" 'wellid': 'well1',\n",
" 'nnodes': -2,\n",
" 'losstype': 'skin',\n",
" 'pumploc': -1,\n",
" 'qlimit': 0,\n",
" 'ppflag': 0,\n",
" 'pumpcap': 0,\n",
" 'rw': [1.0, 0.5],\n",
" 'rskin': [2.0, 2.0],\n",
" 'kskin': [5.0, 5.0],\n",
" 'B': [None],\n",
" 'C': [0],\n",
" 'P': [2.0],\n",
" 'cwc': [None],\n",
" 'pp': [1],\n",
" 'k': [0],\n",
" 'i': [1, 1],\n",
" 'j': [1, 1],\n",
" 'ztop': [9.5, 7.1],\n",
" 'zbotm': [7.1, 5.1],\n",
" 'pumplay': 0,\n",
" 'pumprow': 0,\n",
" 'pumpcol': 0,\n",
" 'zpump': 6.2,\n",
" 'hlim': None,\n",
" 'qcut': None,\n",
" 'qfrcmn': None,\n",
" 'qfrcmx': None,\n",
" 'hlift': None,\n",
" 'liftq0': None,\n",
" 'liftqmax': None,\n",
" 'hwtol': None,\n",
" 'liftn': None,\n",
" 'qn': None,\n",
" 'stress_period_data': rec.array([(0, 1, 1, 0, 0., 0, 0., 0., 0, 0., 0.),\n",
" (0, 1, 1, 1, 100., 0, 0., 0., 0, 0., 0.),\n",
" (0, 1, 1, 1, 100., 0, 0., 0., 0, 0., 0.)],\n",
" dtype=[('k', '<i8'), ('i', '<i8'), ('j', '<i8'), ('per', '<i8'), ('qdes', '<f4'), ('capmult', '<i8'), ('cprime', '<f4'), ('hlim', '<f4'), ('qcut', '<i8'), ('qfrcmn', '<f4'), ('qfrcmx', '<f4')]), 'node_data': rec.array([(0, 1, 1, 9.5, 7.1, 'well1', 'skin', -1, 0, 0, 0, 1. , 2., 5., 0., 0., 0., 0., 0., 0, 0, 0, 6.2, 0., 0, 0., 0., 0., 0., 0., 0., 0., 0.),\n",
" dtype=[('k', '<i8'), ('i', '<i8'), ('j', '<i8'), ('per', '<i8'), ('qdes', '<f4'), ('capmult', '<i8'), ('cprime', '<f4'), ('hlim', '<f4'), ('qcut', '<i8'), ('qfrcmn', '<f4'), ('qfrcmx', '<f4')]),\n",
" 'node_data': rec.array([(0, 1, 1, 9.5, 7.1, 'well1', 'skin', -1, 0, 0, 0, 1. , 2., 5., 0., 0., 0., 0., 0., 0, 0, 0, 6.2, 0., 0, 0., 0., 0., 0., 0., 0., 0., 0.),\n",
" (0, 1, 1, 7.1, 5.1, 'well1', 'skin', -1, 0, 0, 0, 0.5, 2., 5., 0., 0., 0., 0., 0., 0, 0, 0, 6.2, 0., 0, 0., 0., 0., 0., 0., 0., 0., 0.)],\n",
" dtype=[('k', '<i8'), ('i', '<i8'), ('j', '<i8'), ('ztop', '<f4'), ('zbotm', '<f4'), ('wellid', 'O'), ('losstype', 'O'), ('pumploc', '<i8'), ('qlimit', '<i8'), ('ppflag', '<i8'), ('pumpcap', '<i8'), ('rw', '<f4'), ('rskin', '<f4'), ('kskin', '<f4'), ('B', '<f4'), ('C', '<f4'), ('P', '<f4'), ('cwc', '<f4'), ('pp', '<f4'), ('pumplay', '<i8'), ('pumprow', '<i8'), ('pumpcol', '<i8'), ('zpump', '<f4'), ('hlim', '<f4'), ('qcut', '<i8'), ('qfrcmn', '<f4'), ('qfrcmx', '<f4'), ('hlift', '<f4'), ('liftq0', '<f4'), ('liftqmax', '<f4'), ('hwtol', '<f4'), ('liftn', '<f4'), ('qn', '<f4')])}"
]
@ -1858,7 +1891,7 @@
{
"data": {
"text/plain": [
"{'well-a': <flopy.modflow.mfmnw2.Mnw at 0x126573240>}"
"{'well-a': <flopy.modflow.mfmnw2.Mnw at 0x11f5c5650>}"
]
},
"execution_count": 30,
@ -2494,7 +2527,7 @@
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
"version": "3.7.3"
"version": "3.7.7"
}
},
"nbformat": 4,

9
examples/Notebooks/flopy3_modflow_boundaries.ipynb
View File

@ -30,11 +30,10 @@
"name": "stdout",
"output_type": "stream",
"text": [
"flopy is installed in /Users/jdhughes/Documents/Development/flopy_git/flopy_fork/flopy\n",
"3.7.3 | packaged by conda-forge | (default, Jul 1 2019, 14:38:56) \n",
"3.7.7 (default, Mar 26 2020, 10:32:53) \n",
"[Clang 4.0.1 (tags/RELEASE_401/final)]\n",
"numpy version: 1.17.3\n",
"flopy version: 3.3.1\n"
"numpy version: 1.19.2\n",
"flopy version: 3.3.2\n"
]
}
],
@ -691,7 +690,7 @@
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
"version": "3.7.3"
"version": "3.7.7"
}
},
"nbformat": 4,

8
examples/Notebooks/flopy3_modpath6_example.ipynb
View File

@ -21,7 +21,7 @@
"text": [
"3.7.7 (default, Mar 26 2020, 10:32:53) \n",
"[Clang 4.0.1 (tags/RELEASE_401/final)]\n",
"numpy version: 1.18.5\n",
"numpy version: 1.19.2\n",
"matplotlib version: 3.3.0\n",
"pandas version: 1.0.5\n",
"flopy version: 3.3.2\n"
@ -683,7 +683,7 @@
" Version 1.12.00 2/3/2017 \n",
"\n",
" Using NAME file: Example_mnw.nam \n",
" Run start date and time (yyyy/mm/dd hh:mm:ss): 2020/08/31 16:20:15\n",
" Run start date and time (yyyy/mm/dd hh:mm:ss): 2020/10/26 15:56:43\n",
"\n",
" Solving: Stress period: 1 Time step: 1 Ground-Water Flow Eqn.\n",
" Solving: Stress period: 2 Time step: 1 Ground-Water Flow Eqn.\n",
@ -697,8 +697,8 @@
" Solving: Stress period: 2 Time step: 9 Ground-Water Flow Eqn.\n",
" Solving: Stress period: 2 Time step: 10 Ground-Water Flow Eqn.\n",
" Solving: Stress period: 3 Time step: 1 Ground-Water Flow Eqn.\n",
" Run end date and time (yyyy/mm/dd hh:mm:ss): 2020/08/31 16:20:15\n",
" Elapsed run time: 0.073 Seconds\n",
" Run end date and time (yyyy/mm/dd hh:mm:ss): 2020/10/26 15:56:43\n",
" Elapsed run time: 0.069 Seconds\n",
"\n",
" Normal termination of simulation\n"
]

48
examples/Notebooks/flopy3_modpath7_create_simulation.ipynb
View File

File diff suppressed because one or more lines are too long

52
examples/Notebooks/flopy3_modpath7_structured_example.ipynb
View File

File diff suppressed because one or more lines are too long

50
examples/Notebooks/flopy3_modpath7_unstructured_example.ipynb
View File

File diff suppressed because one or more lines are too long

7
examples/Notebooks/flopy3_mt3d-usgs_example_with_sft_lkt_uzt.ipynb
View File

@ -25,12 +25,11 @@
"name": "stdout",
"output_type": "stream",
"text": [
"flopy is installed in /Users/jdhughes/Documents/Development/flopy_git/flopy_fork/flopy\n",
"3.7.7 (default, Mar 26 2020, 10:32:53) \n",
"[Clang 4.0.1 (tags/RELEASE_401/final)]\n",
"numpy version: 1.18.5\n",
"matplotlib version: 3.2.2\n",
"flopy version: 3.3.1\n"
"numpy version: 1.19.2\n",
"matplotlib version: 3.3.0\n",
"flopy version: 3.3.2\n"
]
}
],

9
examples/Notebooks/flopy3_multi-component_SSM.ipynb
View File

@ -20,11 +20,10 @@
"name": "stdout",
"output_type": "stream",
"text": [
"flopy is installed in /Users/jdhughes/Documents/Development/flopy_git/flopy_fork/flopy\n",
"3.7.3 | packaged by conda-forge | (default, Jul 1 2019, 14:38:56) \n",
"3.7.7 (default, Mar 26 2020, 10:32:53) \n",
"[Clang 4.0.1 (tags/RELEASE_401/final)]\n",
"numpy version: 1.17.3\n",
"flopy version: 3.3.1\n"
"numpy version: 1.19.2\n",
"flopy version: 3.3.2\n"
]
}
],
@ -345,7 +344,7 @@
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
"version": "3.7.3"
"version": "3.7.7"
}
},
"nbformat": 4,

18
examples/Notebooks/flopy3_nwt_options.ipynb
View File

@ -20,10 +20,9 @@
"name": "stdout",
"output_type": "stream",
"text": [
"flopy is installed in /Users/jdhughes/Documents/Development/flopy_git/flopy_fork/flopy\n",
"3.7.3 | packaged by conda-forge | (default, Jul 1 2019, 14:38:56) \n",
"3.7.7 (default, Mar 26 2020, 10:32:53) \n",
"[Clang 4.0.1 (tags/RELEASE_401/final)]\n",
"flopy version: 3.3.1\n"
"flopy version: 3.3.2\n"
]
}
],
@ -83,11 +82,14 @@
" loading finf array...\n",
"stress period 2:\n",
"\n",
"creating model workspace...\n",
" temp/nwt_options/output\n",
"\n",
"changing model workspace...\n",
" temp/nwt_options/output\n",
" temp/nwt_options/output\n"
]
},
{
"name": "stdout",
"output_type": "stream",
"text": [
"Something bad happened.\n"
]
}
@ -729,7 +731,7 @@
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
"version": "3.7.3"
"version": "3.7.7"
}
},
"nbformat": 4,

47
examples/Notebooks/flopy3_raster_intersection.ipynb
View File

File diff suppressed because one or more lines are too long

17
examples/Notebooks/flopy3_save_binary_data_file.ipynb
View File

File diff suppressed because one or more lines are too long

31
examples/Notebooks/flopy3_sfrpackage_example.ipynb
View File

File diff suppressed because one or more lines are too long

267
examples/Notebooks/flopy3_shapefile_export.ipynb
View File

File diff suppressed because one or more lines are too long

57
examples/Notebooks/flopy3_shapefile_features.ipynb
View File

File diff suppressed because one or more lines are too long

19
examples/Notebooks/flopy3_swi2package_ex1.ipynb
View File

File diff suppressed because one or more lines are too long

15
examples/Notebooks/flopy3_swi2package_ex4.ipynb
View File

File diff suppressed because one or more lines are too long

46
examples/Notebooks/flopy3_triangle.ipynb
View File

File diff suppressed because one or more lines are too long

132
examples/Notebooks/flopy3_uzf_example.ipynb
View File

File diff suppressed because one or more lines are too long

3
examples/Notebooks/flopy3_vtk_export.ipynb
View File

@ -20,10 +20,9 @@
"name": "stdout",
"output_type": "stream",
"text": [
"flopy is installed in /Users/jdhughes/Documents/Development/flopy_git/flopy_fork/flopy\n",
"3.7.7 (default, Mar 26 2020, 10:32:53) \n",
"[Clang 4.0.1 (tags/RELEASE_401/final)]\n",
"flopy version: 3.3.1\n"
"flopy version: 3.3.2\n"
]
}
],

787
examples/Notebooks/flopy3_working_stack_demo.ipynb
View File

File diff suppressed because one or more lines are too long

69
examples/groundwater_paper/Notebooks/example_1.ipynb
View File

File diff suppressed because one or more lines are too long

33
examples/groundwater_paper/Notebooks/uspb.ipynb
View File

File diff suppressed because one or more lines are too long

2
flopy/version.py
View File

@ -1,5 +1,5 @@
# flopy version file automatically created using...make-release.py
# created on...June 26, 2020 17:31:05
# created on...October 26, 2020 15:01:54
major = 3
minor = 3