Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Release 3.3.0 #762

Merged
merged 106 commits into from
Dec 14, 2019
Merged

Release 3.3.0 #762

merged 106 commits into from
Dec 14, 2019

Conversation

jdhughes-usgs
Copy link
Contributor

No description provided.

jdhughes-usgs and others added 30 commits June 1, 2019 09:57
* Fix(plotting): Bug fixes for issues #587 and #588

* updates to PlotMapView.contour_array() and _VertexCrossSection.contour_array() to allow nan to be passed in the array
* added test_tricountour_NaN() to t007_test.py
* updates to PlotMapView.contour_array() and plot_array() to drop extra dimension from head array with using vertex model grid #588
* updates to UnstructuredPlotUtilities, added irregular_shape_patch() as patch for cross section drawing of vertex and unstructured modelgrids that include multiple geometries (found during fix #588)
* update to geometry.transform() to set x and y dtypes to float (found during fix #588)

* Added updated t007_test.py

* Update test_tricontour_NaN()

* Codacy updates for PR

* Updated drop axis routine to squeeze axis 1 for vertex grids
* suppressing error when proj4_str is None

* fixed long line to molify Codacy
* docs(ModflowHob): Explicitly state that variables irefsp, layer, row, and column are zero-based integers. Minor formatting changes-->uniform capitalization and alignment with parallel variables in the ModflowFlwob docstring.

* refactor(ModflowFlowb): Treat variables irefsp, layer, row, and column as zero-based integers to align behavior with ModflowHob. Updated write_file method and docstring accordingly.

* refactor(codacy): Refactor docstrings to break up long lines.

* refactor(t041_test): Update test041 to specify irefsp, layer, row, and column as zero-based indices.
* Required changes to flopy.utils.geometry so that the Polygon.pyshp_prts handled holes correctly for multiple shapefile versions

* codacy fixes
* feat(ModflowFlwob): Add various flow-obs types to model.mfnam_packages dictionary.

* feat(ModflowFlwob): Add method to load package from file.

* feat(ModflowFlwob): Use supplied unit number when loading package to avoid unit collisions.

* feat(ModflowFlwob): Add additional width and precision for toffset to avoid string-conversions that result in numbers greater than total simulation time.

* feat(ModflowFlwob): Account for case where nqclfb is negative.

* feat(ModflowFlwob): Append filename using relative path with respect to the model working directory to ensure the correct filename is written to the namefile.

* feat(ModflowFlwob): Add new autotest to check loading functionality.

* revert: "feat(ModflowFlwob): Append filename using relative path with respect to the model working directory to ensure the correct filename is written to the namefile."

This reverts commit 6f52006.

* feat(ModflowFlwob): Add 1 to zero-based "irefsp" when writing file.

* feat(ModflowFlwob): Try to make Codacy happy.

* feat(ModflowFlwob): Add "ftype" attribute and retrieval method.

* feat(ModflowFlwob): Use ext_unit_dict to get proper flowtype and ftype from filename.

* feat(ModflowFlwob): Remove unused variable and extra whitespace.

* feat(ModflowFlwob): Catch dict items explicitly even if they are unused.

* Revert "feat(ModflowFlwob): Try to make Codacy happy."

This reverts commit eca305a.
Instantiation of UZT class was generating IUZBND as a 3D array, should be 2D
…ance (#602) (#604)

* test(t064_test_performance.py): to prevent regressions in flopy.modflow performance
…dows (#623)

* fix(autotest): move some output files to their own folder

* fix(run_model): improve normal_msg and fix Python 2.7 memory issue
* fix(reference): fix UnboundLocalError error, deprecate crs class

* fix(shapefile_utils.CRS): fix typo and UnboundLocalError error
* fix(ja array): CellID now increments and decrements correctly.

* feat(jagged arrays): format disu arrays (ja, cl12) as jagged arrays in output files

* fix(disu arrays): Added more testing for disu arrays

* Fix(flopy write): Copy external files before writing out package files. Package file writing can require access to external files.

* fix(np types): Changed code from using np.int to explicitly defining integer type np.int32.

* fix(#616): Shapefile export code fix

* fix(#614): Wel package added to multi-package list. Fix to always get multiple packages when searching by package type.

* fix(different int types): Different systems appear to use different types of ints. Int type check changed to be more generic.

* refact(CR/LF): Removed CR line endings
* add gridintersect to flopy utils

* add gridintersect tests

* make codacy happy

* attempt 2 making codacy happy

* add keepzerolengths option to strtree method

* add gridintersection demo notebook

* update travis to install shapely
minor edit in gridintersect

* fix py27 error

* make codacy happy again

* last codacy fix
* fix(travis 2.7): Memory is not getting released from the plotting tests when run on python 2.7. Two of the more memory intensive plotting tests have been disabled as a work around for the out of memory errors intermittently appearing on Travis. 

Unsuccessfully tried to get the memory released by calling matplotlib's plt.close('all') and then gc.collect() at the end of each plotting test. Since support for python 2.7 is going to be discontinued soon, it may be sufficient just to use this work around.
* feat(deepcopy support): Flopy for MF6 MFSimulation object can now be copied with deepcopy.

* feat(rename all packages): rename_all_packages method added to the mf6 model and simulation classes to allow the user to rename all of the packages at once.

* refact(dfn sync): sync dfn with MODFLOW6 repository
… and allow ncpl to be specified as a list (#631)

* Fix(UnstructuredGrid): fix for ncpl provided as a list or numpy array

* Fix(plot_array): fix for CVFD masked_values when plotting arrays
* Read WEL Reductions from List File

Adds a method to the ListBudget class to read in data from the list file on automatic reductions to WEL extractions. This method supports both NWT and USG list files. Adds auto tests for both success and failure. I couldn't find any included data sets with reductions written to the LST, so I updated a USG data set to allow for the auto test.

* Removed Trailing Whitespace

Removed trailing whitespace id'd by codacy.

* Updated to work with python 2.7

Updated code to run with python 2.7.  Used autopep8 to formalize some formatting.
…flopy.utils (#634)

* Feat(rasters.py): Added raster intersection capability and an example notebook (Notebooks/flopy3_raster_intersection.ipynb)

* Update requirements for travis to include SciPy for raster unit tests

* Removed Scipy from python27 requirements

* Update flopy3_raster_intersection.ipynb for running on travis

* Update flopy3_raster_intersection.ipynb for travis

* revert flopy3_lake_example.ipynb

* update(rasters.py): codacy updates

* update(rasters.py): codacy fixes

* update(rasters.py): _point_in_polygon changed to static method
jdhughes-usgs and others added 24 commits November 18, 2019 08:38
* With MfList, check 'len(recs) == 0' instead of 'recs is 0'
Also contains fix for inconsistent `wellid` cases in dataset 2a and 4a
Resolves issue where mnw2 itmp list didn't include zeros for when a stress period had no discharge assigned. The "continue" advanced to next iteration, missing the line where zero would be added to the list. This was causing issues when writing the mnw2 file.
…l relative path (#740) (#745)

* fix(#740): Modified code to insure model gets registered before model relative path is set.

* fix(#740)
* Update(#741): Remove redundancy from plotting Notebooks

* Removed flopy3_MapExample.ipynb, flopy3_PlotCrossSection_demo.ipynb, flopy3_PlotMapView_demo.ipynb, flopy3_mf6_BasicPlotting.ipynb, flopy3_mf6_plotting_freyberg.ipynb, flopy3_mf6_vertex_plotting.ipynb, flopy3_UnstructuredGridPlotting.ipynb

* Added flopy3.3_PlotCrossSection.ipynb, flopy3.3_PlotMapView.ipynb

* Fixed VertexGrid errors in PlotMapView and PlotCrossSection

* Fix(moflowpy#753): mask no flow and dry cells in PlotUtilities._plot_array_helper for MODFLOW 6 output

*update mfmodel.py hdry and hnoflo to default values

* Cast integer arrays as floating point arrays in PlotUtilities._plot_array_helper
* fix(boundnames): Fixed problem where boundnames did not get loaded for simple fast loads. Added test to catch problems similar to this in the future.

* fix(line length)
…0) releases (#759)

* fix(dfns): update MODFLOW 6 dfns for next release

* fix(dfns): update createpackages.py based on @spaulins-usgs suggestion

* Address @spaulins-usgs mf6 release comments
#760)

* refactor(release): update make-release script to generate author names

* refactor(release): clean-up make-release script and markdown
* ci(exes): update executables version to 3.0

* testing(t503): update mf6 version downloaded and tested
@coveralls
Copy link

coveralls commented Dec 14, 2019

Coverage Status

Coverage increased (+0.2%) to 57.137% when pulling 7ca36fd on jdhughes-usgs:release-3.3.0 into 2a92634 on modflowpy:master.

@coveralls
Copy link

Coverage Status

Coverage decreased (-13.8%) to 43.184% when pulling 000dfd8 on jdhughes-usgs:release-3.3.0 into 2a92634 on modflowpy:master.

@jdhughes-usgs jdhughes-usgs merged commit 184e716 into modflowpy:master Dec 14, 2019
@jdhughes-usgs jdhughes-usgs deleted the release-3.3.0 branch December 14, 2019 16:30
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.