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.

Sign up for GitHub

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

feat(PRT): add scripts/notebooks for PRT examples #111

Closed
wants to merge 10 commits into from
Closed

feat(PRT): add scripts/notebooks for PRT examples #111

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
965ebe3
feat(PRT): add scripts/notebooks for PRT examples
wpbonelli Aug 7, 2023
dbf2f74
draft p03 (debugging still necessary)
wpbonelli Sep 16, 2023
92df1ac
add pyvista to requirements.pip.txt
wpbonelli Sep 16, 2023
173aba6
fix lrcregions usage
wpbonelli Oct 4, 2023
a79159a
fix requirements.usgs.txt and ex-workflow.yml
wpbonelli Oct 4, 2023
4fe7e86
use config in p03
wpbonelli Oct 4, 2023
79b526b
fix LRCParticleData usages
wpbonelli Oct 4, 2023
1af7db5
fix p03 imports
wpbonelli Oct 4, 2023
8362799
temp disable p03
wpbonelli Oct 4, 2023
d2eb07c
restore flopy dependency
wpbonelli Dec 22, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .doc/test_build.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
is_CI = "CI" in os.environ or os.environ.get("READTHEDOCS") == "True"

# -- update flopy classes ----------------------------------------------------
flopy.mf6.utils.generate_classes(branch="develop", backup=False)
flopy.mf6.utils.generate_classes(owner="aprovost-usgs", branch="PRT", backup=False)

# -- update notebooks and tables ---------------------------------------------
pth = os.path.join("..", "scripts")
Expand Down
9 changes: 5 additions & 4 deletions .github/workflows/ex-rtd.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:
- 'README.md'
- 'DEVELOPER.md'
pull_request:
branches:
branches:
- master
- develop
paths-ignore:
Expand Down Expand Up @@ -67,16 +67,17 @@ jobs:
- name: Update flopy MODFLOW 6 classes
run: |
import flopy
flopy.mf6.utils.generate_classes(branch="develop", backup=False)
flopy.mf6.utils.generate_classes(owner="aprovost-usgs", ref="PRT", backup=False)
shell: python

- name: Install MODFLOW executables release
uses: modflowpy/install-modflow-action@v1

- name: Install MODFLOW nightly-build executables
- name: Install MODFLOW 6 PRT build
uses: modflowpy/install-modflow-action@v1
with:
repo: modflow6-nightly-build
owner: aprovost-usgs
repo: modflow6

- name: Run scripts without model runs
run: pytest -v -n=auto --durations=0 ci_build_files.py
Expand Down
21 changes: 11 additions & 10 deletions .github/workflows/ex-workflow.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,10 @@ on:
- 'README.md'
- 'DEVELOPER.md'
pull_request:
branches:
branches:
- master
- develop
- PRT
paths-ignore:
- 'README.md'
- 'DEVELOPER.md'
Expand Down Expand Up @@ -51,7 +52,7 @@ jobs:
- name: Update flopy MODFLOW 6 classes
run: |
import flopy
flopy.mf6.utils.generate_classes(branch="develop", backup=False)
flopy.mf6.utils.generate_classes(owner="aprovost-usgs", ref="PRT", backup=False)
shell: python

- name: Install MODFLOW executables release
Expand All @@ -60,7 +61,8 @@ jobs:
- name: Install MODFLOW nightly-build executables
uses: modflowpy/install-modflow-action@v1
with:
repo: modflow6-nightly-build
owner: aprovost-usgs
repo: modflow6

- name: Run scripts without model runs
run: |
Expand Down Expand Up @@ -128,26 +130,25 @@ jobs:
- name: Update flopy MODFLOW 6 classes
run: |
import flopy
flopy.mf6.utils.generate_classes(branch="develop", backup=False)
flopy.mf6.utils.generate_classes(owner="aprovost-usgs", ref="PRT", backup=False)
shell: python

- name: Install MODFLOW executables release
uses: modflowpy/install-modflow-action@v1

- name: Install MODFLOW nightly-build executables
- name: Install MODFLOW 6 PRT build
uses: modflowpy/install-modflow-action@v1
with:
repo: modflow6-nightly-build
owner: aprovost-usgs
repo: modflow6

- name: Run scripts
run: |
pytest -v -n=auto --durations=0 --run=True ci_build_files.py
run: pytest -v -n=auto --durations=0 --run=True ci_build_files.py
working-directory: ${{env.etc-directory}}

- name: Run processing script
if: matrix.python == '3.9'
run: |
python process-scripts.py
run: python process-scripts.py
working-directory: ${{env.script-directory}}

- name: Build mf6examples LaTeX document
Expand Down
1 change: 1 addition & 0 deletions etc/requirements.pip.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,3 +20,4 @@ rasterstats
jupyter
jupytext
modflow-devtools
pyvista
4 changes: 2 additions & 2 deletions etc/requirements.usgs.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
git+https://github.com/modflowpy/flopy.git@develop
git+https://github.com/MODFLOW-USGS/modflowapi.git@develop
https://github.com/modflowpy/flopy/archive/develop.zip
https://github.com/MODFLOW-USGS/modflowapi/archive/develop.zip
Loading