Repository navigation
fix(usgsprograms): move mp6 and mp7 sources to GitHub - #373
Merged
Merged
Conversation
The water.usgs.gov MODPATH zip URLs now redirect to an HTML page, so downloads fail with BadZipFile. Point mp7 at the MODFLOW-ORG/modpath-v7 7.2.001 tag (source identical to the old zip) and mp6 at the current MODFLOW-ORG/modpath6 commit (no tags yet). The modpath-v7 repo flattens exNN/<model>/original/ into exNN_<model>/, so update the mp7 example paths in the test. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Codecov Report❌ Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## develop #373 +/- ##
=============================================
- Coverage 80.303% 77.337% -2.967%
=============================================
Files 20 20
Lines 3295 3305 +10
=============================================
- Hits 2646 2556 -90
- Misses 649 749 +100
🚀 New features to boost your workflow:
|
modpath6's meson.build lists MP6Flowdata.for and MP6MPBAS1.for by name, but pymake's mp6 source update replaces them with renamed copies, so the provided build fails and the build falls back to a generated one. Remove the provided build files after download so pymake writes its own, as it did for the old USGS archive. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Member
Author
|
CI failures are chicken/egg with #374 |
wpbonelli
added a commit
that referenced
this pull request
Nov 16, 2026
After #373 the ex04 mp7 example fails on linux with Budget file does not exist. The OC file writes mptest006_mf6.bud and mptest006_mf6.hed, but ex04_mf6.mpnam reads ex04_mf6.bud and ex04_mf6.hed. The old USGS zip had outputs named ex04_mf6.*, which hid the mismatch. The GitHub repo doesn't include outputs, so mp7 can't find them. Rename the outputs in the OC file in replace_data, like it already does for the idomain csv. Test-only change, the mp7 build is unchanged. This is already fixed on modpath-v7 develop, just not in a tag yet. When there is a new tag and pymake points at it, the ex04 entries in replace_data can go away. I didn't want to point at the default branch since it's 45 commits ahead of 7.2.001 with source changes.
This file contains hidden or 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
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.
Move mp6 and mp7 source download URLs to the GitHub repos, the USGS URLs no longer work.
The programs' source codes are identical except for one typo fix in mp6:
IF(QTO.GE.0.0)->IF(CD%QSTO.GE.0.0)inGETCELLBUDGET, this only affects the cell water-balance diagnostics in the listing file, not particle tracking. The source patches applied by pymake still apply. It becomes necessary to delete mp6'smeson.buildfile to keep this working. Temporary.The mp7 repo flattens
examples/exNN/<model>/original/intoexamples/exNN_<model>/and drops the pre-generated outputs, so updatetest_mp7.pywith the new paths and detect the model type from the directory suffix.