Skip to content
New issue

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

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

Already on GitHub? Sign in to your account

Post release 3.5.0 reset #2018

Merged
merged 32 commits into from
Nov 26, 2023
Merged

Post release 3.5.0 reset #2018

merged 32 commits into from
Nov 26, 2023

Conversation

wpbonelli
Copy link
Member

Update the develop branch from master following release of 3.5.0. As mentioned in #2016, this is not as clean is it should usually be, since master was not merged back into develop following 3.4.2 and 3.4.3.

wpbonelli and others added 30 commits August 25, 2023 18:11
* use ndarray.item() to retrieve single elements
* update gridutil get_disu_kwargs() docstrings
* modify pip upgrade in rtd workflow

Replaces PR #1848 (Close #1848)
…kage (#1867) (#1873)

Co-authored-by: scottrp <45947939+scottrp@users.noreply.github.com>
…#1882)

* fix(check): check now works properly with confined conditions (#1880)

* github workflows undo

---------

Co-authored-by: scottrp <45947939+scottrp@users.noreply.github.com>
* fix character span reading tkstp with a regex match
* skip particle information reading GW-Mass Budget

Co-authored-by: Ralf Junghanns <ralf@junghanns.it>
* fix(test): should be a complete grid
* fix(model grid): Always resync mf2005 grids
* Revert "fix(model grid): Always resync mf2005 grids"
* fix(grid idomain): grid idomain now defaults to all 1's for MF6 only
* fix(notebook): notebook contained out of bounds cellid
* fix(modelgrid): always force modelgrid to resync until an idomain array is provided

---------

Co-authored-by: scottrp <45947939+scottrp@users.noreply.github.com>
* warn at init/load time if exe not found, raise error at model run time
Flopy allows some keywords to be excluded from recarrays, like "FILEIN".  This fix makes sure that optional keywords, like "MIXED" are not excluded from recarrays.  Since they are optional their presence adds information to the recarray and they therefore can not be excluded.

Co-authored-by: scottrp <45947939+scottrp@users.noreply.github.com>
* ContourSet.get_paths() returns one path per level
* path may contain multiple disconnected components
* walk contour components to determine connectivity
* fix(usg bcf) ksat util3d call --> util2d call

Signed-off-by: Chris Nicol <chris.nicol@groundwaterlogic.com>

* doc(modflow/sfr2) add sfr2 channel_geometry_data to docstring

Signed-off-by: Chris Nicol <chris.nicol@groundwaterlogic.com>

---------

Signed-off-by: Chris Nicol <chris.nicol@groundwaterlogic.com>
* consistent with MFSimulation verbosity defaults
* use category=UserWarning for mbase.py warnings
* closes #1817
* reproduce and fix provided 2D model
* stub simpler parametrized 2D tests
* add freyberg mf6/mf2005 comparison
* move get_face into get_structured_faceflows
* remove og repro (covered by parametrized test)
* previously omitted totim=0 if compact
* add mf6 test case courtesy of mbakker
* test mf2005 with compact/non-compact
Copy link

codecov bot commented Nov 26, 2023

Codecov Report

Merging #2018 (c30b3f2) into develop (fd40456) will increase coverage by 0.5%.
Report is 100 commits behind head on develop.
The diff coverage is 74.0%.

Additional details and impacted files
@@            Coverage Diff            @@
##           develop   #2018     +/-   ##
=========================================
+ Coverage     72.2%   72.8%   +0.5%     
=========================================
  Files          256     259      +3     
  Lines        56112   59040   +2928     
=========================================
+ Hits         40564   43004   +2440     
- Misses       15548   16036    +488     
Files Coverage Δ
flopy/discretization/unstructuredgrid.py 85.4% <ø> (+0.7%) ⬆️
flopy/export/metadata.py 23.3% <100.0%> (+0.8%) ⬆️
flopy/export/vtk.py 79.8% <ø> (+9.5%) ⬆️
flopy/mf6/data/mfdata.py 75.8% <100.0%> (+0.1%) ⬆️
flopy/mf6/data/mfdataarray.py 60.9% <ø> (+<0.1%) ⬆️
flopy/mf6/data/mfdatalist.py 64.4% <ø> (-7.9%) ⬇️
flopy/mf6/data/mfdataplist.py 76.2% <ø> (ø)
flopy/mf6/data/mfdatascalar.py 60.5% <ø> (+<0.1%) ⬆️
flopy/mf6/data/mfdatastorage.py 69.8% <ø> (-1.5%) ⬇️
flopy/mf6/data/mfdatautil.py 57.7% <ø> (+3.4%) ⬆️
... and 115 more

... and 34 files with indirect coverage changes

@wpbonelli wpbonelli merged commit 39ab2cb into develop Nov 26, 2023
47 checks passed
@wpbonelli wpbonelli deleted the post-release-3.5.0-reset branch November 26, 2023 01:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

9 participants