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

refactor(prp): factor out routine for particle release #1907

Merged
merged 2 commits into from
Jun 27, 2024

Conversation

wpbonelli
Copy link
Contributor

@wpbonelli wpbonelli commented Jun 27, 2024

Some cleanup in the particle release package. More consistent variable names. Factor out routines to calculate release time and release the particle. Also, add a value 0 -> "default" for the DEV_EXIT_SOLVE_METHOD option, and defer the selection of a default root-finding algorithm to the ternary method rather than the PRP package.


Checklist of items for pull request

  • Formatted new and modified Fortran source files with fprettify
  • Added doxygen comments to new and modified procedures
  • Removed checklist items not relevant to this pull request

@wpbonelli wpbonelli added the code refactor Nonfunctional changes label Jun 27, 2024
@wpbonelli wpbonelli marked this pull request as ready for review June 27, 2024 16:21
@wpbonelli wpbonelli merged commit 12dea73 into MODFLOW-USGS:develop Jun 27, 2024
20 checks passed
@wpbonelli wpbonelli deleted the prt-prp branch June 27, 2024 16:29
wpbonelli added a commit that referenced this pull request Jul 3, 2024
#1907 erroneously converted a cycle condition to an error — this was left over from a more involved refactor which that PR was extracted from, and should not have been included yet. This has caused one of the PRT example models to fail, which has not shown up on this repository's CI because PRT notebook tests were getting skipped due to missing dependencies. This is behind the currently failing FloPy MF6 CI.

This PR drops test_prt_notebooks.py in favor of just running the mf6 examples repo's own tests in CI. This is done only on Linux to avoid slowing things down too much, it should not add to total runtime if the runner pool is unsaturated because the modified jobs are still faster than the parallel test jobs.

A few dependencies needed by the examples are added to the pixi and conda environments:

* pooch
* rasterio
* rasterstats

A subsequent PR will include more extensive cleanup of the release mechanism.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
code refactor Nonfunctional changes
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

1 participant