initial 3.3.4 release candidate on develop (#1064)

Update make_release.md
develop
jdhughes-usgs 2021-02-19 16:03:15 -06:00 committed by GitHub
parent 50111c65a6
commit 4cee7e791b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
133 changed files with 4227 additions and 4392 deletions

View File

@ -4,7 +4,10 @@ on:
schedule:
- cron: '0 8 * * *' # run at 8 AM UTC (12 am PST)
push:
branches: [master, develop]
branches:
- master
- develop
- 'release*'
pull_request:
branches: [master, develop]

View File

@ -2,7 +2,10 @@ name: Read the Docs
on:
push:
branches: [master, develop]
branches:
- master
- develop
- 'release*'
pull_request:
branches: [master, develop]

View File

@ -1,7 +1,7 @@
<img src="https://raw.githubusercontent.com/modflowpy/flopy/master/examples/images/flopy3.png" alt="flopy3" style="width:50;height:20">
### Version 3.3.3 &mdash; release candidate
### Version 3.3.4 &mdash; release candidate
[![Build Status](https://travis-ci.org/modflowpy/flopy.svg?branch=develop)](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)
@ -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.3 &mdash; release candidate: U.S. Geological Survey Software Release, 27 October 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., 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)
MODFLOW Resources

View File

@ -29,9 +29,9 @@
"downloadURL": "https://code.usgs.gov/usgs/modflow/flopy/archive/master.zip",
"vcs": "git",
"laborHours": -1,
"version": "3.3.3",
"version": "3.3.4",
"date": {
"metadataLastUpdated": "2020-10-27"
"metadataLastUpdated": "2021-02-18"
},
"organization": "U.S. Geological Survey",
"permissions": {

View File

@ -27,7 +27,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.3 &mdash; release candidate: U.S. Geological Survey Software Release, 27 October 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., 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)
Disclaimer

View File

@ -1,84 +0,0 @@
---
title: FloPy Release Notes
author:
- Mark Bakker
- Vincent Post
- Christian D. Langevin
- Joseph D. Hughes
- Jeremy T. White
- Andrew T. Leaf
- Scott R. Paulinski
- Joshua D. Larsen
- Michael W. Toews
- Eric D. Morway
- Jason C. Bellino
- Jon J. Starn
- Michael N. Fienen
header-includes:
- \usepackage{fancyhdr}
- \usepackage{lastpage}
- \pagestyle{fancy}
- \fancyhf{{}}
- \fancyhead[LE, LO, RE, RO]{}
- \fancyhead[CE, CO]{FloPy Release Notes}
- \fancyfoot[LE, RO]{FloPy version 3.3.3}
- \fancyfoot[CO, CE]{\thepage\ of \pageref{LastPage}}
- \fancyfoot[RE, LO]{10/27/2020}
geometry: margin=0.75in
---
Introduction
-----------------------------------------------
FloPy includes support for MODFLOW 6, MODFLOW-2005, MODFLOW-NWT, MODFLOW-USG, and MODFLOW-2000. Other supported MODFLOW-based models include MODPATH (version 6 and 7), MT3DMS, MT3D-USGS, and SEAWAT.
For general modeling issues, please consult a modeling forum, such as the [MODFLOW Users Group](https://groups.google.com/forum/#!forum/modflow). Other MODFLOW resources are listed in the [MODFLOW Resources](https://github.com/modflowpy/flopy#modflow-resources) section.
Documentation
-----------------------------------------------
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](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
-----------------------------------------------
##### ***Citation for FloPy:***
[Bakker, Mark, Post, Vincent, Langevin, C. D., Hughes, J. D., White, J. T., Starn, J. J. and Fienen, M. N., 2016, Scripting MODFLOW Model Development Using Python and FloPy: Groundwater, v. 54, p. 733739, doi:10.1111/gwat.12413.](http://dx.doi.org/10.1111/gwat.12413)
##### ***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.3 &mdash; release candidate: U.S. Geological Survey Software Release, 27 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.
Installation
-----------------------------------------------
To install FloPy version 3.3.3 from the USGS FloPy website:
```
pip install https://water.usgs.gov/ogw/flopy/flopy-3.3.3.zip
```
To update to FloPy version 3.3.3 from the USGS FloPy website:
```
pip install https://water.usgs.gov/ogw/flopy/flopy-3.3.3.zip --upgrade
```

Binary file not shown.

View File

@ -4,13 +4,28 @@ Instructions for making a FloPy release
## Make a release branch from develop
1. Make a release branch from develop (*e.g.* `release3.2.10`)
2. Update MODFLOW 6 dfn files in the repository and MODFLOW 6 package classes by running:
2. If the flopy release coincides with a new MODFLOW 6 release
1. Update `usgsprograms.txt` in the [GitHub pymake repository](https://github.com/modflowpy/pymake) with the path to the new MODFLOW 6 release. Also update all other targets in `usgsprograms.txt` with the path to new releases.
2. Recompile all of the executables release on the [GitHub executables repository](https://github.com/MODFLOW-USGS/executables) using the `buildall.py` pymake script and Intel compilers for all operating systems.
3. Update the README.md on the [GitHub executables repository](https://github.com/MODFLOW-USGS/executables) with the information in the `code.md` file created by the `buildall.py` pymake script.
4. Make a new release on the [GitHub executables repository](https://github.com/MODFLOW-USGS/executables) and add all of the operating system specific zip files containing the compiled executables (`linux.zip`, `mac.zip`, `win64.zip`, `win32.zip`). Publish the new release.
5. Update MODFLOW 6 dfn files in the repository and MODFLOW 6 package classes by running:
```
python -c 'import flopy; flopy.mf6.utils.generate_classes(branch="master", backup=False)'
```
```
python -c 'import flopy; flopy.mf6.utils.generate_classes(branch="master", backup=False)'
```
5. Run `black` on the updated MODFLOW 6 package classes by running the following from the root directory:
```
black -l 79 flopy/mf6
```
Evaluate if there are any changes that seem to reduce MODFLOW 6 functionality before committing changes on the release branch.
## Update the release version number
@ -37,12 +52,6 @@ Instructions for making a FloPy release
python update-version_changes.py
```
3. Run pandoc from the terminal in the root directory to create USGS release notes using:
```
pandoc -o ./docs/USGS_release.pdf ./docs/USGS_release.md ./docs/supported_packages.md ./docs/model_checks.md ./docs/version_changes.md
```
## Update the example notebooks
@ -50,13 +59,14 @@ Use `run_notebooks.py` in the `release` directory to rerun all of the notebooks
1. `examples\Notebooks` directory.
2. `examples\Notebooks\groundwater_paper` directory.
2. `examples\Notebooks\FAQ` directory.
## Commit the release branch
1. Commit the changes to the release (*e.g.* `release3.2.10`) branch.
2. Push the commit to GitHub.
3. Wait until the commit successfully runs on [Travis](https://travis-ci.org/modflowpy/flopy/builds).
2. Push the commit to the [upstream GitHub repository](https://github.com/modflowpy/flopy).
3. Wait until the commit successfully runs on [GitHub Actions](https://github.com/modflowpy/flopy/actions).
## Update master branch

View File

@ -2,6 +2,26 @@ FloPy Changes
-----------------------------------------------
### Version 3.3.3
* New features:
* [feat(voronoi)](https://github.com/modflowpy/flopy/commit/71162aef76ad025c42753e82ddee14bdeef1fd22): Add voronoigrid class (#1034). Committed by langevin-usgs on 2021-01-05.
* [feat(unstructured)](https://github.com/modflowpy/flopy/commit/0f7a0f033ba0bdff19621e824e721d032a6d1313): Improve unstructured grid support for modflow 6 and modflow-usg (#1021). Committed by langevin-usgs on 2020-11-27.
* Bug fixes:
* [fix(createpackages)](https://github.com/modflowpy/flopy/commit/8a2cffb052d0c33a4699edb9554b039fa871f00f): Avoid creating invalid escape characters (#1055). Committed by Mike Taves on 2021-02-17.
* [fix(DeprecationWarning)](https://github.com/modflowpy/flopy/commit/7d36b1c7f67a9eddeda122644295cf23c0573c8d): Use collections.abc module instead of collections (#1057). Committed by Mike Taves on 2021-02-15.
* [fix(DeprecationWarning)](https://github.com/modflowpy/flopy/commit/39c0ecba20bd54f2eafd8350151e60efbcc5c162): Related to numpy (#1058). Committed by Mike Taves on 2021-02-15.
* [fix(numpy)](https://github.com/modflowpy/flopy/commit/943ace46c686cbdbfdc327a3016da5942211ab7e): Aliases of builtin types is deprecated as of numpy 1.20 (#1052). Committed by Mike Taves on 2021-02-11.
* [fix()](https://github.com/modflowpy/flopy/commit/3ccdd57e390b94c4f23daa3d46554efd39e8ec9d): fix(get_active) include the cbd layers when checking layer thickness before BAS is loaded (#1051). Committed by Michael Ou on 2021-02-08.
* [fix(dis)](https://github.com/modflowpy/flopy/commit/5bfdf715514bbefd3f9d9a2e79d5c486e48f1896): Fix for dis.get_lrc() and dis.get_node() (#1049). Committed by langevin-usgs on 2021-02-04.
* [fix()](https://github.com/modflowpy/flopy/commit/3088e51bb546afc5a68103a81821c750480263b7): fix(modflow/mflpf) mfusg unstructured lpf ikcflag addition (#1044). Committed by Chris Nicol on 2021-02-01.
* [fix(print MFArray)](https://github.com/modflowpy/flopy/commit/b8322ddc52241d3c2a49c4ebdf2e8865c6f36bb9): Fixed printing of layered arrays - issue #1043 (#1045). Committed by spaulins-usgs on 2021-01-29.
* [fix(GridIntersect)](https://github.com/modflowpy/flopy/commit/369942c7ed3171927f50a20c27b951ed062eb0e1): Fix vertices for offset grids (#1037). Committed by Davíd Brakenhoff on 2021-01-13.
* [fix(PlotMapView.plot_array())](https://github.com/modflowpy/flopy/commit/7cb429f81a9206fa450cceff21c695faf01fce41): Fix value masking code for masked_values parameter (#1026). Committed by Joshua Larsen on 2020-12-03.
* [fix(sfr ic option)](https://github.com/modflowpy/flopy/commit/0ab929e01fdf2a2205d268e51364630d9bbaf9c5): Made ic optional and updated description (#1020). Committed by spaulins-usgs on 2020-11-27.
### Version 3.3.2
* New features:

View File

@ -9,9 +9,9 @@
"name": "stdout",
"output_type": "stream",
"text": [
"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"
"3.8.6 | packaged by conda-forge | (default, Oct 7 2020, 18:42:56) \n",
"[Clang 10.0.1 ]\n",
"flopy version: 3.3.3\n"
]
}
],
@ -173,7 +173,7 @@
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
"version": "3.7.7"
"version": "3.8.6"
}
},
"nbformat": 4,

View File

@ -9,9 +9,9 @@
"name": "stdout",
"output_type": "stream",
"text": [
"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"
"3.8.6 | packaged by conda-forge | (default, Oct 7 2020, 18:42:56) \n",
"[Clang 10.0.1 ]\n",
"flopy version: 3.3.3\n"
]
}
],
@ -144,7 +144,7 @@
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
"version": "3.7.7"
"version": "3.8.6"
}
},
"nbformat": 4,

View File

@ -9,9 +9,9 @@
"name": "stdout",
"output_type": "stream",
"text": [
"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"
"3.8.6 | packaged by conda-forge | (default, Oct 7 2020, 18:42:56) \n",
"[Clang 10.0.1 ]\n",
"flopy version: 3.3.3\n"
]
}
],
@ -103,7 +103,7 @@
{
"data": {
"text/plain": [
"'/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'"
"'/Users/jdhughes/anaconda3/bin:/Users/jdhughes/anaconda3/condabin:/anaconda3/bin:/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.7.7"
"version": "3.8.6"
}
},
"nbformat": 4,

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -18,9 +18,9 @@
"name": "stdout",
"output_type": "stream",
"text": [
"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"
"3.8.6 | packaged by conda-forge | (default, Oct 7 2020, 18:42:56) \n",
"[Clang 10.0.1 ]\n",
"flopy version: 3.3.3\n"
]
}
],
@ -292,7 +292,7 @@
{
"data": {
"text/plain": [
"<flopy.utils.check.check at 0x121b89d50>"
"<flopy.utils.check.check at 0x10f664fa0>"
]
},
"execution_count": 7,
@ -333,7 +333,7 @@
{
"data": {
"text/plain": [
"<flopy.utils.check.check at 0x121b89450>"
"<flopy.utils.check.check at 0x12768e9d0>"
]
},
"execution_count": 8,
@ -397,7 +397,7 @@
{
"data": {
"text/plain": [
"<flopy.utils.check.check at 0x121b90b10>"
"<flopy.utils.check.check at 0x10f682220>"
]
},
"execution_count": 9,
@ -549,7 +549,7 @@
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
"version": "3.7.7"
"version": "3.8.6"
}
},
"nbformat": 4,

File diff suppressed because one or more lines are too long

View File

@ -18,10 +18,10 @@
"name": "stdout",
"output_type": "stream",
"text": [
"3.7.7 (default, Mar 26 2020, 10:32:53) \n",
"[Clang 4.0.1 (tags/RELEASE_401/final)]\n",
"numpy version: 1.19.2\n",
"flopy version: 3.3.2\n"
"3.8.6 | packaged by conda-forge | (default, Oct 7 2020, 18:42:56) \n",
"[Clang 10.0.1 ]\n",
"numpy version: 1.18.5\n",
"flopy version: 3.3.3\n"
]
}
],
@ -751,7 +751,7 @@
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
"version": "3.7.7"
"version": "3.8.6"
}
},
"nbformat": 4,

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -18,9 +18,9 @@
"name": "stdout",
"output_type": "stream",
"text": [
"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"
"3.8.6 | packaged by conda-forge | (default, Oct 7 2020, 18:42:56) \n",
"[Clang 10.0.1 ]\n",
"flopy version: 3.3.3\n"
]
}
],
@ -930,7 +930,7 @@
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
"version": "3.7.7"
"version": "3.8.6"
}
},
"nbformat": 4,

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -25,11 +25,11 @@
"name": "stdout",
"output_type": "stream",
"text": [
"3.7.7 (default, Mar 26 2020, 10:32:53) \n",
"[Clang 4.0.1 (tags/RELEASE_401/final)]\n",
"numpy version: 1.19.2\n",
"matplotlib version: 3.3.0\n",
"flopy version: 3.3.2\n"
"3.8.6 | packaged by conda-forge | (default, Oct 7 2020, 18:42:56) \n",
"[Clang 10.0.1 ]\n",
"numpy version: 1.18.5\n",
"matplotlib version: 3.2.2\n",
"flopy version: 3.3.3\n"
]
}
],
@ -91,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/10/26 15:54:14\n",
" Run start date and time (yyyy/mm/dd hh:mm:ss): 2021/02/18 11:30:46\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/10/26 15:54:14\n",
" Elapsed run time: 0.011 Seconds\n",
" Run end date and time (yyyy/mm/dd hh:mm:ss): 2021/02/18 11:30:46\n",
" Elapsed run time: 0.018 Seconds\n",
"\n",
" Normal termination of simulation\n",
"Output file located: freyberg.hds\n",
@ -220,18 +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/10/26 15:54:14\n",
" Run start date and time (yyyy/mm/dd hh:mm:ss): 2021/02/18 11:30:46\n",
"\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"
"mf2005 000000010CE4DBFB Unknown Unknown Unknown\n",
"mf2005 000000010CE89CE8 Unknown Unknown Unknown\n",
"mf2005 000000010CE8871C Unknown Unknown Unknown\n",
"mf2005 000000010C962E33 _u2drel_ 890 utl7.f\n",
"mf2005 000000010C970BBA _sgwf2bas7ardis_ 759 gwf2bas7.f\n",
"mf2005 000000010C9689F8 _gwf2bas7ar_ 217 gwf2bas7.f\n",
"mf2005 000000010CB5A5A2 _MAIN__ 75 mf2005.f\n",
"mf2005 000000010C92AB6E Unknown Unknown Unknown\n"
]
}
],
@ -337,16 +337,10 @@
" 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/10/26 15:54:14\n",
"\n"
]
},
{
"name": "stdout",
"output_type": "stream",
"text": [
" Run start date and time (yyyy/mm/dd hh:mm:ss): 2021/02/18 11:30:46\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/10/26 15:54:14\n",
" Run end date and time (yyyy/mm/dd hh:mm:ss): 2021/02/18 11:30:46\n",
" Elapsed run time: 0.010 Seconds\n",
"\n",
" Normal termination of simulation\n"
@ -401,7 +395,7 @@
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
"version": "3.7.7"
"version": "3.8.6"
}
},
"nbformat": 4,

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -18,9 +18,9 @@
"name": "stdout",
"output_type": "stream",
"text": [
"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"
"3.8.6 | packaged by conda-forge | (default, Oct 7 2020, 18:42:56) \n",
"[Clang 10.0.1 ]\n",
"flopy version: 3.3.3\n"
]
}
],
@ -193,7 +193,7 @@
{
"data": {
"text/plain": [
"<flopy.export.netcdf.NetCdf at 0x126addf10>"
"<flopy.export.netcdf.NetCdf at 0x10fec13d0>"
]
},
"execution_count": 8,
@ -320,7 +320,7 @@
{
"data": {
"text/plain": [
"<flopy.export.netcdf.NetCdf at 0x12e428750>"
"<flopy.export.netcdf.NetCdf at 0x12f50f850>"
]
},
"execution_count": 12,
@ -365,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.2\n",
" date_created: 2020-10-26T19:54:00Z\n",
" Conventions: CF-1.6, ACDD-1.3, flopy 3.3.3\n",
" date_created: 2021-02-18T17:31:00Z\n",
" geospatial_vertical_positive: up\n",
" geospatial_vertical_min: -25.0\n",
" geospatial_vertical_max: 4.832500457763672\n",
@ -387,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: "
]
},
@ -430,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.2\n",
" date_created: 2020-10-26T19:54:00Z\n",
" Conventions: CF-1.6, ACDD-1.3, flopy 3.3.3\n",
" date_created: 2021-02-18T17:31:00Z\n",
" geospatial_vertical_positive: up\n",
" geospatial_vertical_min: -25.0\n",
" geospatial_vertical_max: 4.832500457763672\n",
@ -452,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: "
]
},
@ -511,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.2\n",
" date_created: 2020-10-26T19:54:00Z\n",
" Conventions: CF-1.6, ACDD-1.3, flopy 3.3.3\n",
" date_created: 2021-02-18T17:31:00Z\n",
" geospatial_vertical_positive: up\n",
" geospatial_vertical_min: -25.0\n",
" geospatial_vertical_max: 4.832500457763672\n",
@ -533,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: "
]
},
@ -636,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.2\n",
" date_created: 2020-10-26T19:54:00Z\n",
" Conventions: CF-1.6, ACDD-1.3, flopy 3.3.3\n",
" date_created: 2021-02-18T17:31:00Z\n",
" geospatial_vertical_positive: up\n",
" geospatial_vertical_min: -25.0\n",
" geospatial_vertical_max: 4.832500457763672\n",
@ -658,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"
]
},
@ -1252,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.2\n",
" date_created: 2020-10-26T19:54:00Z\n",
" Conventions: CF-1.6, ACDD-1.3, flopy 3.3.3\n",
" date_created: 2021-02-18T17:31:00Z\n",
" geospatial_vertical_positive: up\n",
" geospatial_vertical_min: -25.0\n",
" geospatial_vertical_max: 4.832500457763672\n",
@ -1274,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"
]
},
@ -1315,7 +1315,7 @@
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
"version": "3.7.7"
"version": "3.8.6"
}
},
"nbformat": 4,

View File

@ -18,10 +18,10 @@
"name": "stdout",
"output_type": "stream",
"text": [
"3.7.7 (default, Mar 26 2020, 10:32:53) \n",
"[Clang 4.0.1 (tags/RELEASE_401/final)]\n",
"numpy version: 1.19.2\n",
"flopy version: 3.3.2\n"
"3.8.6 | packaged by conda-forge | (default, Oct 7 2020, 18:42:56) \n",
"[Clang 10.0.1 ]\n",
"numpy version: 1.18.5\n",
"flopy version: 3.3.3\n"
]
}
],
@ -488,7 +488,13 @@
"Util2d:botm layer 5: resetting 'how' to external\n",
"Util2d:botm layer 6: resetting 'how' to external\n",
"Util2d:botm layer 7: resetting 'how' to external\n",
"Util2d:botm layer 8: resetting 'how' to external\n",
"Util2d:botm layer 8: resetting 'how' to external\n"
]
},
{
"name": "stdout",
"output_type": "stream",
"text": [
"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",
@ -497,7 +503,13 @@
"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 7: resetting 'how' to external\n",
"Util2d:ss layer 7: resetting 'how' to external\n"
]
},
{
"name": "stdout",
"output_type": "stream",
"text": [
"Util2d:ss layer 8: resetting 'how' to external\n",
"Util2d:ss layer 9: resetting 'how' to external\n",
"Util2d:ss layer 10: resetting 'how' to external\n"
@ -635,7 +647,13 @@
"Util2d:ss layer 1: resetting 'how' to external\n",
"Util2d hk layer 2: can't be free format...resetting\n",
"Util2d:ss layer 2: resetting 'how' to external\n",
"Util2d hk layer 3: can't be free format...resetting\n",
"Util2d hk layer 3: can't be free format...resetting\n"
]
},
{
"name": "stdout",
"output_type": "stream",
"text": [
"Util2d:ss layer 3: resetting 'how' to external\n",
"Util2d hk layer 4: can't be free format...resetting\n",
"Util2d:ss layer 4: resetting 'how' to external\n",
@ -711,7 +729,7 @@
{
"data": {
"text/plain": [
"['# Name file for MODFLOW-2005, generated by Flopy version 3.3.2.\\n',\n",
"['# Name file for MODFLOW-2005, generated by Flopy version 3.3.3.\\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",
@ -796,27 +814,39 @@
"Util2d:botm layer 2: resetting 'how' to external\n",
"Util2d:botm layer 3: resetting 'how' to external\n",
"Util2d:botm layer 4: resetting 'how' to external\n",
"Util2d:botm layer 5: resetting 'how' to external\n",
"Util2d:botm layer 6: resetting 'how' to external\n",
"Util2d:botm layer 7: resetting 'how' to external\n",
"Util2d:botm layer 8: resetting 'how' to external\n",
"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:botm layer 5: resetting 'how' to external\n"
]
},
{
"name": "stdout",
"output_type": "stream",
"text": [
"Util2d:botm layer 6: resetting 'how' to external\n",
"Util2d:botm layer 7: resetting 'how' to external\n",
"Util2d:botm layer 8: resetting 'how' to external\n",
"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"
]
},
{
"name": "stdout",
"output_type": "stream",
"text": [
"Util2d:ss layer 2: resetting 'how' to external\n",
"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 7: resetting 'how' to external\n",
"Util2d:ss layer 8: resetting 'how' to external\n",
"Util2d:ss layer 9: resetting 'how' to external\n",
"Util2d:ss layer 9: resetting 'how' to external\n"
]
},
{
"name": "stdout",
"output_type": "stream",
"text": [
"Util2d:ss layer 10: resetting 'how' to external\n"
]
}
@ -834,7 +864,7 @@
{
"data": {
"text/plain": [
"['# Name file for MODFLOW-2005, generated by Flopy version 3.3.2.\\n',\n",
"['# Name file for MODFLOW-2005, generated by Flopy version 3.3.3.\\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",
@ -1054,7 +1084,13 @@
"Util2d:delr: resetting 'how' to external\n",
"Util2d:delc: resetting 'how' to external\n",
"Util2d:botm layer 1: resetting 'how' to external\n",
"Util2d:botm layer 2: resetting 'how' to external\n",
"Util2d:botm layer 2: resetting 'how' to external\n"
]
},
{
"name": "stdout",
"output_type": "stream",
"text": [
"Util2d:botm layer 3: resetting 'how' to external\n",
"Util2d:botm layer 4: resetting 'how' to external\n",
"Util2d:botm layer 5: resetting 'how' to external\n",
@ -1068,13 +1104,7 @@
"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"
]
},
{
"name": "stdout",
"output_type": "stream",
"text": [
"Util2d:ss layer 6: resetting 'how' to external\n",
"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",
@ -1187,7 +1217,7 @@
{
"data": {
"text/plain": [
"['# Name file for MODFLOW-2005, generated by Flopy version 3.3.2.\\n',\n",
"['# Name file for MODFLOW-2005, generated by Flopy version 3.3.3.\\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",
@ -1273,7 +1303,7 @@
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
"version": "3.7.7"
"version": "3.8.6"
}
},
"nbformat": 4,

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because it is too large Load Diff

File diff suppressed because one or more lines are too long

View File

@ -18,11 +18,11 @@
"name": "stdout",
"output_type": "stream",
"text": [
"3.7.7 (default, Mar 26 2020, 10:32:53) \n",
"[Clang 4.0.1 (tags/RELEASE_401/final)]\n",
"numpy version: 1.19.2\n",
"3.8.6 | packaged by conda-forge | (default, Oct 7 2020, 18:42:56) \n",
"[Clang 10.0.1 ]\n",
"numpy version: 1.18.5\n",
"pandas version: 1.0.5\n",
"flopy version: 3.3.2\n"
"flopy version: 3.3.3\n"
]
}
],
@ -782,8 +782,8 @@
{
"data": {
"text/plain": [
"{'well1': <flopy.modflow.mfmnw2.Mnw at 0x11f5b08d0>,\n",
" 'well2': <flopy.modflow.mfmnw2.Mnw at 0x11efc52d0>}"
"{'well1': <flopy.modflow.mfmnw2.Mnw at 0x11a9af8e0>,\n",
" 'well2': <flopy.modflow.mfmnw2.Mnw at 0x11a9af940>}"
]
},
"execution_count": 14,
@ -933,13 +933,13 @@
" gwt = False ('bool)\n",
" ipakcb = 0 ('int)\n",
" itmp (list, items = 3)\n",
" mnw = {'well1': <flopy.modflow.mfmnw2.Mnw object at 0x11f5b08d0>, 'well2': <flopy.modflow.mfmnw2.Mnw object at 0x11efc52d0>} ('dict)\n",
" mnw = {'well1': <flopy.modflow.mfmnw2.Mnw object at 0x11a9af8e0>, 'well2': <flopy.modflow.mfmnw2.Mnw object at 0x11a9af940>} ('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 0x11eec8ad0> ('flopy.utils.util_list.MfList)\n",
" stress_period_data = <flopy.utils.util_list.MfList object at 0x11a9af910> ('flopy.utils.util_list.MfList)\n",
" structured = True ('bool)\n",
" unit_number = 34,\n",
" 'aux': [],\n",
@ -1891,7 +1891,7 @@
{
"data": {
"text/plain": [
"{'well-a': <flopy.modflow.mfmnw2.Mnw at 0x11f5c5650>}"
"{'well-a': <flopy.modflow.mfmnw2.Mnw at 0x11a92b910>}"
]
},
"execution_count": 30,
@ -2527,7 +2527,7 @@
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
"version": "3.7.7"
"version": "3.8.6"
}
},
"nbformat": 4,

View File

@ -30,10 +30,10 @@
"name": "stdout",
"output_type": "stream",
"text": [
"3.7.7 (default, Mar 26 2020, 10:32:53) \n",
"[Clang 4.0.1 (tags/RELEASE_401/final)]\n",
"numpy version: 1.19.2\n",
"flopy version: 3.3.2\n"
"3.8.6 | packaged by conda-forge | (default, Oct 7 2020, 18:42:56) \n",
"[Clang 10.0.1 ]\n",
"numpy version: 1.18.5\n",
"flopy version: 3.3.3\n"
]
}
],
@ -690,7 +690,7 @@
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
"version": "3.7.7"
"version": "3.8.6"
}
},
"nbformat": 4,

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -25,11 +25,11 @@
"name": "stdout",
"output_type": "stream",
"text": [
"3.7.7 (default, Mar 26 2020, 10:32:53) \n",
"[Clang 4.0.1 (tags/RELEASE_401/final)]\n",
"numpy version: 1.19.2\n",
"matplotlib version: 3.3.0\n",
"flopy version: 3.3.2\n"
"3.8.6 | packaged by conda-forge | (default, Oct 7 2020, 18:42:56) \n",
"[Clang 10.0.1 ]\n",
"numpy version: 1.18.5\n",
"matplotlib version: 3.2.2\n",
"flopy version: 3.3.3\n"
]
}
],
@ -897,7 +897,7 @@
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
"version": "3.7.7"
"version": "3.8.6"
}
},
"nbformat": 4,

View File

@ -20,10 +20,10 @@
"name": "stdout",
"output_type": "stream",
"text": [
"3.7.7 (default, Mar 26 2020, 10:32:53) \n",
"[Clang 4.0.1 (tags/RELEASE_401/final)]\n",
"numpy version: 1.19.2\n",
"flopy version: 3.3.2\n"
"3.8.6 | packaged by conda-forge | (default, Oct 7 2020, 18:42:56) \n",
"[Clang 10.0.1 ]\n",
"numpy version: 1.18.5\n",
"flopy version: 3.3.3\n"
]
}
],
@ -344,7 +344,7 @@
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
"version": "3.7.7"
"version": "3.8.6"
}
},
"nbformat": 4,

View File

@ -20,9 +20,9 @@
"name": "stdout",
"output_type": "stream",
"text": [
"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"
"3.8.6 | packaged by conda-forge | (default, Oct 7 2020, 18:42:56) \n",
"[Clang 10.0.1 ]\n",
"flopy version: 3.3.3\n"
]
}
],
@ -731,7 +731,7 @@
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
"version": "3.7.7"
"version": "3.8.6"
}
},
"nbformat": 4,

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -20,9 +20,9 @@
"name": "stdout",
"output_type": "stream",
"text": [
"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"
"3.8.6 | packaged by conda-forge | (default, Oct 7 2020, 18:42:56) \n",
"[Clang 10.0.1 ]\n",
"flopy version: 3.3.3\n"
]
}
],
@ -379,7 +379,7 @@
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
"version": "3.7.7"
"version": "3.8.6"
}
},
"nbformat": 4,

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -260,6 +260,6 @@ in_record true
tagged false
reader urword
optional false
longname number of cell vertices
longname array of vertex numbers
description is an array of integer values containing vertex numbers (in the VERTICES block) used to define the cell. Vertices must be listed in clockwise order.
numeric_index true

View File

@ -197,6 +197,6 @@ in_record true
tagged false
reader urword
optional false
longname number of cell vertices
longname array of vertex numbers
description is an array of integer values containing vertex numbers (in the VERTICES block) used to define the cell. Vertices must be listed in clockwise order. Cells that are connected must share vertices.
numeric_index true

View File

@ -246,6 +246,6 @@ in_record true
tagged false
reader urword
optional false
longname number of cell vertices
longname array of vertex numbers
description is an array of integer values containing vertex numbers (in the VERTICES block) used to define the cell. Vertices must be listed in clockwise order.
numeric_index true

View File

@ -197,6 +197,6 @@ in_record true
tagged false
reader urword
optional false
longname number of cell vertices
longname array of vertex numbers
description is an array of integer values containing vertex numbers (in the VERTICES block) used to define the cell. Vertices must be listed in clockwise order. Cells that are connected must share vertices.
numeric_index true

View File

@ -6,7 +6,7 @@ type keyword
reader urword
optional true
longname correct for flow imbalance
description correct for an imbalance in flows by assuming that any residual flow error comes in or leaves at the concentration of the cell.
description correct for an imbalance in flows by assuming that any residual flow error comes in or leaves at the concentration of the cell. When this option is activated, the GWT Model budget written to the listing file will contain two additional entries: FLOW-ERROR and FLOW-CORRECTION. These two entries will be equal but opposite in sign. The FLOW-CORRECTION term is a mass flow that is added to offset the error caused by an imprecise flow balance. If these terms are not relatively small, the flow model should be rerun with stricter convergence tolerances.
# --------------------- gwt fmi packagedata ---------------------

View File

@ -9,12 +9,12 @@ longname save calculated flows to budget file
description REPLACE save_flows {'{#1}': 'IST'}
block options
name sorbtion
name sorption
type keyword
reader urword
optional true
longname activate sorbtion
description is a text keyword to indicate that sorbtion will be activated. Use of this keyword requires that BULK\_DENSITY and DISTCOEF are specified in the GRIDDATA block.
longname activate sorption
description is a text keyword to indicate that sorption will be activated. Use of this keyword requires that BULK\_DENSITY and DISTCOEF are specified in the GRIDDATA block. The linear sorption isotherm is the only isotherm presently supported in the IST Package.
block options
name first_order_decay
@ -74,7 +74,7 @@ reader urword
tagged false
optional false
longname file keyword
description name of the output file to write immobile concentrations.
description name of the output file to write immobile concentrations. This file is a binary file that has the same format and structure as a binary head and concentration file. The value for the text variable written to the file is CIM. Immobile domain concentrations will be written to this file at the same interval as mobile domain concentrations are saved, as specified in the GWT Model Output Control file.
block options
name cimprintrecord
@ -199,7 +199,7 @@ reader readarray
optional true
layered true
longname second rate coefficient
description is the rate coefficient for first or zero-order decay for the sorbed phase of the immobile domain. A negative value indicates solute production. The dimensions of decay\_sorbed for first-order decay is one over time. The dimensions of decay\_sorbed for zero-order decay is mass of solute per mass of aquifer per time. If decay\_sorbed is not specified and both decay and sorbtion are active, then the sorbed decay rate will be set equal to the aqueous decay rate. decay\_sorbed will have no affect on simulation results unless the SORPTION keyword and either first- or zero-order decay are specified in the options block.
description is the rate coefficient for first or zero-order decay for the sorbed phase of the immobile domain. A negative value indicates solute production. The dimensions of decay\_sorbed for first-order decay is one over time. The dimensions of decay\_sorbed for zero-order decay is mass of solute per mass of aquifer per time. If decay\_sorbed is not specified and both decay and sorbtion are active, then the program will terminate with an error. decay\_sorbed will have no affect on simulation results unless the SORPTION keyword and either first- or zero-order decay are specified in the options block.
block griddata
name bulk_density

View File

@ -25,12 +25,13 @@ longname activate zero-order decay
description is a text keyword to indicate that zero-order decay will occur. Use of this keyword requires that DECAY and DECAY\_SORBED (if sorbtion is active) are specified in the GRIDDATA block.
block options
name sorbtion
type keyword
name sorption
type string
valid linear freundlich langmuir
reader urword
optional true
longname activate sorbtion
description is a text keyword to indicate that sorbtion will be activated. Use of this keyword requires that BULK\_DENSITY and DISTCOEF are specified in the GRIDDATA block.
longname activate sorption
description is a text keyword to indicate that sorption will be activated. Valid sorption options include LINEAR, FREUNDLICH, and LANGMUIR. Use of this keyword requires that BULK\_DENSITY and DISTCOEF are specified in the GRIDDATA block. If sorption is specified as FREUNDLICH or LANGMUIR then SP2 is also required in the GRIDDATA block.
# --------------------- gwt mst griddata ---------------------
@ -61,7 +62,7 @@ reader readarray
optional true
layered true
longname sorbed phase decay rate coefficient
description is the rate coefficient for first or zero-order decay for the sorbed phase of the mobile domain. A negative value indicates solute production. The dimensions of decay\_sorbed for first-order decay is one over time. The dimensions of decay\_sorbed for zero-order decay is mass of solute per mass of aquifer per time. If decay\_sorbed is not specified and both decay and sorbtion are active, then the sorbed decay rate will be set equal to the aqueous decay rate. decay\_sorbed will have no affect on simulation results unless the SORPTION keyword and either first- or zero-order decay are specified in the options block.
description is the rate coefficient for first or zero-order decay for the sorbed phase of the mobile domain. A negative value indicates solute production. The dimensions of decay\_sorbed for first-order decay is one over time. The dimensions of decay\_sorbed for zero-order decay is mass of solute per mass of aquifer per time. If decay\_sorbed is not specified and both decay and sorbtion are active, then the program will terminate with an error. decay\_sorbed will have no affect on simulation results unless the SORPTION keyword and either first- or zero-order decay are specified in the options block.
block griddata
name bulk_density
@ -81,5 +82,15 @@ reader readarray
layered true
optional true
longname distribution coefficient
description is the distribution coefficient for the equilibrium-controlled linear sorption isotherm in dimensions of length cubed per mass. distcoef is not required unless the SORBTION keyword is specified.
description is the distribution coefficient for the equilibrium-controlled linear sorption isotherm in dimensions of length cubed per mass. distcoef is not required unless the SORPTION keyword is specified.
block griddata
name sp2
type double precision
shape (nodes)
reader readarray
layered true
optional true
longname second sorption parameter
description is the exponent for the Freundlich isotherm and the sorption capacity for the Langmuir isotherm.

View File

@ -44,7 +44,7 @@ tagged false
optional false
reader urword
longname source type
description type of the source. Must be AUX.
description keyword indicating how concentration will be assigned for sources and sinks. Keyword must be specified as either AUX or AUXMIXED. For both options the user must provide an auxiliary variable in the corresponding flow package. The auxiliary variable must have the same name as the AUXNAME value that follows. If the AUX keyword is specified, then the auxiliary variable specified by the user will be assigned as the concenration value for groundwater sources (flows with a positive sign). For negative flow rates (sinks), groundwater will be withdrawn from the cell at the simulated concentration of the cell. The AUXMIXED option provides an alternative method for how to determine the concentration of sinks. If the cell concentration is larger than the user-specified auxiliary concentration, then the concentration of groundwater withdrawn from the cell will be assigned as the user-specified concentration. Alternatively, if the user-specified auxiliary concentration is larger than the cell concentration, then groundwater will be withdrawn at the cell concentration. Thus, the AUXMIXED option is designed to work with the Evapotranspiration (EVT) and Recharge (RCH) Packages where water may be withdrawn at a concentration that is less than the cell concentration.
block sources
name auxname
@ -54,5 +54,5 @@ tagged false
reader urword
optional false
longname auxiliary variable name
description name of the auxiliary variable in the package PNAME that contains the source concentration.
description name of the auxiliary variable in the package PNAME. This auxiliary variable must exist and be specified by the user in that package. The values in this auxiliary variable will be used to set the concentration associated with the flows for that boundary package.

View File

@ -284,7 +284,7 @@ reader urword
optional true
deprecated 6.1.1
longname head change tolerance
description real value defining the head change criterion for convergence of the inner (linear) iterations, in units of length. When the maximum absolute value of the head change at all nodes during an iteration is less than or equal to INNER\_HCLOSE, the matrix solver assumes convergence. Commonly, INNER\_HCLOSE is set an order of magnitude less than the OUTER\_HCLOSE value specified for the NONLINEAR block. The INNER\_HCLOSE keyword has been deprecated in favor of the more general INNER\_DVCLOSE (for dependent variable), however either one can be specified in order to maintain backward compatibility.
description real value defining the head change criterion for convergence of the inner (linear) iterations, in units of length. When the maximum absolute value of the head change at all nodes during an iteration is less than or equal to INNER\_HCLOSE, the matrix solver assumes convergence. Commonly, INNER\_HCLOSE is set equal to or an order of magnitude less than the OUTER\_HCLOSE value specified for the NONLINEAR block. The INNER\_HCLOSE keyword has been deprecated in favor of the more general INNER\_DVCLOSE (for dependent variable), however either one can be specified in order to maintain backward compatibility.
block linear
name inner_dvclose
@ -292,7 +292,7 @@ type double precision
reader urword
optional false
longname dependent-variable change tolerance
description real value defining the dependent-variable (for example, head) change criterion for convergence of the inner (linear) iterations, in units of the dependent-variable (for example, length for head). When the maximum absolute value of the dependent-variable change at all nodes during an iteration is less than or equal to INNER\_DVCLOSE, the matrix solver assumes convergence. Commonly, INNER\_DVCLOSE is set an order of magnitude less than the OUTER\_DVCLOSE value specified for the NONLINEAR block. The keyword, INNER\_HCLOSE can be still be specified instead of INNER\_DVCLOSE for backward compatibility with previous versions of MODFLOW 6 but eventually INNER\_HCLOSE will be deprecated and specification of INNER\_HCLOSE will cause MODFLOW 6 to terminate with an error.
description real value defining the dependent-variable (for example, head) change criterion for convergence of the inner (linear) iterations, in units of the dependent-variable (for example, length for head). When the maximum absolute value of the dependent-variable change at all nodes during an iteration is less than or equal to INNER\_DVCLOSE, the matrix solver assumes convergence. Commonly, INNER\_DVCLOSE is set equal to or an order of magnitude less than the OUTER\_DVCLOSE value specified for the NONLINEAR block. The keyword, INNER\_HCLOSE can be still be specified instead of INNER\_DVCLOSE for backward compatibility with previous versions of MODFLOW 6 but eventually INNER\_HCLOSE will be deprecated and specification of INNER\_HCLOSE will cause MODFLOW 6 to terminate with an error.
block linear
name rcloserecord

View File

@ -50,7 +50,7 @@ shape
tagged false
reader urword
longname
description Name of a file to which simulated values corresponding to observations in the block are to be written. The file name can be an absolute or relative path name. A unique output file must be specified for each SINGLE or CONTINUOUS block. If the ``BINARY'' option is used, output is written in binary form. By convention, text output files have the extension ``csv'' (for ``Comma-Separated Values'') and binary output files have the extension ``bsv'' (for ``Binary Simulated Values'').
description Name of a file to which simulated values corresponding to observations in the block are to be written. The file name can be an absolute or relative path name. A unique output file must be specified for each CONTINUOUS block. If the ``BINARY'' option is used, output is written in binary form. By convention, text output files have the extension ``csv'' (for ``Comma-Separated Values'') and binary output files have the extension ``bsv'' (for ``Binary Simulated Values'').
block continuous
name binary

View File

@ -1,5 +1,6 @@
# DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY
# mf6/utils/createpackages.py
# FILE created on February 18, 2021 16:23:05 UTC
from .. import mfpackage
from ..data.mfdatautil import ListTemplateGenerator

View File

@ -1,5 +1,6 @@
# DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY
# mf6/utils/createpackages.py
# FILE created on February 18, 2021 16:23:05 UTC
from .. import mfmodel
from ..data.mfdatautil import ListTemplateGenerator, ArrayTemplateGenerator

View File

@ -1,5 +1,6 @@
# DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY
# mf6/utils/createpackages.py
# FILE created on February 18, 2021 16:23:05 UTC
from .. import mfpackage
from ..data.mfdatautil import ListTemplateGenerator

View File

@ -1,5 +1,6 @@
# DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY
# mf6/utils/createpackages.py
# FILE created on February 18, 2021 16:23:05 UTC
from .. import mfpackage
from ..data.mfdatautil import ListTemplateGenerator

View File

@ -1,5 +1,6 @@
# DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY
# mf6/utils/createpackages.py
# FILE created on February 18, 2021 16:23:05 UTC
from .. import mfpackage
from ..data.mfdatautil import ListTemplateGenerator, ArrayTemplateGenerator

View File

@ -1,5 +1,6 @@
# DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY
# mf6/utils/createpackages.py
# FILE created on February 18, 2021 16:23:05 UTC
from .. import mfpackage
from ..data.mfdatautil import ArrayTemplateGenerator

View File

@ -1,5 +1,6 @@
# DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY
# mf6/utils/createpackages.py
# FILE created on February 18, 2021 16:23:05 UTC
from .. import mfpackage
from ..data.mfdatautil import ArrayTemplateGenerator, ListTemplateGenerator

View File

@ -1,5 +1,6 @@
# DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY
# mf6/utils/createpackages.py
# FILE created on February 18, 2021 16:23:05 UTC
from .. import mfpackage
from ..data.mfdatautil import ArrayTemplateGenerator, ListTemplateGenerator

View File

@ -1,5 +1,6 @@
# DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY
# mf6/utils/createpackages.py
# FILE created on February 18, 2021 16:23:05 UTC
from .. import mfpackage
from ..data.mfdatautil import ListTemplateGenerator

View File

@ -1,5 +1,6 @@
# DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY
# mf6/utils/createpackages.py
# FILE created on February 18, 2021 16:23:05 UTC
from .. import mfpackage
from ..data.mfdatautil import ListTemplateGenerator

View File

@ -1,5 +1,6 @@
# DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY
# mf6/utils/createpackages.py
# FILE created on February 18, 2021 16:23:05 UTC
from .. import mfpackage
from ..data.mfdatautil import ListTemplateGenerator, ArrayTemplateGenerator

View File

@ -1,5 +1,6 @@
# DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY
# mf6/utils/createpackages.py
# FILE created on February 18, 2021 16:23:05 UTC
from .. import mfpackage
from ..data.mfdatautil import ListTemplateGenerator

View File

@ -1,5 +1,6 @@
# DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY
# mf6/utils/createpackages.py
# FILE created on February 18, 2021 16:23:05 UTC
from .. import mfpackage
from ..data.mfdatautil import ListTemplateGenerator

View File

@ -1,5 +1,6 @@
# DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY
# mf6/utils/createpackages.py
# FILE created on February 18, 2021 16:23:05 UTC
from .. import mfpackage
from ..data.mfdatautil import ListTemplateGenerator

View File

@ -1,5 +1,6 @@
# DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY
# mf6/utils/createpackages.py
# FILE created on February 18, 2021 16:23:05 UTC
from .. import mfpackage

View File

@ -1,5 +1,6 @@
# DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY
# mf6/utils/createpackages.py
# FILE created on February 18, 2021 16:23:05 UTC
from .. import mfpackage
from ..data.mfdatautil import ListTemplateGenerator

View File

@ -1,5 +1,6 @@
# DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY
# mf6/utils/createpackages.py
# FILE created on February 18, 2021 16:23:05 UTC
from .. import mfpackage
from ..data.mfdatautil import ArrayTemplateGenerator

View File

@ -1,5 +1,6 @@
# DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY
# mf6/utils/createpackages.py
# FILE created on February 18, 2021 16:23:05 UTC
from .. import mfpackage
from ..data.mfdatautil import ListTemplateGenerator

View File

@ -1,5 +1,6 @@
# DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY
# mf6/utils/createpackages.py
# FILE created on February 18, 2021 16:23:05 UTC
from .. import mfpackage
from ..data.mfdatautil import ListTemplateGenerator

View File

@ -1,5 +1,6 @@
# DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY
# mf6/utils/createpackages.py
# FILE created on February 18, 2021 16:23:05 UTC
from .. import mfpackage
from ..data.mfdatautil import ListTemplateGenerator

View File

@ -1,5 +1,6 @@
# DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY
# mf6/utils/createpackages.py
# FILE created on February 18, 2021 16:23:05 UTC
from .. import mfpackage
from ..data.mfdatautil import ListTemplateGenerator

View File

@ -1,5 +1,6 @@
# DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY
# mf6/utils/createpackages.py
# FILE created on February 18, 2021 16:23:05 UTC
from .. import mfpackage
from ..data.mfdatautil import ListTemplateGenerator, ArrayTemplateGenerator

View File

@ -1,5 +1,6 @@
# DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY
# mf6/utils/createpackages.py
# FILE created on February 18, 2021 16:23:05 UTC
from .. import mfpackage
from ..data.mfdatautil import ListTemplateGenerator

View File

@ -1,5 +1,6 @@
# DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY
# mf6/utils/createpackages.py
# FILE created on February 18, 2021 16:23:05 UTC
from .. import mfpackage
from ..data.mfdatautil import ListTemplateGenerator

View File

@ -1,5 +1,6 @@
# DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY
# mf6/utils/createpackages.py
# FILE created on February 18, 2021 16:23:05 UTC
from .. import mfpackage
from ..data.mfdatautil import ListTemplateGenerator, ArrayTemplateGenerator

View File

@ -1,5 +1,6 @@
# DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY
# mf6/utils/createpackages.py
# FILE created on February 18, 2021 16:23:05 UTC
from .. import mfpackage
from ..data.mfdatautil import ListTemplateGenerator

View File

@ -1,5 +1,6 @@
# DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY
# mf6/utils/createpackages.py
# FILE created on February 18, 2021 16:23:05 UTC
from .. import mfpackage
from ..data.mfdatautil import ListTemplateGenerator

Some files were not shown because too many files have changed in this diff Show More