Merge develop into master for the mf6.6.0 release #239
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
These files are generated when we build the RTD site or PDF document so I think we can remove them from versioning. This also removes the need to keep them in sync with the example collection.
example(gwe-vsc): the first vsc example
example(gwe-ates): aquifer thermal energy storage example (redo)
…ock (#212) updating calls to `flopy.mf6.ModflowGweest()` to reflect the recent changes to the input structure of the Energy Storage and Transfer (EST) package. See #1882 on the main MODFLOW 6 repo (MODFLOW-USGS/modflow6#1882)
This is necessary as of MODFLOW-USGS/modflow6#1888.
This restores the backwards particle tracking examples removed in 2070cf1 and e2602d7, anticipating that the head/budget reversal issue can be resolved by one of * excluding these from the examples script distributed with the next release, or * supporting backward tracking natively via flow model interface (only postprocessing mode) * developing a standalone utility to reverse head/budget files without Python/FloPy Also suppress some output ("Working on radius level N") in the radial GWE example.
Drop an updated action (ame-yu/action-delete-latest-release) and use gh CLI instead. This should fix the release tagging, which is broken — the 'current' tag points to a commit from long ago. At some point, maybe worth considering tagging examples releases to match MF6 release versions? Users have reported some difficulty discovering which mf6/examples/flopy versions are compatible. Also: * Add workflow dispatch triggers for manual testing and to allow rebuilding the RTD site manually. * Make release asset names consistent (mf6examples.zip/.pdf), which required a corresponding update in mf6: MODFLOW-USGS/modflow6#1920. * Factor out some environment variables in ex-workflow.yml and other miscellaneous cleanup.
Like modflowpy/flopy#2257, allow selecting refs for this repository and the modflow6 repo
) Can confirm the behavior that @rbwinst-usgs was reporting; namely that the percent discrepancy was reduced from 0.13 to 0.0 by specifying the closure criterion.
add Toth problem as a new GWF example
… in GRIDDATA block
fix(ex-gwe-*): update est package input after updating variable names in GRIDDATA block
…al solution (and therefore removed the analytical solution entirely)
example(gwe-barends): "thermal bleeding" (conduction) example based on Barends solution
fix(ist-sorption): need to specify linear now for ist sorption
Co-authored-by: langevin-usgs <[email protected]>
Applies ruff check section-underline-matches-section-length (D409), which impacts two Python source files. Also re-configures ruff's configuration to remove "include" to apply the checks globally. It also removes the extend-include since the default value for include already has "*.ipynb". A default line-length = 88 is also re-iterated at the top of the configuration.
) - Add a configuration and "ignore" list of words for [codespell](https://github.com/codespell-project/codespell) - Run codespell interactively to correct typos throughout the codebase - Add a CI check to prevent new typos from entering repo
Refactor some multi-line statements. This was mostly automated by temporarily toggling skip-magic-trailing-comma = true in ruff.toml, then selecting some commits that condense multi-line statements to single, while rejecting other statements that are better represented over multiple lines. There was no exact rule-of-thumb for the process, except to try and maintain the same style in surrounding code blocks. Note that while there are fewer lines, there are no functional changes.
This refactor applies pyupgrade (UP) and Ruff-specific rules (RUF) to the Python code base. A few manual edits are done on top of automated fixes to apply flake8-implicit-str-concat (ISC).
This PR should fix a numpy selection issue that was causing this model to fail with some operating systems
fix(synthetic-valley): numpy selection behavior is inconsistent
Some of the example scripts have begun to break with matplotlib 3.10. Most of the failures are due to the removal of the collections attribute from ContourSet and related API changes. We will need to rewrite some things to work around this. For reference see the corresponding change from a while ago in flopy.
Two failures however seem to be internal to matplotlib, with pillow being used incorrectly:
Traceback (most recent call last):
File "/opt/hostedtoolcache/Python/3.10.15/x64/lib/python3.10/site-packages/matplotlib/animation.py", line 224, in saving
yield self
File "/opt/hostedtoolcache/Python/3.10.15/x64/lib/python3.10/site-packages/matplotlib/animation.py", line 1126, in save
writer.grab_frame(**savefig_kwargs)
File "/opt/hostedtoolcache/Python/3.10.15/x64/lib/python3.10/site-packages/matplotlib/animation.py", line 499, in grab_frame
self._frame.append(im)
AttributeError: 'PillowWriter' object has no attribute '_frame'. Did you mean: '_frames'?
While we address the former and wait for a resolution for the latter, we can just pin mpl.
wpbonelli
approved these changes
Dec 17, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.