Skip to content

feat(spec): add command to show DFN specification #2782

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

Draft
wpbonelli wants to merge 7 commits into
base: develop
Choose a base branch
from
Draft

feat(spec): add command to show DFN specification #2782

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
ff69a66
feat(cli): add command to show dfn spec
wpbonelli Apr 18, 2026
ccdb3ff
dfns -> toml
wpbonelli Apr 20, 2026
2b110b5
upgrade devtools
wpbonelli Apr 20, 2026
9fa30d2
build target, not versioned file
wpbonelli Apr 20, 2026
f0608fe
stub, various
wpbonelli Apr 20, 2026
d93e4e2
sync models in ci
wpbonelli Apr 21, 2026
bfdb7cb
update pixi version in ci
wpbonelli Jun 6, 2026
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
36 changes: 27 additions & 9 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ jobs:
- name: Setup pixi
uses: prefix-dev/setup-pixi@v0.9.6
with:
pixi-version: v0.41.4
pixi-version: v0.70.1

- name: Check Fortran source formatting
run: pixi run check-format
Expand Down Expand Up @@ -98,7 +98,7 @@ jobs:
- name: Setup pixi
uses: prefix-dev/setup-pixi@v0.9.6
with:
pixi-version: v0.41.4
pixi-version: v0.70.1

- name: Setup MF6
run: pixi run setup -Dwerror=true builddir
Expand Down Expand Up @@ -138,7 +138,7 @@ jobs:
- name: Setup pixi
uses: prefix-dev/setup-pixi@v0.9.6
with:
pixi-version: v0.41.4
pixi-version: v0.70.1

- name: Update netcdf-fortran.pc and test-drive
run: |
Expand Down Expand Up @@ -184,7 +184,7 @@ jobs:
- name: Setup pixi
uses: prefix-dev/setup-pixi@v0.9.6
with:
pixi-version: v0.41.4
pixi-version: v0.70.1

- name: Setup static MF6
run: pixi run setup -Dwerror=true -Ddefault_library=static builddir
Expand Down Expand Up @@ -261,7 +261,7 @@ jobs:
- name: Setup pixi
uses: prefix-dev/setup-pixi@v0.9.6
with:
pixi-version: v0.41.4
pixi-version: v0.70.1
manifest-path: "modflow6/pixi.toml"

- name: Custom pixi install
Expand Down Expand Up @@ -295,6 +295,12 @@ jobs:
GITHUB_TOKEN: ${{ github.token }}
run: pixi run get-exes

- name: Sync models
working-directory: modflow6
env:
GITHUB_TOKEN: ${{ github.token }}
run: pixi run mf models sync

- name: Test MF6
working-directory: modflow6
run: |
Expand Down Expand Up @@ -384,7 +390,7 @@ jobs:
- name: Setup pixi
uses: prefix-dev/setup-pixi@v0.9.6
with:
pixi-version: v0.41.4
pixi-version: v0.70.1
manifest-path: "modflow6/pixi.toml"

- name: Custom pixi install
Expand Down Expand Up @@ -488,11 +494,17 @@ jobs:
run: pixi run update-flopy

- name: Get executables
working-directory: modflow6/autotest
working-directory: modflow6
env:
GITHUB_TOKEN: ${{ github.token }}
run: pixi run get-exes

- name: Sync models
working-directory: modflow6
env:
GITHUB_TOKEN: ${{ github.token }}
run: pixi run mf models sync

- name: Set markers
id: set_markers
run: |
Expand Down Expand Up @@ -637,7 +649,7 @@ jobs:
- name: Setup pixi
uses: prefix-dev/setup-pixi@v0.9.6
with:
pixi-version: v0.41.4
pixi-version: v0.70.1
manifest-path: "modflow6/pixi.toml"

- name: Custom pixi install
Expand Down Expand Up @@ -681,6 +693,12 @@ jobs:
GITHUB_TOKEN: ${{ github.token }}
run: pixi run get-exes

- name: Sync models
working-directory: modflow6
env:
GITHUB_TOKEN: ${{ github.token }}
run: pixi run mf models sync

