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

feat(GWE): Groundwater Energy Transport #1237

Closed
wants to merge 278 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
278 commits
Select commit Hold shift + click to select a range
e5921d0
Merge branch 'develop' into gwe
emorway-usgs Jul 26, 2022
71b79d6
Some minor clean-up in SSM
emorway-usgs Jul 27, 2022
1eeb002
Drafted new modules GwfVscModule and GwfVscInputDataModule
aprovost-usgs Jul 28, 2022
7978763
Adding some options to VSC OPTIONS block; minor tweaks to some of the…
emorway-usgs Jul 28, 2022
0e58924
* Added ikmod flag to npf to indicate whether Ks get modified from th…
aprovost-usgs Jul 29, 2022
4bc36fa
About to rectify my local changes with what Alden just pushed, commit…
emorway-usgs Jul 29, 2022
ec45d48
Merge branch 'gwe' of github.com:emorway-usgs/modflow6 into gwe
emorway-usgs Jul 29, 2022
1d61697
In GwfVscModule:
aprovost-usgs Jul 29, 2022
71c6681
Fixed issue that was preventing solution from building (basically the…
emorway-usgs Jul 30, 2022
d59deec
Merge branch 'gwe' of github.com:emorway-usgs/modflow6 into gwe
emorway-usgs Jul 30, 2022
84b9e9d
Some relatively minor alterations and clean-ups in VSC based on consu…
emorway-usgs Aug 3, 2022
cc19de4
Merge branch 'develop' into gwe
emorway-usgs Aug 8, 2022
d02d57c
More work on VSC package, including a .dfn file and start of a single…
emorway-usgs Aug 10, 2022
7d38f98
Merge branch 'develop' into gwe
emorway-usgs Aug 12, 2022
e6488bd
Merge branch 'develop' into gwe
emorway-usgs Aug 22, 2022
19e3d3b
updating work on vsc package
emorway-usgs Sep 7, 2022
9f7d9d8
Merge branch 'develop' into gwe
emorway-usgs Sep 7, 2022
3ce72a2
Merge branch 'develop' into gwe
emorway-usgs Sep 12, 2022
902f235
Merge branch 'develop' into gwe
emorway-usgs Sep 13, 2022
1ac4914
A couple of relatively minor changes to go along with changes made on…
emorway-usgs Sep 13, 2022
ced1b3d
Some relatively minor changes to go along with changes made on the mf…
emorway-usgs Sep 13, 2022
678c2ae
Accounting for viscosity in the basic boundary packages (DRN, RIV, GHB)
emorway-usgs Sep 13, 2022
a6ef0cf
Merge branch 'develop' into gwe
emorway-usgs Sep 21, 2022
352f035
commit LAK for resolving conflicts
emorway-usgs Sep 21, 2022
2529050
Merge branch 'gwe' of github.com:emorway-usgs/modflow6 into gwe
emorway-usgs Sep 21, 2022
a7b7a8f
Merge branch 'develop' into gwe
emorway-usgs Sep 22, 2022
bdafa1e
Merge branch 'gwe' of github.com:emorway-usgs/modflow6 into gwe
emorway-usgs Sep 22, 2022
79027b8
work on advanced packages w/ viscosity. Adding another example probl…
emorway-usgs Sep 22, 2022
99bddcc
Merge branch 'develop' into gwe
emorway-usgs Sep 25, 2022
d6a184d
Work on mf6io.tex documentation related to VSC package input
emorway-usgs Sep 26, 2022
3c7f691
Merge branch 'gwe' of github.com:emorway-usgs/modflow6 into gwe
emorway-usgs Sep 26, 2022
fc3b642
Significant work on the mf6io latex docs. Builds out with VSC inclu…
emorway-usgs Oct 4, 2022
151788b
Merge branch 'develop' into gwe
emorway-usgs Oct 4, 2022
a407169
reinstating NPF changes (related to VSC) that were lost when getting …
emorway-usgs Oct 4, 2022
f2efad9
Some code updates and some work on example problems.
emorway-usgs Oct 12, 2022
2496ac0
Merge branch 'develop' into gwe
emorway-usgs Oct 12, 2022
227da2e
For some reason, this file wasn't in my fork (but should've been)
emorway-usgs Oct 12, 2022
5ca9daf
Need to restore a change that was lost during a merge conflict
emorway-usgs Oct 12, 2022
933f3d4
Resolving some more losses that were experienced in the last merge co…
emorway-usgs Oct 13, 2022
971e784
Updates to vsc.tex based on Alden's review
emorway-usgs Oct 17, 2022
ef4685d
Merge branch 'develop' into gwe
emorway-usgs Oct 17, 2022
5ff49f5
Resolving some losses that were experienced in the last merge commit
emorway-usgs Oct 17, 2022
03f3801
Resolving lots of issues post PR #1059 that should've been caught ear…
emorway-usgs Oct 19, 2022
92ed035
Merge branch 'develop' into gwe
emorway-usgs Nov 16, 2022
34a411b
Upload GWE-related definition files (.dfn)
emorway-usgs Nov 23, 2022
ef6e41f
Merge branch 'develop' into gwe
emorway-usgs Nov 30, 2022
857bab4
File updates to account for new IDM in GWE's DSP package (DSP was IDM…
emorway-usgs Nov 30, 2022
5a40f13
A change to avoid warning messages generated by IDM related to the GW…
emorway-usgs Nov 30, 2022
efccc6b
fprettify (for gfortran-compliant formatting, I hope)
emorway-usgs Nov 30, 2022
6797b77
Merge branch 'develop' into gwe
emorway-usgs Dec 1, 2022
7faa5e2
An early GWE autotest
emorway-usgs Dec 2, 2022
65d9f1c
Merge branch 'develop' into gwe
emorway-usgs Dec 4, 2022
dc4cc0f
These tests have been superceded by those pushed with the VSC PR
emorway-usgs Dec 5, 2022
557adad
First autotest should be working better now.
emorway-usgs Dec 6, 2022
485a65f
Add stallman analysis
Dec 6, 2022
fb3e67d
Generalizing advanced package transport for extending its use in GWE
emorway-usgs Dec 6, 2022
3b8f666
Merge branch 'develop' into gwe
emorway-usgs Dec 6, 2022
640f322
Some more .dfn file stuff
emorway-usgs Dec 14, 2022
7a6917e
ran black on Cindy's Stallman script
emorway-usgs Dec 16, 2022
ab9dc6b
Some more work on labeling of units
emorway-usgs Jan 2, 2023
e9f049d
Some labeling touch-up
emorway-usgs Jan 3, 2023
bb73dc2
minor touch-up
emorway-usgs Jan 3, 2023
8646ba7
more labeling touch-up
emorway-usgs Jan 3, 2023
50cf110
Merge branch 'develop' into gwe
emorway-usgs Jan 5, 2023
b2a16b7
resolving GHB conflict after merging codes
emorway-usgs Jan 6, 2023
eb7635c
manual resolution of conflicts in LAK after updating GWE branch
emorway-usgs Jan 6, 2023
72fe506
manual resolution of conflicts in MAW after updating GWE branch
emorway-usgs Jan 6, 2023
a6a36ee
manual resolution of conflicts in GWT.f90 after updating GWE branch
emorway-usgs Jan 6, 2023
05cc7f6
manual resolution of conflicts in tsp1adv1.f90 after updating GWE bra…
emorway-usgs Jan 6, 2023
14682de
manual resolution of conflicts in tsp1apt1.f90 after updating GWE bra…
emorway-usgs Jan 6, 2023
6a4e081
manual resolution of conflicts in tsp1ssm1.f90 after updating GWE bra…
emorway-usgs Jan 6, 2023
0820937
manual resolution of conflicts in BoundaryPackage.f90 after updating …
emorway-usgs Jan 6, 2023
5b0eb33
manual resolution of conflicts in mf6core.vfproj after updating GWE b…
emorway-usgs Jan 6, 2023
179431e
Merge branch 'gwe' of github.com:emorway-usgs/modflow6 into gwe
emorway-usgs Jan 6, 2023
8e530c2
Had to get GweGweExchange.f90 and GweGweConnection.f90 caught up afte…
emorway-usgs Jan 7, 2023
e4784b0
Resolution of some code that got mangled in the update merge. Some o…
emorway-usgs Jan 7, 2023
b0ef8e5
GWE needs the MatrixModule updates that were applied to GWT in #1078
emorway-usgs Jan 7, 2023
311ff68
checking a couple of files that are still under construction but comp…
emorway-usgs Jan 7, 2023
a58d5be
clean-out bad code
emorway-usgs Jan 10, 2023
60879c4
XT3D changes necessary for conduction through solid matrix material
emorway-usgs Jan 26, 2023
15b2e79
Preliminary work on latent heat associated with evaporation from the …
emorway-usgs Jan 26, 2023
1f6b3de
Another latent heat change
emorway-usgs Jan 26, 2023
305f951
Address minor items related to the Labels module
emorway-usgs Jan 26, 2023
f781e14
Changes related to conduction through dry cells
emorway-usgs Jan 26, 2023
55a94f6
Changes I've been reluctant to push because it will all need to get b…
emorway-usgs Jan 26, 2023
659b9c9
gweSrc.f90 had slipped out of my solution and was behind. Readded to…
emorway-usgs Jan 27, 2023
54402a4
Implemented idryinactive flag wrong. Correcting to something that ma…
emorway-usgs Jan 30, 2023
d021c75
need to simplify changes
emorway-usgs Mar 1, 2023
6f6a0bf
More fixes
emorway-usgs Mar 2, 2023
6404ae0
I thought these 'undo' changes had already been committed
emorway-usgs Mar 2, 2023
78961f5
Merge branch 'gwe_detour' into gwe
emorway-usgs Mar 2, 2023
78d6b16
Fixing a bug introduced while working on the GWE code. Bug found whi…
emorway-usgs Mar 2, 2023
e0c9ad6
committing first draft of uze before getting on the road
emorway-usgs Mar 4, 2023
5eeb582
Updates on UZE indexing
emorway-usgs Mar 15, 2023
134a47f
Merge branch 'uze' into gwe
emorway-usgs Mar 15, 2023
a998aa2
Pushing some loose-ends
emorway-usgs Mar 16, 2023
552fb7e
* removed nonexistent file LatHeatVapor.f90 from msvs project
aprovost-usgs Mar 16, 2023
999a510
Some updates to the .dfn files associated with MST alterations and th…
emorway-usgs Mar 22, 2023
2f76c54
Remove Cpw and Rhow from BoundaryPackage.f90. Both vars moved to new…
emorway-usgs Mar 23, 2023
5ddb427
Updates to energy src loading package for GWE
emorway-usgs Mar 27, 2023
0768283
* Programmed uze budget calculations. This involved some relatively…
aprovost-usgs Apr 4, 2023
277fe6f
* Replaced unitadj with eqnsclfac (governing equaiton scale factor), …
aprovost-usgs Apr 5, 2023
f8ed4f9
* Got rid of the overriding subroutines in uze that existed solely to…
aprovost-usgs Apr 5, 2023
1de53f3
Some preliminary work on LKE
emorway-usgs Apr 6, 2023
0ccb8e6
Merge branch 'gwe' of https://github.com/emorway-usgs/modflow6 into gwe
emorway-usgs Apr 6, 2023
d8121fa
Add clarity to common.dfn about maximum auxiliary variable name length
emorway-usgs Apr 7, 2023
7667d32
* Refactored heat transport such that governing eqn is NOT divided th…
aprovost-usgs Apr 12, 2023
bf9a52a
* Made what should be all the remaining (at least for now) scale-fact…
aprovost-usgs Apr 12, 2023
69a4ad5
* Programmed streambed conduction terms into formulate and budget in sfe
aprovost-usgs Apr 13, 2023
fce44d4
Merge branch 'develop' into gwe
emorway-usgs Apr 13, 2023
147206f
Merge branch 'develop' into gwe
emorway-usgs Apr 13, 2023
e8cb9d2
minor fixes post GWE/develop merge. More fixes needed.
emorway-usgs Apr 17, 2023
93408b4
Revert "* Programmed streambed conduction terms into formulate and bu…
aprovost-usgs Apr 17, 2023
c6333df
Revert "* Made what should be all the remaining (at least for now) sc…
aprovost-usgs Apr 17, 2023
008e0ef
Merge branch 'gwe' of github.com:emorway-usgs/modflow6 into gwe
aprovost-usgs Apr 17, 2023
d06ef65
* Temporary workaround in idm-related syntax for the sake of old Inte…
aprovost-usgs Apr 17, 2023
64835e0
More post-merge reconciliation
emorway-usgs Apr 18, 2023
e3a15c6
Merge branch 'develop' into gwe
emorway-usgs Apr 18, 2023
a427d9f
GWE support in idm
emorway-usgs Apr 18, 2023
e029f58
More reconciliation post gwe/develop merge catch-up
emorway-usgs Apr 18, 2023
14cf908
Some IDM related updates for running GWE autotests with the post upda…
emorway-usgs Apr 18, 2023
00a64b9
Update to a GWE autotest
emorway-usgs Apr 18, 2023
40a61f7
Merge branch 'develop' into gwe
emorway-usgs Apr 18, 2023
c6c2d01
Virtual gwe model support (not sure how I was able to run the autotes…
emorway-usgs Apr 18, 2023
df7e228
Merge branch 'develop' into gwe
emorway-usgs Apr 18, 2023
1d2c28e
More post gwe/develop merge debugging
emorway-usgs Apr 18, 2023
edbb106
Merge branch 'gwe' of github.com:emorway-usgs/modflow6 into gwe
emorway-usgs Apr 18, 2023
46a015c
Some more shuffling around of code between gwe.f90 & gwt.f90 and the …
emorway-usgs Apr 19, 2023
740ec79
IDM-related catch up on GWE branch
emorway-usgs Apr 19, 2023
2d95c15
Testing framework syntax has been updated. Will need to do similar u…
emorway-usgs Apr 19, 2023
6559433
Even though GweDspGridData.f90 hasn't been a part of the .proj file f…
emorway-usgs Apr 19, 2023
86c5530
1 more IDM related change
emorway-usgs Apr 19, 2023
d479d7b
Some virtual model changes while trying to track down the idiffc erro…
emorway-usgs Apr 19, 2023
5cd36ff
diffc not needed in GWE, removing from DSP .dfn file. Still doesn't …
emorway-usgs Apr 19, 2023
059cc71
Why this was like trying to find a piece of hay in a needle stack, I …
emorway-usgs Apr 21, 2023
ed2de05
Merge branch 'develop' into gwe
emorway-usgs Apr 21, 2023
eaa814c
Merge branch 'develop' into gwe
emorway-usgs May 3, 2023
1840f56
Kts & Ktw should not necessitate alv/alh requirement
emorway-usgs May 5, 2023
9d47df2
Merge branch 'gwe' of github.com:emorway-usgs/modflow6 into gwe
emorway-usgs May 5, 2023
8a0ce05
Was causing double allocation of variables at the transport model level
emorway-usgs May 5, 2023
f5cba1c
Merge branch 'develop' into gwe
emorway-usgs May 16, 2023
a17e2f6
Check in some recent SFE changes after re-testing UZE autotest that w…
emorway-usgs May 16, 2023
cb9573d
* temporary idm syntax workaround for old Intel compiler
aprovost-usgs May 19, 2023
cc13084
clean up some uze budget code
aprovost-usgs May 19, 2023
35c3b36
work on streambed conduction in sfe budget
aprovost-usgs May 19, 2023
2ce48fd
Some work on LKE
emorway-usgs May 19, 2023
055cda4
Merge branch 'gwe' of github.com:emorway-usgs/modflow6 into gwe
emorway-usgs May 19, 2023
aad427c
Get the SFE example with conduction working again, fix a sign convens…
emorway-usgs May 19, 2023
3b9d847
Some fixes in SFE, get the LKE budget working correctly
emorway-usgs May 22, 2023
ee47136
Dfn file modifications that need to be checked in
emorway-usgs May 23, 2023
0d92ea7
Some preliminary work on MWE
emorway-usgs May 23, 2023
2087a12
Get MWT caught up
emorway-usgs May 23, 2023
b4191b7
Minor variable name cleanup
emorway-usgs May 24, 2023
e5f0750
Some fixes in MWE for getting the budget terms looking better
emorway-usgs May 24, 2023
e899f82
Small fix in MWE for getting the output associated with PRINT_BUDGET …
emorway-usgs May 24, 2023
fb24605
Add error msg to avoid 'divide by zero' error
emorway-usgs May 30, 2023
7cfba8a
wrong evaluation on previous commit
emorway-usgs May 30, 2023
1b27da5
Merge branch 'develop' into gwe
emorway-usgs May 31, 2023
c606a99
Redoing some SSM changes that were stomped on during the last update …
emorway-usgs May 31, 2023
173e697
Adding lake conduction autotest
emorway-usgs Jun 1, 2023
bf0a67f
Adding streambed thermal conduction autotest
emorway-usgs Jun 1, 2023
312ac94
Adding well bore (MAW) conductive exchange with aquifer autotest
emorway-usgs Jun 1, 2023
ee54ccb
Reorganization of generalized transport model files
emorway-usgs Jun 2, 2023
0135f6a
gwe.f90 doxygen
emorway-usgs Jun 2, 2023
c4bc174
gwe1sfe1.f90 doxygen compliance
emorway-usgs Jun 2, 2023
dafe2cb
gwe1src1.f90 doxygen compliance
emorway-usgs Jun 2, 2023
798f102
gwe1uze1.f90 doxygen compliance
emorway-usgs Jun 2, 2023
34036ee
gwe1lke1.f90 doxygen compliance. A few touch-ups in gwe1sfe1.f90
emorway-usgs Jun 2, 2023
219e66e
gwe1mst1.f90 doxygen compliance (was mostly already done)
emorway-usgs Jun 3, 2023
e1f93f1
gwe1dsp1.f90 doxygen compliance
emorway-usgs Jun 3, 2023
8e07188
tsp1adv1.f90 doxygen compliance
emorway-usgs Jun 3, 2023
b8bef96
tsp1.f90 doxygen compliance. Touch-up in gwe1dsp1.f90
emorway-usgs Jun 5, 2023
5034a26
tsp1apt1.f90 doxygen compliance. Touch-up in gwe1lke1.f90
emorway-usgs Jun 5, 2023
ed5e366
tsp1cnc1.f90 doxygen compliance. Touch-up in gwe1dsp1.f90
emorway-usgs Jun 5, 2023
3d386bf
tsp1fmi1.f90 doxygen compliance.
emorway-usgs Jun 5, 2023
16bedfe
tsp1ic1.f90 doxygen compliance
emorway-usgs Jun 5, 2023
e48ed8c
tsp1mvt1.f90 doxygen compliance
emorway-usgs Jun 5, 2023
44f5d7e
tsp1obs1.f90 doxygen compliance
emorway-usgs Jun 5, 2023
7e34050
gwt1uzt1.f90 doxygen compliance. Other minor touch-up
emorway-usgs Jun 5, 2023
483bb6a
gwt1src1.f90 doxygen compliance. Minor touch-up in gwe1src.f90
emorway-usgs Jun 5, 2023
3f283e6
gwt1sft1.f90 doxygen compliance. Minor touch-up in gwe1sfe1.f90
emorway-usgs Jun 5, 2023
4926396
gwt1mwt1.f90 & gwe1mwe1.f90 doxygen compliance.
emorway-usgs Jun 6, 2023
8dbbc1e
gwt1lkt1.f90 doxygen compliance. Touch-up in gwe1lke1.f90
emorway-usgs Jun 6, 2023
43c489c
gwt1dsp1.f90 doxygen compliance. Touch-up in gwe1dsp1.f90
emorway-usgs Jun 6, 2023
b096d07
gwt1.f90 doxygen compliance. Touch-up in gwe1.f90
emorway-usgs Jun 6, 2023
c52062e
Merge branch 'develop' into gwe
emorway-usgs Jun 6, 2023
a833988
fprettify on gwe src code
emorway-usgs Jun 6, 2023
534b90a
fprettify on gwt
emorway-usgs Jun 6, 2023
afdee06
fprettify on generalized transport src code
emorway-usgs Jun 6, 2023
2962a6b
First push of mf6io-related .tex files.
emorway-usgs Jun 6, 2023
6ad0539
Merge branch 'develop' into gwe
emorway-usgs Jun 8, 2023
d8abaef
mf6io stuff (and lots of it)
emorway-usgs Jun 8, 2023
e2ded93
Merge branch 'gwe' of github.com:emorway-usgs/modflow6 into gwe
emorway-usgs Jun 8, 2023
63df2de
fprettify
emorway-usgs Jun 8, 2023
46490ec
Merge branch 'develop' into gwe
emorway-usgs Jun 8, 2023
a2063ab
Meson
emorway-usgs Jun 8, 2023
e3ee300
Meson typo
emorway-usgs Jun 8, 2023
8873acf
forgot to run distribution/build_makefiles.py
emorway-usgs Jun 8, 2023
b3fb621
Merge branch 'develop' into gwe
emorway-usgs Jun 8, 2023
013691e
Updating some material that was lost in a merge conflict
emorway-usgs Jun 8, 2023
f85d0ad
trying to find errors caused by an inadvertent rename
emorway-usgs Jun 8, 2023
abaaa3d
more meson
emorway-usgs Jun 8, 2023
7951e60
Removed unused variable from cnc
emorway-usgs Jun 8, 2023
12fcff2
Merge branch 'develop' into gwe
emorway-usgs Jun 9, 2023
f8e1972
Remove more unused variables
emorway-usgs Jun 9, 2023
ca4458b
touch-up gwe & gwt
emorway-usgs Jun 9, 2023
2226757
more meson
emorway-usgs Jun 9, 2023
44e5914
Merge branch 'develop' into gwe
emorway-usgs Jun 10, 2023
480aca3
fix for autotest/test_gwe_dsp.py
emorway-usgs Jun 12, 2023
9d94ed1
Merge branch 'develop' into gwe
emorway-usgs Jun 12, 2023
de9f982
Restore some build files I broke with the last merge conflict
emorway-usgs Jun 12, 2023
23163fe
more fixes
emorway-usgs Jun 12, 2023
42f9de4
providing a fix for at least one of the GWT-GWT autotests
emorway-usgs Jun 12, 2023
3487ba3
Merge branch 'develop' into gwe
emorway-usgs Jun 13, 2023
1467616
Should not be part of the GWE PR
emorway-usgs Jun 14, 2023
ddc301a
These changes should not exist
emorway-usgs Jun 15, 2023
3a81ef6
Another unecessary change, restoring
emorway-usgs Jun 15, 2023
e2a5185
Minor clean-up
emorway-usgs Jun 15, 2023
ca33cb8
Inconsequential
emorway-usgs Jun 16, 2023
b138fbe
Friday afternoon piece of hay in a needlestack
emorway-usgs Jun 16, 2023
13d0a23
Merge branch 'develop' into gwe
emorway-usgs Jun 17, 2023
7b1062f
resolve a conflict from the last merge.
emorway-usgs Jun 17, 2023
5bf187e
Amend UZT with the tsplabels class
emorway-usgs Jun 20, 2023
5cb6453
Merge branch 'develop' into gwe
emorway-usgs Jun 20, 2023
7233fd3
Merge branch 'gwe' of github.com:emorway-usgs/modflow6 into gwe
emorway-usgs Jun 20, 2023
b7a4923
fprettify
emorway-usgs Jun 20, 2023
2f877d4
Merge branch 'develop' into gwe
emorway-usgs Jun 20, 2023
1959778
Line should not be in the makefile
emorway-usgs Jun 20, 2023
7978dfa
Maybe some yet-to-be-checked-in changes to GweInterfaceModel are the …
emorway-usgs Jun 20, 2023
416e8c8
add another uze autotest (ran black)
emorway-usgs Jun 21, 2023
2824da2
Merge branch 'develop' into gwe
emorway-usgs Jun 21, 2023
9720df7
Merge branch 'gwe' of github.com:emorway-usgs/modflow6 into gwe
emorway-usgs Jun 21, 2023
dcebbfc
yet another uze autotest (ran black). Also fixing sig figs in previou…
emorway-usgs Jun 21, 2023
cc731bc
relax tolerance(s) by 1e-10
emorway-usgs Jun 21, 2023
daff71e
Autotest for conduction among dry cells and a dry 'pass-thru' cell
emorway-usgs Jun 23, 2023
e9cde27
2nd autotest for conduction among neighboring dry cells
emorway-usgs Jun 23, 2023
13e9c55
These changes were made with cb11acf, that under the GWE refactor go …
emorway-usgs Jun 23, 2023
8ab0695
These changes were made with cb11acfbut were lost in a merge conflict…
emorway-usgs Jun 23, 2023
30f7c3d
Merge branch 'develop' into gwe
emorway-usgs Jun 24, 2023
58d51c1
Merge branch 'develop' into gwe
emorway-usgs Jun 24, 2023
c63f361
Merge branch 'gwe' of github.com:emorway-usgs/modflow6 into gwe
emorway-usgs Jun 24, 2023
e6d9255
fprettify
emorway-usgs Jun 27, 2023
7ef5f5b
Another drycell conduction-only autotest
emorway-usgs Jun 27, 2023
8508a2f
Restore a fix that was lost during a merge conflict. This fix was or…
emorway-usgs Jun 27, 2023
acbe866
Merge branch 'develop' into gwe
emorway-usgs Jun 27, 2023
80d7ca7
Merge branch 'gwe' of github.com:emorway-usgs/modflow6 into gwe
emorway-usgs Jun 27, 2023
1b12813
Merge branch 'develop' into gwe
emorway-usgs Jun 29, 2023
aac5e52
The missing gfortran12 link?
emorway-usgs Jul 21, 2023
1dfc08f
update makefiles
wpbonelli Jul 21, 2023
fe20af1
Goes with https://github.com/MODFLOW-USGS/modflow6/pull/1306#discussi…
emorway-usgs Aug 10, 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
427 changes: 427 additions & 0 deletions autotest/test_gwe_drycell_conduction0.py

Large diffs are not rendered by default.

483 changes: 483 additions & 0 deletions autotest/test_gwe_drycell_conduction1.py

Large diffs are not rendered by default.

674 changes: 674 additions & 0 deletions autotest/test_gwe_drycell_conduction2.py

Large diffs are not rendered by default.

501 changes: 501 additions & 0 deletions autotest/test_gwe_dsp.py

Large diffs are not rendered by default.

761 changes: 761 additions & 0 deletions autotest/test_gwe_lke_conduction.py

Large diffs are not rendered by default.

557 changes: 557 additions & 0 deletions autotest/test_gwe_mwe_conduction.py

Large diffs are not rendered by default.

753 changes: 753 additions & 0 deletions autotest/test_gwe_sfe_strmbedcond.py

Large diffs are not rendered by default.

406 changes: 406 additions & 0 deletions autotest/test_gwe_stallman.py

Large diffs are not rendered by default.

625 changes: 625 additions & 0 deletions autotest/test_gwe_uze00.py

Large diffs are not rendered by default.

757 changes: 757 additions & 0 deletions autotest/test_gwe_uze00_flux.py

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions doc/Common/gwe-cncobs.tex
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
CNC & cnc & cellid or boundname & -- & Energy flow between the groundwater system and a constant-temperature boundary or a group of cells with constant-temperature boundaries.
1 change: 1 addition & 0 deletions doc/Common/gwe-gweobs.tex
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
GWE-GWE & flow-ja-face & exchange number or boundname & -- & Mass flow between model 1 and model 2 for a specified exchange (which is the consecutive exchange number listed in the EXCHANGEDATA block), or the sum of these exchange flows by boundname if boundname is specified.
18 changes: 18 additions & 0 deletions doc/Common/gwe-lkeobs.tex
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
% general APT observations
LKE & temperature & lakeno or boundname & -- & Lake temperature. If boundname is specified, boundname must be unique for each lake. \\
LKE & flow-ja-face & lakeno or boundname & lakeno or -- & Energy flow between two lakes connected by an outlet. If more than one outlet is used to connect the same two lakes, then the energy flow for only the first outlet can be observed. If a boundname is specified for ID1, then the result is the total energy flow for all outlets for a lake. If a boundname is specified for ID1 then ID2 is not used.\\
LKE & storage & lakeno or boundname & -- & Simulated energy storage flow rate for a lake or group of lakes. \\
LKE & constant & lakeno or boundname & -- & Simulated energy constant-flow rate for a lake or group of lakes. \\
LKE & from-mvr & lakeno or boundname & -- & Simulated energy inflow into a lake or group of lakes from the MVE package. Energy inflow is calculated as the product of provider temperature and the mover flow rate. \\
LKE & to-mvr & outletno or boundname & -- & Energy outflow from a lake outlet, a lake, or a group of lakes that is available for the MVR package. If boundname is not specified for ID, then the outflow available for the MVR package from a specific lake outlet is observed. In this case, ID is the outlet number, which must be between 1 and NOUTLETS. \\
LKE & lke & lakeno or boundname & \texttt{iconn} or -- & Energy flow rate for a lake or group of lakes and its aquifer connection(s). If boundname is not specified for ID, then the simulated lake-aquifer flow rate at a specific lake connection is observed. In this case, ID2 must be specified and is the connection number \texttt{iconn} for lake \texttt{lakeno}. \\

%observations specific to the lake package
% rainfall evaporation runoff ext-inflow withdrawal outflow
LKE & rainfall & lakeno or boundname & -- & Rainfall rate applied to a lake or group of lakes multiplied by the rainfall temperature. \\
LKE & evaporation & lakeno or boundname & -- & Simulated evaporation rate from a lake or group of lakes multiplied by the latent heat of evaporation for determining the energy lost from a lake. \\
LKE & runoff & lakeno or boundname & -- & Runoff rate applied to a lake or group of lakes multiplied by the runoff temperature. \\
LKE & ext-inflow & lakeno or boundname & -- & Energy inflow into a lake or group of lakes calculated as the external inflow rate multiplied by the inflow temperature. \\
LKE & withdrawal & lakeno or boundname & -- & Specified withdrawal rate from a lake or group of lakes multiplied by the simulated lake temperature. \\
LKE & ext-outflow & lakeno or boundname & -- & External outflow from a lake or a group of lakes, through their outlets, to an external boundary. If the water mover is active, the reported ext-outflow value plus the rate to mover is equal to the total outlet outflow.

13 changes: 13 additions & 0 deletions doc/Common/gwe-mweobs.tex
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
% general APT observations
MWE & temperature & mawno or boundname & -- & Well temperature. If boundname is specified, boundname must be unique for each well. \\
%flowjaface not included
MWE & storage & mawno or boundname & -- & Simulated energy storage flow rate for a well or group of wells. \\
MWE & constant & mawno or boundname & -- & Simulated energy constant-flow rate for a well or group of wells. \\
MWE & from-mvr & mawno or boundname & -- & Simulated energy inflow into a well or group of wells from the MVE package. Energy inflow is calculated as the product of provider temperature and the mover flow rate. \\
MWE & mwe & mawno or boundname & \texttt{iconn} or -- & Energy flow rate for a well or group of wells and its aquifer connection(s). If boundname is not specified for ID, then the simulated well-aquifer flow rate at a specific well connection is observed. In this case, ID2 must be specified and is the connection number \texttt{iconn} for well \texttt{mawno}. \\

% observations specific to the mwe package
MWE & rate & mawno or boundname & -- & Simulated energy flow rate for a well or group of wells. \\
MWE & fw-rate & mawno or boundname & -- & Simulated energy flow rate for a flowing well or group of flowing wells. \\
MWE & rate-to-mvr & well or boundname & -- & Simulated energy flow rate that is sent to the MVE Package for a well or group of wells.\\
MWE & fw-rate-to-mvr & well or boundname & -- & Simulated energy flow rate that is sent to the MVE Package from a flowing well or group of flowing wells. \\
2 changes: 2 additions & 0 deletions doc/Common/gwe-obs.tex
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
GWE & temperature & cellid & -- & Temperature at a specified cell. \\
GWE & flow-ja-face & cellid & cellid & Energy flow in dimensions of energy per time between two adjacent cells. The energy flow rate includes the contributions from both convection (advection) and conduction (including mechanical dispersion) if those packages are active
16 changes: 16 additions & 0 deletions doc/Common/gwe-sfeobs.tex
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
% general APT observations
SFE & temperature & rno or boundname & -- & Reach temperature. If boundname is specified, boundname must be unique for each reach. \\
SFE & flow-ja-face & rno or boundname & rno or -- & Energy flow between two reaches. If a boundname is specified for ID1, then the result is the total energy flow for all reaches. If a boundname is specified for ID1 then ID2 is not used.\\
SFE & storage & rno or boundname & -- & Simulated energy storage flow rate for a reach or group of reaches. \\
SFE & constant & rno or boundname & -- & Simulated energy constant-flow rate for a reach or group of reaches. \\
SFE & from-mvr & rno or boundname & -- & Simulated energy inflow into a reach or group of reaches from the MVE package. Energy inflow is calculated as the product of provider temperature and the mover flow rate. \\
SFE & to-mvr & rno or boundname & -- & Energy outflow from a reach, or a group of reaches that is available for the MVR package. If boundname is not specified for ID, then the outflow available for the MVR package from a specific reach is observed. \\
SFE & sfe & rno or boundname & -- & Energy flow rate for a reach or group of reaches and its aquifer connection(s). \\

%observations specific to the stream energy transport package
% rainfall evaporation runoff ext-inflow withdrawal outflow
SFE & rainfall & rno or boundname & -- & Rainfall rate applied to a reach or group of reaches multiplied by the rainfall temperature. \\
SFE & evaporation & rno or boundname & -- & Simulated evaporation rate from a reach or group of reaches multiplied by the latent heat of vaporization for determining the amount of energy lost from a reach. \\
SFE & runoff & rno or boundname & -- & Runoff rate applied to a reach or group of reaches multiplied by the runoff temperature. \\
SFE & ext-inflow & rno or boundname & -- & Energy inflow into a reach or group of reaches calculated as the external inflow rate multiplied by the inflow temperature. \\
SFE & ext-outflow & rno or boundname & -- & External outflow from a reach or group of reaches to an external boundary. If boundname is not specified for ID, then the external outflow from a specific reach is observed. In this case, ID is the reach rno.
1 change: 1 addition & 0 deletions doc/Common/gwe-srcobs.tex
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
SRC & src & cellid or boundname & -- & Energy source loading rate between the groundwater system and a energy source loading boundary or a group of boundaries.
14 changes: 14 additions & 0 deletions doc/Common/gwe-uzeobs.tex
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
% general APT observations
UZE & temperature & uzeno or boundname & -- & uze cell temperature. If boundname is specified, boundname must be unique for each uze cell. \\
UZE & flow-ja-face & uzeno or boundname & uzeno or -- & Energy flow between two uze cells. If a boundname is specified for ID1, then the result is the total energy flow for all uze cells. If a boundname is specified for ID1 then ID2 is not used.\\
UZE & storage & uzeno or boundname & -- & Simulated energy storage flow rate for a uze cell or group of uze cells. \\
UZE & constant & uzeno or boundname & -- & Simulated energy constant-flow rate for a uze cell or a group of uze cells. \\
UZE & from-mvr & uzeno or boundname & -- & Simulated energy inflow into a uze cell or group of uze cells from the MVE package. Energy inflow is calculated as the product of provider temperature and the mover flow rate. \\
UZE & uze & uzeno or boundname & -- & Energy flow rate for a uze cell or group of uze cells and its aquifer connection(s). \\

%observations specific to the uze package
% infiltration rej-inf uzet rej-inf-to-mvr
UZE & infiltration & uzeno or boundname & -- & Infiltration rate applied to a uze cell or group of uze cells multiplied by the infiltration temperature. \\
UZE & rej-inf & uzeno or boundname & -- & Rejected infiltration rate applied to a uze cell or group of uze cells multiplied by the infiltration temperature. \\
UZE & uzet & uzeno or boundname & -- & Unsaturated zone evapotranspiration rate applied to a uze cell or group of uze cells multiplied by the uze cell temperature. \\
UZE & rej-inf-to-mvr & uzeno or boundname & -- & Rejected infiltration rate applied to a uze cell or group of uze cells multiplied by the infiltration temperature that is sent to the mover package. \\
22 changes: 22 additions & 0 deletions doc/MODFLOW6References.bib
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,28 @@



@article{mazheng2010,
author = {Ma, Rui and Zheng, Chunmiao},
title = {Effects of Density and Viscosity in Modeling Heat as a Groundwater Tracer},
journal = {Groundwater},
year = {2010},
volume = {48},
number = {3},
pages = {380--389},
doi = {10.1111/j.1745-6584.2009.00660.x},
}

@article{hechtmendez,
author = {Hecht-Mendez, J. and Molina-Giraldo, N. and Blum, P. and Bayer, P.},
title = {Evaluating MT3DMS for Heat Transport Simulation of Closed Geothermal Systems},
journal = {Groundwater},
year = {2010},
volume = {48},
number = {5},
pages = {741--756},
doi = {10.1111/j.1745-6584.2010.00678.x},
}

@article{morway2021,
author = {Morway, Eric D. and Langevin, Christian D. and Hughes, Joseph D.},
title = {Use of the {MODFLOW 6} Water Mover Package to Represent Natural and Managed Hydrologic Connections},
Expand Down
5 changes: 5 additions & 0 deletions doc/mf6io/body.tex
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,11 @@
\SECTION{Groundwater Transport (GWT) Model Input}
\input{gwt/gwt.tex}

%GWE Model Input Instructions
\newpage
\SECTION{Groundwater Energy Transport (GWE) Model Input}
\input{gwe/gwe.tex}

%Sparse Matrix Solution (IMS)
\newpage
\SECTION{Iterative Model Solution}
Expand Down
16 changes: 16 additions & 0 deletions doc/mf6io/gwe/adv.tex
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
Advection (ADV) Package information is read from the file that is specified by ``ADV6'' as the file type. Only one ADV Package can be specified for a GWE model.

\vspace{5mm}
\subsubsection{Structure of Blocks}
\lstinputlisting[style=blockdefinition]{./mf6ivar/tex/gwe-adv-options.dat}

\vspace{5mm}
\subsubsection{Explanation of Variables}
\begin{description}
\input{./mf6ivar/tex/gwe-adv-desc.tex}
\end{description}

\vspace{5mm}
\subsubsection{Example Input File}
\lstinputlisting[style=inputfile]{./mf6ivar/examples/gwe-adv-example.dat}

47 changes: 47 additions & 0 deletions doc/mf6io/gwe/cnc.tex
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
Constant Temperature (CNC) Package information is read from the file that is specified by ``CNC6'' as the file type. Any number of CNC Packages can be specified for a single GWE model, but the same cell cannot be designated as a constant temperature by more than one CNC entry.

\vspace{5mm}
\subsubsection{Structure of Blocks}
\vspace{5mm}

\noindent \textit{FOR EACH SIMULATION}
\lstinputlisting[style=blockdefinition]{./mf6ivar/tex/gwe-cnc-options.dat}
\lstinputlisting[style=blockdefinition]{./mf6ivar/tex/gwe-cnc-dimensions.dat}
\vspace{5mm}
\noindent \textit{FOR ANY STRESS PERIOD}
\lstinputlisting[style=blockdefinition]{./mf6ivar/tex/gwe-cnc-period.dat}
\packageperioddescription

\vspace{5mm}
\subsubsection{Explanation of Variables}
\begin{description}
\input{./mf6ivar/tex/gwe-cnc-desc.tex}
\end{description}

\vspace{5mm}
\subsubsection{Example Input File}
\lstinputlisting[style=inputfile]{./mf6ivar/examples/gwe-cnc-example.dat}

\vspace{5mm}
\subsubsection{Available observation types}
CNC Package observations are limited to the simulated constant temperature energy flow rate (\texttt{cnc}). The data required for the CNC Package observation type is defined in table~\ref{table:gwe-cncobstype}. Negative and positive values for an observation represent a loss from and gain to the GWE model, respectively.

\begin{longtable}{p{2cm} p{2.75cm} p{2cm} p{1.25cm} p{7cm}}
\caption{Available CNC Package observation types} \tabularnewline

\hline
\hline
\textbf{Model} & \textbf{Observation type} & \textbf{ID} & \textbf{ID2} & \textbf{Description} \\
\hline
\endhead

\hline
\endfoot

\input{../Common/gwe-cncobs.tex}
\label{table:gwe-cncobstype}
\end{longtable}

\vspace{5mm}
\subsubsection{Example Observation Input File}
\lstinputlisting[style=inputfile]{./mf6ivar/examples/gwe-cnc-example-obs.dat}
17 changes: 17 additions & 0 deletions doc/mf6io/gwe/dsp.tex
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
Dispersion (DSP) Package information is read from the file that is specified by ``DSP6'' as the file type. Only one DSP Package can be specified for a GWE model. The DSP Package is based on the mathematical formulation presented for the XT3D option of the NPF Package available to represent full three-dimensional anisotropy in groundwater flow. XT3D can be computationally expensive and can be turned off to use a simplified and approximate form of the dispersion equations. For most problems, however, XT3D will be required to accurately represent dispersion.

\vspace{5mm}
\subsubsection{Structure of Blocks}
\lstinputlisting[style=blockdefinition]{./mf6ivar/tex/gwe-dsp-options.dat}
\lstinputlisting[style=blockdefinition]{./mf6ivar/tex/gwe-dsp-griddata.dat}

\vspace{5mm}
\subsubsection{Explanation of Variables}
\begin{description}
\input{./mf6ivar/tex/gwe-dsp-desc.tex}
\end{description}

\vspace{5mm}
\subsubsection{Example Input File}
\lstinputlisting[style=inputfile]{./mf6ivar/examples/gwe-dsp-example.dat}

Loading