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

update master to v6.4.0 #1092

Merged
merged 103 commits into from
Dec 1, 2022
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
103 commits
Select commit Hold shift + click to select a range
ec46d6d
ci(release): reinitialize develop for next release
langevin-usgs Mar 4, 2022
5be3f36
docs(releasenotes): reinitialize release notes for next release (#922)
langevin-usgs Mar 11, 2022
99ad83b
feat(maw-mfrcsv): add option to write MAW flow reduction to csv (#925)
kzeiler Mar 29, 2022
39a3a4f
fix(openfile): report file that could not be opened (#932)
jdhughes-usgs Apr 15, 2022
38e0229
fix(flopy interface change): updated dfn files and test cases to work…
spaulins-usgs Apr 19, 2022
18053d8
fix(GwfGwtExchange): update indexing variable when MVR is active (#934)
emorway-usgs Apr 28, 2022
706739c
ci(compiler): specify FC env var in CI (#921)
Hofer-Julian May 1, 2022
b514b81
fix(xt3d): array access error for highly refined nested gwf or gwt mo…
langevin-usgs May 5, 2022
2df8d6e
refactor(GwfMvr): store mover variables in memory manager (#940)
langevin-usgs May 9, 2022
a185d95
fix(evt): check to ensure pxdp is specified correctly (#941)
langevin-usgs May 11, 2022
13f8a7c
Improve vscode meson integration (#945)
Hofer-Julian May 27, 2022
e5fbedc
refactor(gwt): Create generalized transport base class for gwe (#942)
emorway-usgs May 27, 2022
25fdab7
Add issue templates
jdhughes-usgs Jun 3, 2022
ceb6a1f
fix(api): fix memory path case for IMSLINEAR (#952)
jdhughes-usgs Jun 3, 2022
13d6334
refactor(CSUB): refactor CSUB to make tridiagonal solve generic subro…
jdhughes-usgs Jun 14, 2022
41e98a2
style: apply fprettify formatting (#956)
jdhughes-usgs Jun 15, 2022
058d490
ci(disu): add disu transport test (#958)
langevin-usgs Jun 17, 2022
c033fc8
style(exchanges): apply fprettify formatting (#957)
mjreno Jun 21, 2022
29fc39d
(fix) small mf6core style issues (#949)
Hofer-Julian Jun 21, 2022
571dcfd
style(connections): apply fprettify formatting (#960)
mjreno Jun 22, 2022
cc444d0
style(geometry): apply fprettify formatting (#961)
mjreno Jun 23, 2022
7980e16
feat(api): add get_version routine to modflow api (xmi) (#936)
mjr-deltares Jun 28, 2022
1fb6cf7
docs(developer): require Python3.8 per xmipy dependency (#964)
wpbonelli Jun 28, 2022
be0b672
style: convert python scripts to use f-strings (#965)
jdhughes-usgs Jun 28, 2022
f8a0472
docs: Fix vscode instructions (#962)
Hofer-Julian Jun 28, 2022
04e82dd
style(gwf): apply fprettify formatting (#963)
mjreno Jun 29, 2022
e02997b
feat(memory): fully implement storing of strings and 1d string arrays…
langevin-usgs Jun 29, 2022
b063109
style(gwt): apply fprettify formatting (#969)
mjreno Jun 30, 2022
bb793bc
ci: update scripts to use meson to build instead of pymake (#967)
jdhughes-usgs Jun 30, 2022
a2806ac
ci: test build_nightly script (#970)
jdhughes-usgs Jul 1, 2022
aee7dc5
ci: update build_nightly script (#971)
jdhughes-usgs Jul 1, 2022
0764985
fix(ci): workaround for windows-2022 gfortran executable run failures…
mjreno Jul 1, 2022
a25817d
fix(util): remove rogue file (#972)
langevin-usgs Jul 1, 2022
4473d9a
ci: update Intel OneAPI version (#973)
jdhughes-usgs Jul 1, 2022
9514eb4
style(model): apply fprettify formatting (#974)
mjreno Jul 1, 2022
83aad76
test(gwf_disv_uzf): New autotest checks uzet and gwet results (#947)
emorway-usgs Jul 4, 2022
ec2cb29
ci: fix Intel OneAPI build on Windows (#978)
jdhughes-usgs Jul 6, 2022
c3f4153
style(exchange, solution): apply fprettify formatting (#975)
mjreno Jul 6, 2022
584371e
fix(util-sparse): fix stack overflow exception in overloaded sparse i…
mjreno Jul 7, 2022
ff1f8e5
style(sim, timing, util): apply fprettify formatting (#980)
mjreno Jul 13, 2022
c3a78b8
ci(actions): add ci action to check fortran source formatting (#982)
mjreno Jul 13, 2022
6934f27
fix(compilerversion): fix format statement (#983)
jdhughes-usgs Jul 14, 2022
d56a12e
style(srcbmi): apply fprettify formatting (#984)
mjreno Jul 14, 2022
d7a54b1
docs(formatting): add fortran source formatting to documentation (#981)
mjreno Jul 14, 2022
982e00c
Add conda `environment.yml` (#977)
Hofer-Julian Jul 15, 2022
9f7c07a
style(zonebudget): apply fprettify formatting (#985)
mjreno Jul 15, 2022
262c53a
ci: update ubuntu VM to latest for previous gfortran versions (#986)
jdhughes-usgs Jul 16, 2022
54b208b
ci(actions): cache mamba conda downloads and environment (#988)
mjreno Jul 19, 2022
703a8d8
fix(npf: k33/k11 error (GitHub issue #989) (#990)
damianmerrick Jul 21, 2022
17d540e
docs(DEVELOPER.md): Visual Studio for ifort (#991)
Huite Jul 21, 2022
58194e5
fix(timeseries): ensure METHOD/METHODS specified in ATTRIBUTES block …
langevin-usgs Jul 21, 2022
a247f4a
fix(gwfgwt): ensure GWF and GWT are in different IMS (#994)
langevin-usgs Jul 22, 2022
2ab1449
ci: downgrade rtd python version to 3.8
jdhughes-usgs Jul 24, 2022
55ee93f
ci(rtd): remove pinned markdown version (#997)
jdhughes-usgs Jul 26, 2022
e36bd62
docs(gwf-buy.dfn): variable description refers to block that does not…
emorway-usgs Aug 4, 2022
f2e1718
fix(disv): check for zero cell area (#1010)
langevin-usgs Aug 11, 2022
6ebb5ee
fix(gwtgwt): allow exchange to work without XT3D active for dispersio…
langevin-usgs Aug 11, 2022
eab6767
ci: update path for rtd requirements
jdhughes-usgs Aug 12, 2022
d04ee46
ci(z03): prevent regression on gwtgwt example since keyword changed (…
langevin-usgs Aug 12, 2022
93f8ca5
fix(gwt): LKT fix for outlet flows (#1015)
langevin-usgs Aug 22, 2022
49d46e5
fix(ci): remove gfortran end of life 5 and 6 (#1017)
langevin-usgs Aug 22, 2022
d8df175
feat(string): implement CharacterStringType (#1013)
langevin-usgs Aug 25, 2022
27aba88
feat(API string support): support string access through API (#1023)
mjr-deltares Aug 29, 2022
25eee89
doc(gwt-uztobs.tex): fix typo in uzt obs type (#1026)
emorway-usgs Aug 31, 2022
e73e4d2
fix(gwt obs): refactor GWT obs for LKT, SFT, MWT, and UZT (#1024)
langevin-usgs Aug 31, 2022
ba21f84
fix(npf): sat thickness fix for vertically staggered confined cells (…
langevin-usgs Sep 1, 2022
ddb3a55
Introducing the concept of distributed data without functional change…
mjr-deltares Sep 1, 2022
94fc2f9
fix(stringlist): allocate string before assignment (#1030)
mjreno Sep 2, 2022
aad8ca0
refactor(npf): always allocate and store k22 and k33 (#1031)
langevin-usgs Sep 6, 2022
fcf1ed5
docs: Add vsdbg to vscode docs (#1032)
Hofer-Julian Sep 8, 2022
ba3ac3a
fix(budgetcsv): fix intermittent failure with budgetcsv option (#1035)
langevin-usgs Sep 10, 2022
5327174
patch(apt): add variables to memory manager (#1036)
langevin-usgs Sep 12, 2022
4c599a8
feat(context): increase mempath to allow for context (#1037)
langevin-usgs Sep 12, 2022
67b973c
fix(exg): cellid not correct in error message (#1040)
langevin-usgs Sep 13, 2022
7d7bcc0
docs(mf6io): fix discrepancy in EVT example (#1041)
emorway-usgs Sep 14, 2022
19824b8
fix(lak): withdrawal and budget errors (#1045)
langevin-usgs Sep 15, 2022
67ee282
ci: use fortran compiler cache/install actions (#1042)
wpbonelli Sep 19, 2022
5303962
fix(evt): model crashes with option SURF_RATE_SPECIFIED and nseg=1 (#…
emorway-usgs Sep 22, 2022
a2b5b84
docs(releasenotes): hotfix to escape underscore in release notes (#1049)
langevin-usgs Sep 23, 2022
f45945a
feat(NumericalPackage): store the package type in the memory manager …
langevin-usgs Sep 29, 2022
c8a39a7
refactor(dis): remove unused DIS code and change NPF array initializa…
langevin-usgs Sep 30, 2022
eac69ef
rfct(npf/dsp): move read grid data from ar to df (#1057)
mjr-deltares Sep 30, 2022
1330419
rfct(dis): add xc, yc to DIS as cell center coordinates (#1060)
mjr-deltares Oct 3, 2022
6a34bb1
rfct(ifmod): introducing concept of distributed data (#1059)
mjr-deltares Oct 5, 2022
b2cb908
fix(maw): patch-up relatively minor typo (#1063)
emorway-usgs Oct 11, 2022
5e142a4
fix(getblock): add error message if block not found (#1065)
langevin-usgs Oct 12, 2022
d550e4d
ci: add meson test for installation success (#1062)
jdhughes-usgs Oct 13, 2022
5869d4a
feature(input-data-model): add idm core with initial package use (#1064)
mjreno Oct 17, 2022
682972b
refactor(arrayreader): working on object-based array reader (#1067)
langevin-usgs Oct 28, 2022
41e9c34
refactor(input-data-model): rework found construct for readability an…
mjreno Nov 1, 2022
f4f1363
refactor(io): miscellaneous io cleanup (#1073)
langevin-usgs Nov 8, 2022
a61059f
fix(buy): add missing else; switch messaging to lowercase (#1077)
emorway-usgs Nov 8, 2022
d9256ec
ci: refactor/update miscellaneous (#1076)
wpbonelli Nov 8, 2022
18deae7
feat(vsc): New viscosity package for GWF model type (#1071)
emorway-usgs Nov 15, 2022
a38723b
fix(uzf): uzf not routing properly (#1082)
langevin-usgs Nov 16, 2022
a94c2e2
doc(suptechinfo): Update MF6 enhancements table in Ch. 1 (#1083)
emorway-usgs Nov 17, 2022
2f6188c
fix(zbud): fix zonebudget for spaces in path (#1085)
langevin-usgs Nov 18, 2022
c3602ae
fix(autotest): resolve inconsistent length units in Prudic model (#1058)
emorway-usgs Nov 18, 2022
39c1481
fix(mf5to6msvs): update Visual Studio file for mf5to6 (#1086)
langevin-usgs Nov 21, 2022
1ed8668
docs(release): preparation for 6.4.0 release (#1089)
langevin-usgs Nov 28, 2022
98ddcd8
fix(vsc): issue error if VSC used in GWF-GWF model (#1090)
langevin-usgs Nov 29, 2022
236d5f6
create 6.4.0 release
langevin-usgs Dec 1, 2022
fbceace
fprettify and use 11/30/22 release date
langevin-usgs Dec 1, 2022
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
Prev Previous commit
Next Next commit
ci: update scripts to use meson to build instead of pymake (#967)
  • Loading branch information
jdhughes-usgs committed Jun 30, 2022
commit bb793bce588c454a5247486f0aaafaaf293f39dc
18 changes: 0 additions & 18 deletions .github/common/python-version.py

This file was deleted.

5 changes: 0 additions & 5 deletions .github/common/python-version.sh

This file was deleted.

74 changes: 37 additions & 37 deletions .github/workflows/ci-check-warnings-gfortran.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,53 +17,53 @@ jobs:
strategy:
fail-fast: false
matrix:
os: [ubuntu-latest]
os: [ ubuntu-latest ]
defaults:
run:
shell: bash

steps:
- name: Checkout repo
uses: actions/[email protected]
- name: Checkout repo
uses: actions/[email protected]

- name: Setup Python 3.8
uses: actions/setup-python@v2.2.2
with:
python-version: 3.8
- name: Setup Python
uses: actions/setup-python@v4.0.0
with:
python-version: 3.9

- name: Setup symbolic links on Linux
if: runner.os == 'Linux'
run: |
sudo ln -fs /usr/bin/gfortran-10 /usr/local/bin/gfortran
sudo ln -fs /usr/bin/gcc-10 /usr/local/bin/gcc
sudo ln -fs /usr/bin/g++-10 /usr/local/bin/g++
- name: Setup symbolic links on Linux
if: runner.os == 'Linux'
run: |
sudo ln -fs /usr/bin/gfortran-10 /usr/local/bin/gfortran
sudo ln -fs /usr/bin/gcc-10 /usr/local/bin/gcc
sudo ln -fs /usr/bin/g++-10 /usr/local/bin/g++

- name: Setup symbolic link to gfortran on macOS
if: runner.os == 'macOS'
shell: bash
run: |
sudo ln -fs /usr/local/bin/gfortran-10 /usr/local/bin/gfortran
sudo ln -fs /usr/local/bin/gcc-10 /usr/local/bin/gcc
sudo ln -fs /usr/local/bin/g++-10 /usr/local/bin/g++
- name: Setup symbolic link to gfortran on macOS
if: runner.os == 'macOS'
shell: bash
run: |
sudo ln -fs /usr/local/bin/gfortran-10 /usr/local/bin/gfortran
sudo ln -fs /usr/local/bin/gcc-10 /usr/local/bin/gcc
sudo ln -fs /usr/local/bin/g++-10 /usr/local/bin/g++

- name: Print GNU compiler versions
run: |
gfortran --version
gcc --version
g++ --version
- name: Print GNU compiler versions
run: |
gfortran --version
gcc --version
g++ --version

- name: Install python packages
run: |
.github/common/install-python-std.sh
- name: Install python packages
run: |
.github/common/install-python-std.sh

- name: Print python package versions
run: |
.github/common/python-version.sh
- name: Print python package versions
run: |
pip list

- name: Setup modflow
run: |
meson setup builddir -Ddebug=false -Dwerror=true
- name: Setup modflow
run: |
meson setup builddir -Ddebug=false -Dwerror=true

- name: Build modflow and check for warnings
run: |
meson compile -C builddir
- name: Build modflow and check for warnings
run: |
meson compile -C builddir
12 changes: 6 additions & 6 deletions .github/workflows/ci-docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@ jobs:
steps:
- uses: actions/[email protected]

- name: Setup Python 3.8
uses: actions/setup-python@v2
- name: Setup Python
uses: actions/setup-python@v4.0.0
with:
python-version: 3.8
python-version: 3.9

- name: Upgrade pip and install packages for Sphinx
run: |
Expand Down Expand Up @@ -121,10 +121,10 @@ jobs:
sudo apt-get update
sudo apt-get install doxygen graphviz

- name: Setup Python 3.8
uses: actions/setup-python@v2
- name: Setup Python
uses: actions/setup-python@v4.0.0
with:
python-version: 3.8
python-version: 3.9

- name: update MODFLOW 6 version
run: |
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/ci-large-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,10 @@ jobs:
- name: Checkout repo
uses: actions/[email protected]

- name: Setup Python 3.8
uses: actions/setup-python@v2.2.2
- name: Setup Python
uses: actions/setup-python@v4.0.0
with:
python-version: 3.8
python-version: 3.9

- name: set FC=ifort environmental variable
if: matrix.FC == 'ifort'
Expand Down Expand Up @@ -86,7 +86,7 @@ jobs:

- name: Print python package versions
run: |
.github/common/python-version.sh
pip list

- name: Set and print branch name
run: |
Expand Down
152 changes: 76 additions & 76 deletions .github/workflows/ci-tests-gfortran-latest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,84 +17,84 @@ jobs:
strategy:
fail-fast: false
matrix:
os: [ubuntu-latest, windows-2019, macos-latest]
os: [ ubuntu-latest, windows-2019, macos-latest ]
defaults:
run:
shell: bash

steps:
- name: Checkout repo
uses: actions/[email protected]

- name: Setup Python 3.8
uses: actions/setup-python@v2.2.2
with:
python-version: 3.8

- name: Setup symbolic links on Linux
if: runner.os == 'Linux'
run: |
sudo ln -fs /usr/bin/gfortran-10 /usr/local/bin/gfortran
sudo ln -fs /usr/bin/gcc-10 /usr/local/bin/gcc
sudo ln -fs /usr/bin/g++-10 /usr/local/bin/g++

- name: Setup symbolic link to gfortran on macOS
if: runner.os == 'macOS'
shell: bash
run: |
sudo ln -fs /usr/local/bin/gfortran-10 /usr/local/bin/gfortran
sudo ln -fs /usr/local/bin/gcc-10 /usr/local/bin/gcc
sudo ln -fs /usr/local/bin/g++-10 /usr/local/bin/g++

- name: Print GNU compiler versions
run: |
gfortran --version
gcc --version
g++ --version

- name: Install python packages
run: |
.github/common/install-python-std.sh

- name: Print python package versions
run: |
.github/common/python-version.sh

- name: Set and print branch name
run: |
.github/common/git-branch-export.sh

- name: Test make for MODFLOW 6 programs
working-directory: ./distribution
run: |
pytest -v -n=auto build_makefiles.py

- name: Get regression test files
run: |
.github/common/get-regression-files.sh

- name: Check out the correct regression test branch
run: |
.github/common/checkout-regression-branch.sh

- name: Update flopy MODFLOW 6 classes
run: |
.github/common/update-flopy.sh

- name: Setup modflow
run: |
meson setup builddir -Ddebug=false --prefix=$(pwd) --libdir=bin

- name: Build and install modflow
run: |
meson install -C builddir

- name: Get executables
working-directory: autotest
run: |
pytest -v --durations=0 get_exes.py

- name: Test applications
working-directory: autotest
run: |
pytest -v -n=auto --durations=0
- name: Checkout repo
uses: actions/[email protected]

- name: Setup Python
uses: actions/setup-python@v4.0.0
with:
python-version: 3.9

- name: Setup symbolic links on Linux
if: runner.os == 'Linux'
run: |
sudo ln -fs /usr/bin/gfortran-10 /usr/local/bin/gfortran
sudo ln -fs /usr/bin/gcc-10 /usr/local/bin/gcc
sudo ln -fs /usr/bin/g++-10 /usr/local/bin/g++

- name: Setup symbolic link to gfortran on macOS
if: runner.os == 'macOS'
shell: bash
run: |
sudo ln -fs /usr/local/bin/gfortran-10 /usr/local/bin/gfortran
sudo ln -fs /usr/local/bin/gcc-10 /usr/local/bin/gcc
sudo ln -fs /usr/local/bin/g++-10 /usr/local/bin/g++

- name: Print GNU compiler versions
run: |
gfortran --version
gcc --version
g++ --version

- name: Install python packages
run: |
.github/common/install-python-std.sh

- name: Print python package versions
run: |
pip list

- name: Set and print branch name
run: |
.github/common/git-branch-export.sh

- name: Test make for MODFLOW 6 programs
working-directory: ./distribution
run: |
pytest -v -n=auto build_makefiles.py

- name: Get regression test files
run: |
.github/common/get-regression-files.sh

- name: Check out the correct regression test branch
run: |
.github/common/checkout-regression-branch.sh

- name: Update flopy MODFLOW 6 classes
run: |
.github/common/update-flopy.sh

- name: Setup modflow
run: |
meson setup builddir -Ddebug=false --prefix=$(pwd) --libdir=bin

- name: Build and install modflow
run: |
meson install -C builddir

- name: Get executables
working-directory: autotest
run: |
pytest -v --durations=0 get_exes.py

- name: Test applications
working-directory: autotest
run: |
pytest -v -n=auto --durations=0
Loading