- name: Set markers
id: set_markers
run: |
Expand Down Expand Up @@ -780,7 +798,7 @@ jobs:
- name: Setup pixi
uses: prefix-dev/setup-pixi@v0.9.6
with:
pixi-version: v0.41.4
pixi-version: v0.70.1
manifest-path: "modflow6/pixi.toml"

- name: Custom pixi install
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/compilers.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ jobs:
- name: Setup pixi
uses: prefix-dev/setup-pixi@v0.9.6
with:
pixi-version: v0.41.4
pixi-version: v0.70.1
manifest-path: "modflow6/pixi.toml"

- name: Custom pixi install
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/docs.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:

- uses: prefix-dev/setup-pixi@v0.9.6
with:
pixi-version: v0.41.4
pixi-version: v0.70.1

- name: Check spelling
run: pixi run check-spelling
Expand Down Expand Up @@ -65,7 +65,7 @@ jobs:
- name: Setup pixi
uses: prefix-dev/setup-pixi@v0.9.6
with:
pixi-version: v0.41.4
pixi-version: v0.70.1
manifest-path: "modflow6/pixi.toml"

- name: Custom pixi install
Expand Down Expand Up @@ -231,7 +231,7 @@ jobs:
- name: Setup pixi
uses: prefix-dev/setup-pixi@v0.9.6
with:
pixi-version: v0.41.4
pixi-version: v0.70.1

- name: Custom pixi install
run: pixi run install
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/large.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ jobs:
- name: Setup pixi
uses: prefix-dev/setup-pixi@v0.9.6
with:
pixi-version: v0.41.4
pixi-version: v0.70.1
manifest-path: "modflow6/pixi.toml"

- name: Custom pixi install
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pixi_auto_update.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
- uses: actions/checkout@v6
- uses: prefix-dev/setup-pixi@v0.9.6
with:
pixi-version: v0.41.4
pixi-version: v0.70.1
cache: false

- name: Update pixi lock file
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ jobs:
- name: Setup pixi
uses: prefix-dev/setup-pixi@v0.9.6
with:
pixi-version: v0.41.4
pixi-version: v0.70.1
manifest-path: "modflow6/pixi.toml"

- name: Custom pixi install
Expand Down Expand Up @@ -475,7 +475,7 @@ jobs:
- name: Setup pixi
uses: prefix-dev/setup-pixi@v0.9.6
with:
pixi-version: v0.41.4
pixi-version: v0.70.1
manifest-path: "modflow6/pixi.toml"

- name: Custom pixi install
Expand Down Expand Up @@ -639,7 +639,7 @@ jobs:
- name: Setup pixi
uses: prefix-dev/setup-pixi@v0.9.6
with:
pixi-version: v0.41.4
pixi-version: v0.70.1
manifest-path: "modflow6/pixi.toml"

- name: Custom pixi install
Expand Down
2 changes: 1 addition & 1 deletion environment.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ dependencies:
- numpy
- pip
- pip:
- modflow-devtools[test,dfn,models]>=1.7.0,!=1.9.0,<2
- modflow-devtools[test,dfn,models]>=1.9.2,<2
- git+https://github.com/modflowpy/flopy.git
- git+https://github.com/modflowpy/pymake.git
- git+https://github.com/Deltares/xmipy.git
Expand Down
1 change: 1 addition & 0 deletions meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -329,5 +329,6 @@ else
test('Version command line test', mf6exe, args : ['-v',])
test('Compiler command line test', mf6exe, args : ['-c',])
test('Test installation help', mf6exe, args : ['-h',])
test('Spec command line test', mf6exe, args : ['--spec'])
test('Serial simulation test', mf6exe, workdir : testdir)
endif
1 change: 1 addition & 0 deletions msvs/mf6core.vfproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -865,6 +865,7 @@
<File RelativePath="..\src\Utilities\BudgetTerm.f90"/>
<File RelativePath="..\src\Utilities\CharString.f90"/>
<File RelativePath="..\src\Utilities\comarg.f90"/>
<File RelativePath="..\src\Utilities\DfnSpec.f90"/>
<File RelativePath="..\src\Utilities\compilerversion.F90">
<FileConfiguration Name="Debug|Win32">
<Tool Name="VFFortranCompilerTool" Preprocess="preprocessYes"/>
Expand Down
Loading
Loading