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

Jump to bottom

feat(GWE): Groundwater Energy Transport #1237

Closed
wants to merge 278 commits into from
Closed

feat(GWE): Groundwater Energy Transport #1237

wants to merge 278 commits into from
This pull request is big! We’re only showing the most recent 250 commits.

Commits on Jul 26, 2022

  1. Merge branch 'develop' into gwe

    @emorway-usgs
    emorway-usgs committed Jul 26, 2022
    Configuration menu
    Copy the full SHA
    e5921d0 View commit details
    Browse the repository at this point in the history

Commits on Jul 27, 2022

  1. Some minor clean-up in SSM

    @emorway-usgs
    emorway-usgs committed Jul 27, 2022
    Configuration menu
    Copy the full SHA
    71b79d6 View commit details
    Browse the repository at this point in the history

Commits on Jul 28, 2022

  1. Drafted new modules GwfVscModule and GwfVscInputDataModule

    @aprovost-usgs
    aprovost-usgs committed Jul 28, 2022
    Configuration menu
    Copy the full SHA
    1eeb002 View commit details
    Browse the repository at this point in the history

  2. Adding some options to VSC OPTIONS block; minor tweaks to some of the… 

    … docstrings
    @emorway-usgs
    emorway-usgs committed Jul 28, 2022
    Configuration menu
    Copy the full SHA
    7978763 View commit details
    Browse the repository at this point in the history

Commits on Jul 29, 2022

  1. * Added ikmod flag to npf to indicate whether Ks get modified from th… 

    …eir input values (e.g., by vsc)

* Added invsc unit number for vsc in gwf
* Added calls to vsc routine (e.g., vsc_ad) from gwf routines
    @aprovost-usgs
    aprovost-usgs committed Jul 29, 2022
    Configuration menu
    Copy the full SHA
    0e58924 View commit details
    Browse the repository at this point in the history

  2. About to rectify my local changes with what Alden just pushed, commit… 

    …ting to see if git will figure out the conflicts on its own
    @emorway-usgs
    emorway-usgs committed Jul 29, 2022
    Configuration menu
    Copy the full SHA
    4bc36fa View commit details
    Browse the repository at this point in the history

  3. Merge branch 'gwe' of github.com:emorway-usgs/modflow6 into gwe

    @emorway-usgs
    emorway-usgs committed Jul 29, 2022
    Configuration menu
    Copy the full SHA
    ec45d48 View commit details
    Browse the repository at this point in the history

  4. In GwfVscModule: 

    * Added store_warning to the list of  SimModule procedures used
* Pending another approach to identifying a temperature "species", commented out the two lines that refer to GwfModelType to avoid circular dependency
    @aprovost-usgs
    aprovost-usgs committed Jul 29, 2022
    Configuration menu
    Copy the full SHA
    1d61697 View commit details
    Browse the repository at this point in the history

Commits on Jul 30, 2022

  1. Fixed issue that was preventing solution from building (basically the… 

    … same fixes as what Alden came up with), plus a work around for how to set istmpr (short for "is temperature"; a way to flag that the species being pointed to is infact a temperature species.
    @emorway-usgs
    emorway-usgs committed Jul 30, 2022
    Configuration menu
    Copy the full SHA
    71c6681 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'gwe' of github.com:emorway-usgs/modflow6 into gwe 

    # Conflicts:
#	src/Model/GroundWaterFlow/gwf3vsc8.f90
    @emorway-usgs
    emorway-usgs committed Jul 30, 2022
    Configuration menu
    Copy the full SHA
    d59deec View commit details
    Browse the repository at this point in the history

Commits on Aug 3, 2022

  1. Some relatively minor alterations and clean-ups in VSC based on consu… 

    …lt with Chris & Alden
    @emorway-usgs
    emorway-usgs committed Aug 3, 2022
    Configuration menu
    Copy the full SHA
    84b9e9d View commit details
    Browse the repository at this point in the history

Commits on Aug 8, 2022

  1. Merge branch 'develop' into gwe

    @emorway-usgs
    emorway-usgs committed Aug 8, 2022
    Configuration menu
    Copy the full SHA
    cc19de4 View commit details
    Browse the repository at this point in the history

Commits on Aug 10, 2022

  1. More work on VSC package, including a .dfn file and start of a single… 

    … species test problem.
    @emorway-usgs
    emorway-usgs committed Aug 10, 2022
    Configuration menu
    Copy the full SHA
    d02d57c View commit details
    Browse the repository at this point in the history

Commits on Aug 12, 2022

  1. Merge branch 'develop' into gwe

    @emorway-usgs
    emorway-usgs committed Aug 12, 2022
    Configuration menu
    Copy the full SHA
    7d38f98 View commit details
    Browse the repository at this point in the history

Commits on Aug 22, 2022

  1. Merge branch 'develop' into gwe

    @emorway-usgs
    emorway-usgs committed Aug 22, 2022
    Configuration menu
    Copy the full SHA
    e6488bd View commit details
    Browse the repository at this point in the history

Commits on Sep 7, 2022

  1. updating work on vsc package

    @emorway-usgs
    emorway-usgs committed Sep 7, 2022
    Configuration menu
    Copy the full SHA
    19e3d3b View commit details
    Browse the repository at this point in the history

  2. Merge branch 'develop' into gwe 

    # Conflicts:
#	src/Model/Connection/GwtInterfaceModel.f90
#	src/Model/GroundWaterFlow/gwf3npf8.f90
    @emorway-usgs
    emorway-usgs committed Sep 7, 2022
    Configuration menu
    Copy the full SHA
    9f7d9d8 View commit details
    Browse the repository at this point in the history

Commits on Sep 12, 2022

  1. Merge branch 'develop' into gwe

    @emorway-usgs
    emorway-usgs committed Sep 12, 2022
    Configuration menu
    Copy the full SHA
    3ce72a2 View commit details
    Browse the repository at this point in the history

Commits on Sep 13, 2022

  1. Merge branch 'develop' into gwe

    @emorway-usgs
    emorway-usgs committed Sep 13, 2022
    Configuration menu
    Copy the full SHA
    902f235 View commit details
    Browse the repository at this point in the history

  2. A couple of relatively minor changes to go along with changes made on… 

    … the current 'develop' branch
    @emorway-usgs
    emorway-usgs committed Sep 13, 2022
    Configuration menu
    Copy the full SHA
    1ac4914 View commit details
    Browse the repository at this point in the history

  3. Some relatively minor changes to go along with changes made on the mf… 

    …6 'develop' branch (stuff in this commit should have been included in the previous commit)
    @emorway-usgs
    emorway-usgs committed Sep 13, 2022
    Configuration menu
    Copy the full SHA
    ced1b3d View commit details
    Browse the repository at this point in the history

  4. Accounting for viscosity in the basic boundary packages (DRN, RIV, GHB)

    @emorway-usgs
    emorway-usgs committed Sep 13, 2022
    Configuration menu
    Copy the full SHA
    678c2ae View commit details
    Browse the repository at this point in the history

Commits on Sep 21, 2022

  1. Merge branch 'develop' into gwe

    @emorway-usgs
    emorway-usgs committed Sep 21, 2022
    Configuration menu
    Copy the full SHA
    a6ef0cf View commit details
    Browse the repository at this point in the history

  2. commit LAK for resolving conflicts

    @emorway-usgs
    emorway-usgs committed Sep 21, 2022
    Configuration menu
    Copy the full SHA
    352f035 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'gwe' of github.com:emorway-usgs/modflow6 into gwe

    @emorway-usgs
    emorway-usgs committed Sep 21, 2022
    Configuration menu
    Copy the full SHA
    2529050 View commit details
    Browse the repository at this point in the history

Commits on Sep 22, 2022

  1. Merge branch 'develop' into gwe

    @emorway-usgs
    emorway-usgs committed Sep 22, 2022
    Configuration menu
    Copy the full SHA
    a7b7a8f View commit details
    Browse the repository at this point in the history

  2. Merge branch 'gwe' of github.com:emorway-usgs/modflow6 into gwe

    @emorway-usgs
    emorway-usgs committed Sep 22, 2022
    Configuration menu
    Copy the full SHA
    bdafa1e View commit details
    Browse the repository at this point in the history

  3. work on advanced packages w/ viscosity. Adding another example proble… 

    …m w/ SFR
    @emorway-usgs
    emorway-usgs committed Sep 22, 2022
    Configuration menu
    Copy the full SHA
    79027b8 View commit details
    Browse the repository at this point in the history

Commits on Sep 25, 2022

  1. Merge branch 'develop' into gwe

    @emorway-usgs
    emorway-usgs committed Sep 25, 2022
    Configuration menu
    Copy the full SHA
    99bddcc View commit details
    Browse the repository at this point in the history

Commits on Sep 26, 2022

  1. Work on mf6io.tex documentation related to VSC package input

    @emorway-usgs
    emorway-usgs committed Sep 26, 2022
    Configuration menu
    Copy the full SHA
    d6a184d View commit details
    Browse the repository at this point in the history

  2. Merge branch 'gwe' of github.com:emorway-usgs/modflow6 into gwe

    @emorway-usgs
    emorway-usgs committed Sep 26, 2022
    Configuration menu
    Copy the full SHA
    3c7f691 View commit details
    Browse the repository at this point in the history

Commits on Oct 4, 2022

  1. Significant work on the mf6io latex docs. Builds out with VSC includ… 

    …ed as of this commit
    @emorway-usgs
    emorway-usgs committed Oct 4, 2022
    Configuration menu
    Copy the full SHA
    fc3b642 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'develop' into gwe 

    # Conflicts:
#	src/Model/GroundWaterFlow/gwf3npf8.f90
    @emorway-usgs
    emorway-usgs committed Oct 4, 2022
    Configuration menu
    Copy the full SHA
    151788b View commit details
    Browse the repository at this point in the history

  3. reinstating NPF changes (related to VSC) that were lost when getting … 

    …caught up with "upstream" repo
    @emorway-usgs
    emorway-usgs committed Oct 4, 2022
    Configuration menu
    Copy the full SHA
    a407169 View commit details
    Browse the repository at this point in the history

Commits on Oct 12, 2022

  1. Some code updates and some work on example problems.

    @emorway-usgs
    emorway-usgs committed Oct 12, 2022
    Configuration menu
    Copy the full SHA
    f2efad9 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'develop' into gwe 

    # Conflicts:
#	msvs/mf6core.vfproj
#	src/Exchange/GwtGwtExchange.f90
#	src/Model/Connection/GwfInterfaceModel.f90
#	src/Model/GroundWaterFlow/gwf3npf8.f90
#	src/Model/ModelUtilities/GwfNpfGridData.f90
#	src/SimulationCreate.f90
    @emorway-usgs
    emorway-usgs committed Oct 12, 2022
    Configuration menu
    Copy the full SHA
    2496ac0 View commit details
    Browse the repository at this point in the history

  3. For some reason, this file wasn't in my fork (but should've been)

    @emorway-usgs
    emorway-usgs committed Oct 12, 2022
    Configuration menu
    Copy the full SHA
    227da2e View commit details
    Browse the repository at this point in the history

  4. Need to restore a change that was lost during a merge conflict

    @emorway-usgs
    emorway-usgs committed Oct 12, 2022
    Configuration menu
    Copy the full SHA
    5ca9daf View commit details
    Browse the repository at this point in the history

Commits on Oct 13, 2022

  1. Resolving some more losses that were experienced in the last merge co… 

    …mmit
    @emorway-usgs
    emorway-usgs committed Oct 13, 2022
    Configuration menu
    Copy the full SHA
    933f3d4 View commit details
    Browse the repository at this point in the history

Commits on Oct 17, 2022

  1. Updates to vsc.tex based on Alden's review

    @emorway-usgs
    emorway-usgs committed Oct 17, 2022
    Configuration menu
    Copy the full SHA
    971e784 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'develop' into gwe 

    # Conflicts:
#	msvs/mf6core.vfproj
#	src/Model/Connection/GwtInterfaceModel.f90
#	src/Model/GroundWaterTransport/gwt1dsp1.f90
    @emorway-usgs
    emorway-usgs committed Oct 17, 2022
    Configuration menu
    Copy the full SHA
    ef4685d View commit details
    Browse the repository at this point in the history

  3. Resolving some losses that were experienced in the last merge commit

    @emorway-usgs
    emorway-usgs committed Oct 17, 2022
    Configuration menu
    Copy the full SHA
    5ff49f5 View commit details
    Browse the repository at this point in the history

Commits on Oct 19, 2022

  1. Resolving lots of issues post PR MODFLOW-USGS#1059 that should've bee… 

    …n caught earlier, but somehow were not. In any event, I think GWE exchanges once again mirror GWT exchanges. My fork is compiling again.
    @emorway-usgs
    emorway-usgs committed Oct 19, 2022
    Configuration menu
    Copy the full SHA
    03f3801 View commit details
    Browse the repository at this point in the history

Commits on Nov 16, 2022

  1. Merge branch 'develop' into gwe 

    # Conflicts:
#	doc/mf6io/gwf/vsc.tex
#	doc/mf6io/mf6ivar/dfn/gwf-vsc.dfn
#	doc/mf6io/mf6ivar/examples/gwf-vsc-example.dat
#	doc/mf6io/mf6ivar/md/mf6ivar.md
#	doc/mf6io/mf6ivar/tex/gwf-vsc-desc.tex
#	doc/mf6io/mf6ivar/tex/gwf-vsc-options.dat
#	msvs/mf6core.vfproj
#	src/Model/GroundWaterFlow/gwf3.f90
#	src/Model/GroundWaterFlow/gwf3lak8.f90
#	src/Model/GroundWaterFlow/gwf3maw8.f90
#	src/Model/GroundWaterFlow/gwf3npf8.f90
#	src/Model/GroundWaterFlow/gwf3sfr8.f90
#	src/Model/GroundWaterFlow/gwf3vsc8.f90
#	src/Model/ModelUtilities/BoundaryPackage.f90
#	src/Model/ModelUtilities/GwfVscInputData.f90
    @emorway-usgs
    emorway-usgs committed Nov 16, 2022
    Configuration menu
    Copy the full SHA
    92ed035 View commit details
    Browse the repository at this point in the history

Commits on Nov 23, 2022

  1. Upload GWE-related definition files (.dfn)

    @emorway-usgs
    emorway-usgs committed Nov 23, 2022
    Configuration menu
    Copy the full SHA
    34a411b View commit details
    Browse the repository at this point in the history

Commits on Nov 30, 2022

  1. Merge branch 'develop' into gwe

    @emorway-usgs
    emorway-usgs committed Nov 30, 2022
    Configuration menu
    Copy the full SHA
    ef6e41f View commit details
    Browse the repository at this point in the history

  2. File updates to account for new IDM in GWE's DSP package (DSP was IDM… 

    …'d in GWT)
    @emorway-usgs
    emorway-usgs committed Nov 30, 2022
    Configuration menu
    Copy the full SHA
    857bab4 View commit details
    Browse the repository at this point in the history

  3. A change to avoid warning messages generated by IDM related to the GW… 

    …E/DSP (a change I should've made previously)
    @emorway-usgs
    emorway-usgs committed Nov 30, 2022
    Configuration menu
    Copy the full SHA
    5a40f13 View commit details
    Browse the repository at this point in the history

  4. fprettify (for gfortran-compliant formatting, I hope)

    @emorway-usgs
    emorway-usgs committed Nov 30, 2022
    Configuration menu
    Copy the full SHA
    efccc6b View commit details
    Browse the repository at this point in the history

Commits on Dec 1, 2022

  1. Merge branch 'develop' into gwe

    @emorway-usgs
    emorway-usgs committed Dec 1, 2022
    Configuration menu
    Copy the full SHA
    6797b77 View commit details
    Browse the repository at this point in the history

Commits on Dec 2, 2022

  1. An early GWE autotest

    @emorway-usgs
    emorway-usgs committed Dec 2, 2022
    Configuration menu
    Copy the full SHA
    7faa5e2 View commit details
    Browse the repository at this point in the history

Commits on Dec 4, 2022

  1. Merge branch 'develop' into gwe

    @emorway-usgs
    emorway-usgs committed Dec 4, 2022
    Configuration menu
    Copy the full SHA
    65d9f1c View commit details
    Browse the repository at this point in the history

Commits on Dec 5, 2022

  1. These tests have been superceded by those pushed with the VSC PR

    @emorway-usgs
    emorway-usgs committed Dec 5, 2022
    Configuration menu
    Copy the full SHA
    dc4cc0f View commit details
    Browse the repository at this point in the history

Commits on Dec 6, 2022

  1. First autotest should be working better now.

    @emorway-usgs
    emorway-usgs committed Dec 6, 2022
    Configuration menu
    Copy the full SHA
    557adad View commit details
    Browse the repository at this point in the history

  2. Add stallman analysis

    Chieh Ying Chen committed Dec 6, 2022
    Configuration menu
    Copy the full SHA
    485a65f View commit details
    Browse the repository at this point in the history

  3. Generalizing advanced package transport for extending its use in GWE

    @emorway-usgs
    emorway-usgs committed Dec 6, 2022
    Configuration menu
    Copy the full SHA
    fb3e67d View commit details
    Browse the repository at this point in the history

  4. Merge branch 'develop' into gwe

    @emorway-usgs
    emorway-usgs committed Dec 6, 2022
    Configuration menu
    Copy the full SHA
    3b8f666 View commit details
    Browse the repository at this point in the history

Commits on Dec 14, 2022

  1. Some more .dfn file stuff

    @emorway-usgs
    emorway-usgs committed Dec 14, 2022
    Configuration menu
    Copy the full SHA
    640f322 View commit details
    Browse the repository at this point in the history

Commits on Dec 16, 2022

  1. ran black on Cindy's Stallman script

    @emorway-usgs
    emorway-usgs committed Dec 16, 2022
    Configuration menu
    Copy the full SHA
    7a6917e View commit details
    Browse the repository at this point in the history

Commits on Jan 2, 2023

  1. Some more work on labeling of units

    @emorway-usgs
    emorway-usgs committed Jan 2, 2023
    Configuration menu
    Copy the full SHA
    ab9dc6b View commit details
    Browse the repository at this point in the history

Commits on Jan 3, 2023

  1. Some labeling touch-up

    @emorway-usgs
    emorway-usgs committed Jan 3, 2023
    Configuration menu
    Copy the full SHA
    e9f049d View commit details
    Browse the repository at this point in the history

  2. minor touch-up

    @emorway-usgs
    emorway-usgs committed Jan 3, 2023
    Configuration menu
    Copy the full SHA
    bb73dc2 View commit details
    Browse the repository at this point in the history

  3. more labeling touch-up

    @emorway-usgs
    emorway-usgs committed Jan 3, 2023
    Configuration menu
    Copy the full SHA
    8646ba7 View commit details
    Browse the repository at this point in the history

Commits on Jan 5, 2023

  1. Merge branch 'develop' into gwe 

    # Conflicts:
#	src/Model/GroundWaterTransport/gwt1.f90
#	src/Model/GroundWaterTransport/gwt1sft1.f90
#	src/Model/GroundWaterTransport/tsp1adv1.f90
#	src/Model/GroundWaterTransport/tsp1fmi1.f90
#	src/Model/GroundWaterTransport/tsp1ssm1.f90
    @emorway-usgs
    emorway-usgs committed Jan 5, 2023
    Configuration menu
    Copy the full SHA
    50cf110 View commit details
    Browse the repository at this point in the history

Commits on Jan 6, 2023

  1. resolving GHB conflict after merging codes

    @emorway-usgs
    emorway-usgs committed Jan 6, 2023
    Configuration menu
    Copy the full SHA
    b2a16b7 View commit details
    Browse the repository at this point in the history

  2. manual resolution of conflicts in LAK after updating GWE branch

    @emorway-usgs
    emorway-usgs committed Jan 6, 2023
    Configuration menu
    Copy the full SHA
    eb7635c View commit details
    Browse the repository at this point in the history

  3. manual resolution of conflicts in MAW after updating GWE branch

    @emorway-usgs
    emorway-usgs committed Jan 6, 2023
    Configuration menu
    Copy the full SHA
    72fe506 View commit details
    Browse the repository at this point in the history

  4. manual resolution of conflicts in GWT.f90 after updating GWE branch

    @emorway-usgs
    emorway-usgs committed Jan 6, 2023
    Configuration menu
    Copy the full SHA
    a6a36ee View commit details
    Browse the repository at this point in the history

  5. manual resolution of conflicts in tsp1adv1.f90 after updating GWE bra… 

    …nch (previously named gwt1adv1.f90)
    @emorway-usgs
    emorway-usgs committed Jan 6, 2023
    Configuration menu
    Copy the full SHA
    05cc7f6 View commit details
    Browse the repository at this point in the history

  6. manual resolution of conflicts in tsp1apt1.f90 after updating GWE bra… 

    …nch (previously named gwt1apt1.f90)
    @emorway-usgs
    emorway-usgs committed Jan 6, 2023
    Configuration menu
    Copy the full SHA
    14682de View commit details
    Browse the repository at this point in the history

  7. manual resolution of conflicts in tsp1ssm1.f90 after updating GWE bra… 

    …nch (previously named gwt1ssm1.f90)
    @emorway-usgs
    emorway-usgs committed Jan 6, 2023
    Configuration menu
    Copy the full SHA
    6a4e081 View commit details
    Browse the repository at this point in the history

  8. manual resolution of conflicts in BoundaryPackage.f90 after updating … 

    …GWE branch
    @emorway-usgs
    emorway-usgs committed Jan 6, 2023
    Configuration menu
    Copy the full SHA
    0820937 View commit details
    Browse the repository at this point in the history

  9. manual resolution of conflicts in mf6core.vfproj after updating GWE b… 

    …ranch
    @emorway-usgs
    emorway-usgs committed Jan 6, 2023
    Configuration menu
    Copy the full SHA
    5b0eb33 View commit details
    Browse the repository at this point in the history

  10. Merge branch 'gwe' of github.com:emorway-usgs/modflow6 into gwe 

    # Conflicts:
#	src/Model/GroundWaterTransport/tsp1adv1.f90
#	src/Model/GroundWaterTransport/tsp1ssm1.f90
    @emorway-usgs
    emorway-usgs committed Jan 6, 2023
    Configuration menu
    Copy the full SHA
    179431e View commit details
    Browse the repository at this point in the history

Commits on Jan 7, 2023

  1. Had to get GweGweExchange.f90 and GweGweConnection.f90 caught up afte… 

    …r getting GWE code base caught up with main deevelop branch
    @emorway-usgs
    emorway-usgs committed Jan 7, 2023
    Configuration menu
    Copy the full SHA
    8e530c2 View commit details
    Browse the repository at this point in the history

  2. Resolution of some code that got mangled in the update merge. Some of… 

    … the generalized transport module naming was undone as well as some of the generalized labels module referencing. Seems to be working now
    @emorway-usgs
    emorway-usgs committed Jan 7, 2023
    Configuration menu
    Copy the full SHA
    e4784b0 View commit details
    Browse the repository at this point in the history

  3. GWE needs the MatrixModule updates that were applied to GWT in MODFLO… 

    …W-USGS#1078
    @emorway-usgs
    emorway-usgs committed Jan 7, 2023
    Configuration menu
    Copy the full SHA
    b0ef8e5 View commit details
    Browse the repository at this point in the history

  4. checking a couple of files that are still under construction but comp… 

    …ile.
    @emorway-usgs
    emorway-usgs committed Jan 7, 2023
    Configuration menu
    Copy the full SHA
    311ff68 View commit details
    Browse the repository at this point in the history

Commits on Jan 10, 2023

  1. clean-out bad code

    @emorway-usgs
    emorway-usgs committed Jan 10, 2023
    Configuration menu
    Copy the full SHA
    a58d5be View commit details
    Browse the repository at this point in the history

Commits on Jan 26, 2023

  1. XT3D changes necessary for conduction through solid matrix material

    @emorway-usgs
    emorway-usgs committed Jan 26, 2023
    Configuration menu
    Copy the full SHA
    60879c4 View commit details
    Browse the repository at this point in the history

  2. Preliminary work on latent heat associated with evaporation from the … 

    …surface of a water body
    @emorway-usgs
    emorway-usgs committed Jan 26, 2023
    Configuration menu
    Copy the full SHA
    15b2e79 View commit details
    Browse the repository at this point in the history

  3. Another latent heat change

    @emorway-usgs
    emorway-usgs committed Jan 26, 2023
    Configuration menu
    Copy the full SHA
    1f6b3de View commit details
    Browse the repository at this point in the history

  4. Address minor items related to the Labels module

    @emorway-usgs
    emorway-usgs committed Jan 26, 2023
    Configuration menu
    Copy the full SHA
    305f951 View commit details
    Browse the repository at this point in the history

  5. Changes related to conduction through dry cells

    @emorway-usgs
    emorway-usgs committed Jan 26, 2023
    Configuration menu
    Copy the full SHA
    f781e14 View commit details
    Browse the repository at this point in the history

  6. Changes I've been reluctant to push because it will all need to get b… 

    …acked out once the units issue is resolved
    @emorway-usgs
    emorway-usgs committed Jan 26, 2023
    Configuration menu
    Copy the full SHA
    55a94f6 View commit details
    Browse the repository at this point in the history

Commits on Jan 27, 2023

  1. gweSrc.f90 had slipped out of my solution and was behind. Readded to … 

    …sln and getting it caught up
    @emorway-usgs
    emorway-usgs committed Jan 27, 2023
    Configuration menu
    Copy the full SHA
    659b9c9 View commit details
    Browse the repository at this point in the history

Commits on Jan 30, 2023

  1. Implemented idryinactive flag wrong. Correcting to something that mak… 

    …es more sense. Related to f781e14
    @emorway-usgs
    emorway-usgs committed Jan 30, 2023
    Configuration menu
    Copy the full SHA
    54402a4 View commit details
    Browse the repository at this point in the history

Commits on Mar 1, 2023

  1. need to simplify changes

    @emorway-usgs
    emorway-usgs committed Mar 1, 2023
    Configuration menu
    Copy the full SHA
    d021c75 View commit details
    Browse the repository at this point in the history

Commits on Mar 2, 2023

  1. More fixes

    @emorway-usgs
    emorway-usgs committed Mar 2, 2023
    Configuration menu
    Copy the full SHA
    6f6a0bf View commit details
    Browse the repository at this point in the history

  2. I thought these 'undo' changes had already been committed

    @emorway-usgs
    emorway-usgs committed Mar 2, 2023
    Configuration menu
    Copy the full SHA
    6404ae0 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'gwe_detour' into gwe

    @emorway-usgs
    emorway-usgs committed Mar 2, 2023
    Configuration menu
    Copy the full SHA
    78961f5 View commit details
    Browse the repository at this point in the history

  4. Fixing a bug introduced while working on the GWE code. Bug found whil… 

    …e running a GWT model with the latest modifications
    @emorway-usgs
    emorway-usgs committed Mar 2, 2023
    Configuration menu
    Copy the full SHA
    78d6b16 View commit details
    Browse the repository at this point in the history

Commits on Mar 4, 2023

  1. committing first draft of uze before getting on the road

    @emorway-usgs
    emorway-usgs committed Mar 4, 2023
    Configuration menu
    Copy the full SHA
    e0c9ad6 View commit details
    Browse the repository at this point in the history

Commits on Mar 15, 2023

  1. Updates on UZE indexing

    @emorway-usgs
    emorway-usgs committed Mar 15, 2023
    Configuration menu
    Copy the full SHA
    5eeb582 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'uze' into gwe

    @emorway-usgs
    emorway-usgs committed Mar 15, 2023
    Configuration menu
    Copy the full SHA
    134a47f View commit details
    Browse the repository at this point in the history

Commits on Mar 16, 2023

  1. Pushing some loose-ends

    @emorway-usgs
    emorway-usgs committed Mar 16, 2023
    Configuration menu
    Copy the full SHA
    a998aa2 View commit details
    Browse the repository at this point in the history

  2. * removed nonexistent file LatHeatVapor.f90 from msvs project 

    * fixed subscript in setting of unitadj in CNC
    @aprovost-usgs
    aprovost-usgs committed Mar 16, 2023
    Configuration menu
    Copy the full SHA
    552fb7e View commit details
    Browse the repository at this point in the history

Commits on Mar 22, 2023

  1. Some updates to the .dfn files associated with MST alterations and th… 

    …e addition of support for UZE
    @emorway-usgs
    emorway-usgs committed Mar 22, 2023
    Configuration menu
    Copy the full SHA
    999a510 View commit details
    Browse the repository at this point in the history

Commits on Mar 23, 2023

  1. Remove Cpw and Rhow from BoundaryPackage.f90. Both vars moved to new … 

    …module located in src/Model/ModelUtilities
    @emorway-usgs
    emorway-usgs committed Mar 23, 2023
    Configuration menu
    Copy the full SHA
    2f76c54 View commit details
    Browse the repository at this point in the history

Commits on Mar 27, 2023

  1. Updates to energy src loading package for GWE

    @emorway-usgs
    emorway-usgs committed Mar 27, 2023
    Configuration menu
    Copy the full SHA
    5ddb427 View commit details
    Browse the repository at this point in the history

Commits on Apr 4, 2023

  1. * Programmed uze budget calculations. This involved some relatively m… 

    …inor changes to apt, and very minor changes to the other advanced packages, as well.

*  Note that in the uze budget there are separate line items for recharge to the water table and thermal equilibration (two kinds of interaction with the gwe cell).  In the gwe cell budget, those are combined in one uze line item.
*  Cleaned up application (or not) of unitadj in various heat-transport packages; in some places simply left notes about needed changes
*  Note that budget calculations in heat-transport packages other than uze do not all necessarily apply unitadj as needed yet.  Uze overrides some apt budget routines so it can call them and then multiply the result by unitadj, which was minimally invasive to apt.  But we'll want to go ahead and make unitadj avaiable to apt (perhaps as "ratefactor") and apply it directly there instead.  For solute transport, ratefactor will simply be 1.
    @aprovost-usgs
    aprovost-usgs committed Apr 4, 2023
    Configuration menu
    Copy the full SHA
    0768283 View commit details
    Browse the repository at this point in the history

Commits on Apr 5, 2023

  1. * Replaced unitadj with eqnsclfac (governing equaiton scale factor), … 

    …which now originates in TransportModel, is given the appropriate value by gwt and gwe, and is passed (via pointers) to the packages that use it

* Some minor eqnsclfac issue remain (marked with kluge notes), and not certain all packages that need eqnsclfac have it yet - need to check
* Refactored thermal-equilibration term calculations in terms of an updated/fixed subroutine uze_theq_term
    @aprovost-usgs
    aprovost-usgs committed Apr 5, 2023
    Configuration menu
    Copy the full SHA
    277fe6f View commit details
    Browse the repository at this point in the history

  2. * Got rid of the overriding subroutines in uze that existed solely to… 

    … apply the scale factor and now have apt apply the scale factor directly
    @aprovost-usgs
    aprovost-usgs committed Apr 5, 2023
    Configuration menu
    Copy the full SHA
    f8ed4f9 View commit details
    Browse the repository at this point in the history

Commits on Apr 6, 2023

  1. Some preliminary work on LKE

    @emorway-usgs
    emorway-usgs committed Apr 6, 2023
    Configuration menu
    Copy the full SHA
    1de53f3 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'gwe' of https://github.com/emorway-usgs/modflow6 into gwe

    @emorway-usgs
    emorway-usgs committed Apr 6, 2023
    Configuration menu
    Copy the full SHA
    0ccb8e6 View commit details
    Browse the repository at this point in the history

Commits on Apr 7, 2023

  1. Add clarity to common.dfn about maximum auxiliary variable name length

    @emorway-usgs
    emorway-usgs committed Apr 7, 2023
    Configuration menu
    Copy the full SHA
    d8121fa View commit details
    Browse the repository at this point in the history

Commits on Apr 12, 2023

  1. * Refactored heat transport such that governing eqn is NOT divided th… 

    …rough by rhow*cpw

* Other scale-factor-related updates in gwe packages; not all packages are done but most are
* No testing other than our two uze example variants - will need to put all packages through their paces
    @aprovost-usgs
    aprovost-usgs committed Apr 12, 2023
    Configuration menu
    Copy the full SHA
    7667d32 View commit details
    Browse the repository at this point in the history

  2. * Made what should be all the remaining (at least for now) scale-fact… 

    …or-related updates in heat-transport packages

* As noted earlier, thorough testing is needed
    @aprovost-usgs
    aprovost-usgs committed Apr 12, 2023
    Configuration menu
    Copy the full SHA
    bf9a52a View commit details
    Browse the repository at this point in the history

Commits on Apr 13, 2023

  1. * Programmed streambed conduction terms into formulate and budget in sfe 

    * Thermal conductance is not yet calculated and is temporarily set to zero, so the new terms currently should have no effect on the solution
* Compiles and runs, but haven't tried a test that uses sfe
    @aprovost-usgs
    aprovost-usgs committed Apr 13, 2023
    Configuration menu
    Copy the full SHA
    69a4ad5 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'develop' into gwe 

    # Conflicts:
#	msvs/mf6core.vfproj
#	src/Exchange/GwtGwtExchange.f90
#	src/Model/Connection/CellWithNbrs.f90
#	src/Model/Connection/GwtInterfaceModel.f90
#	src/Model/GroundWaterTransport/gwt1.f90
#	src/Model/GroundWaterTransport/gwt1dsp1.f90
#	src/Model/GroundWaterTransport/gwt1sft1.f90
#	src/Model/GroundWaterTransport/tsp1adv1.f90
#	src/Model/GroundWaterTransport/tsp1cnc1.f90
#	src/Model/GroundWaterTransport/tsp1fmi1.f90
#	src/SimulationCreate.f90
#	src/Utilities/Idm/InputDefinitionSelector.f90
    @emorway-usgs
    emorway-usgs committed Apr 13, 2023
    Configuration menu
    Copy the full SHA
    fce44d4 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'develop' into gwe

    @emorway-usgs
    emorway-usgs committed Apr 13, 2023
    Configuration menu
    Copy the full SHA
    147206f View commit details
    Browse the repository at this point in the history

Commits on Apr 17, 2023

  1. minor fixes post GWE/develop merge. More fixes needed.

    @emorway-usgs
    emorway-usgs committed Apr 17, 2023
    Configuration menu
    Copy the full SHA
    e8cb9d2 View commit details
    Browse the repository at this point in the history

  2. Revert "* Programmed streambed conduction terms into formulate and bu… 

    …dget in sfe"

This reverts commit 69a4ad5.
    @aprovost-usgs
    aprovost-usgs committed Apr 17, 2023
    Configuration menu
    Copy the full SHA
    93408b4 View commit details
    Browse the repository at this point in the history

  3. Revert "* Made what should be all the remaining (at least for now) sc… 

    …ale-factor-related updates in heat-transport packages"

This reverts commit bf9a52a.
    @aprovost-usgs
    aprovost-usgs committed Apr 17, 2023
    Configuration menu
    Copy the full SHA
    c6333df View commit details
    Browse the repository at this point in the history

  4. Merge branch 'gwe' of github.com:emorway-usgs/modflow6 into gwe

    @aprovost-usgs
    aprovost-usgs committed Apr 17, 2023
    Configuration menu
    Copy the full SHA
    008e0ef View commit details
    Browse the repository at this point in the history

  5. * Temporary workaround in idm-related syntax for the sake of old Inte… 

    …l compiler compatibility

* Redo scale-factor related updates that were in two recently reversed commits
    @aprovost-usgs
    aprovost-usgs committed Apr 17, 2023
    Configuration menu
    Copy the full SHA
    d06ef65 View commit details
    Browse the repository at this point in the history

Commits on Apr 18, 2023

  1. More post-merge reconciliation

    @emorway-usgs
    emorway-usgs committed Apr 18, 2023
    Configuration menu
    Copy the full SHA
    64835e0 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'develop' into gwe

    @emorway-usgs
    emorway-usgs committed Apr 18, 2023
    Configuration menu
    Copy the full SHA
    e3a15c6 View commit details
    Browse the repository at this point in the history

  3. GWE support in idm

    @emorway-usgs
    emorway-usgs committed Apr 18, 2023
    Configuration menu
    Copy the full SHA
    a427d9f View commit details
    Browse the repository at this point in the history

  4. More reconciliation post gwe/develop merge catch-up

    @emorway-usgs
    emorway-usgs committed Apr 18, 2023
    Configuration menu
    Copy the full SHA
    e029f58 View commit details
    Browse the repository at this point in the history

  5. Some IDM related updates for running GWE autotests with the post upda… 

    …te-merge GWE code base
    @emorway-usgs
    emorway-usgs committed Apr 18, 2023
    Configuration menu
    Copy the full SHA
    14cf908 View commit details
    Browse the repository at this point in the history

  6. Update to a GWE autotest

    @emorway-usgs
    emorway-usgs committed Apr 18, 2023
    Configuration menu
    Copy the full SHA
    00a64b9 View commit details
    Browse the repository at this point in the history

  7. Merge branch 'develop' into gwe

    @emorway-usgs
    emorway-usgs committed Apr 18, 2023
    Configuration menu
    Copy the full SHA
    40a61f7 View commit details
    Browse the repository at this point in the history

  8. Virtual gwe model support (not sure how I was able to run the autotes… 

    …ts before)
    @emorway-usgs
    emorway-usgs committed Apr 18, 2023
    Configuration menu
    Copy the full SHA
    c6c2d01 View commit details
    Browse the repository at this point in the history

  9. Merge branch 'develop' into gwe

    @emorway-usgs
    emorway-usgs committed Apr 18, 2023
    Configuration menu
    Copy the full SHA
    df7e228 View commit details
    Browse the repository at this point in the history

  10. More post gwe/develop merge debugging

    @emorway-usgs
    emorway-usgs committed Apr 18, 2023
    Configuration menu
    Copy the full SHA
    1d2c28e View commit details
    Browse the repository at this point in the history

  11. Merge branch 'gwe' of github.com:emorway-usgs/modflow6 into gwe

    @emorway-usgs
    emorway-usgs committed Apr 18, 2023
    Configuration menu
    Copy the full SHA
    edbb106 View commit details
    Browse the repository at this point in the history

Commits on Apr 19, 2023

  1. Some more shuffling around of code between gwe.f90 & gwt.f90 and the … 

    …generalized transport class (transportModel.f90)
    @emorway-usgs
    emorway-usgs committed Apr 19, 2023
    Configuration menu
    Copy the full SHA
    46a015c View commit details
    Browse the repository at this point in the history

  2. IDM-related catch up on GWE branch

    @emorway-usgs
    emorway-usgs committed Apr 19, 2023
    Configuration menu
    Copy the full SHA
    740ec79 View commit details
    Browse the repository at this point in the history

  3. Testing framework syntax has been updated. Will need to do similar up… 

    …dates across all GWE autotests
    @emorway-usgs
    emorway-usgs committed Apr 19, 2023
    Configuration menu
    Copy the full SHA
    2d95c15 View commit details
    Browse the repository at this point in the history

  4. Even though GweDspGridData.f90 hasn't been a part of the .proj file f… 

    …or sometime, it was never removed from the repo
    @emorway-usgs
    emorway-usgs committed Apr 19, 2023
    Configuration menu
    Copy the full SHA
    6559433 View commit details
    Browse the repository at this point in the history

  5. 1 more IDM related change

    @emorway-usgs
    emorway-usgs committed Apr 19, 2023
    Configuration menu
    Copy the full SHA
    86c5530 View commit details
    Browse the repository at this point in the history

  6. Some virtual model changes while trying to track down the idiffc erro… 

    …r that's coming up in GWE. Even though idiffc doesn't exist in any of the GWE src file, the model is still looking for it in the virtual model stuff for some reason.
    @emorway-usgs
    emorway-usgs committed Apr 19, 2023
    Configuration menu
    Copy the full SHA
    d479d7b View commit details
    Browse the repository at this point in the history

  7. diffc not needed in GWE, removing from DSP .dfn file. Still doesn't s… 

    …olve current idiffc issue thrown by GWE
    @emorway-usgs
    emorway-usgs committed Apr 19, 2023
    Configuration menu
    Copy the full SHA
    5cd36ff View commit details
    Browse the repository at this point in the history

Commits on Apr 21, 2023

  1. Why this was like trying to find a piece of hay in a needle stack, I … 

    …don't know, but I had a difficult time tracking this one down.
    @emorway-usgs
    emorway-usgs committed Apr 21, 2023
    Configuration menu
    Copy the full SHA
    059cc71 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'develop' into gwe

    @emorway-usgs
    emorway-usgs committed Apr 21, 2023
    Configuration menu
    Copy the full SHA
    ed2de05 View commit details
    Browse the repository at this point in the history

Commits on May 3, 2023

  1. Merge branch 'develop' into gwe

    @emorway-usgs
    emorway-usgs committed May 3, 2023
    Configuration menu
    Copy the full SHA
    eaa814c View commit details
    Browse the repository at this point in the history

Commits on May 5, 2023

  1. Kts & Ktw should not necessitate alv/alh requirement

    @emorway-usgs
    emorway-usgs committed May 5, 2023
    Configuration menu
    Copy the full SHA
    1840f56 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'gwe' of github.com:emorway-usgs/modflow6 into gwe

    @emorway-usgs
    emorway-usgs committed May 5, 2023
    Configuration menu
    Copy the full SHA
    9d47df2 View commit details
    Browse the repository at this point in the history

  3. Was causing double allocation of variables at the transport model level

    @emorway-usgs
    emorway-usgs committed May 5, 2023
    Configuration menu
    Copy the full SHA
    8a0ce05 View commit details
    Browse the repository at this point in the history

Commits on May 16, 2023

  1. Merge branch 'develop' into gwe

    @emorway-usgs
    emorway-usgs committed May 16, 2023
    Configuration menu
    Copy the full SHA
    f5cba1c View commit details
    Browse the repository at this point in the history

  2. Check in some recent SFE changes after re-testing UZE autotest that w… 

    …as broken
    @emorway-usgs
    emorway-usgs committed May 16, 2023
    Configuration menu
    Copy the full SHA
    a17e2f6 View commit details
    Browse the repository at this point in the history

Commits on May 19, 2023

  1. * temporary idm syntax workaround for old Intel compiler 

    * fix calculation of THERMAL-EQUIL budget component in UZE
    @aprovost-usgs
    aprovost-usgs committed May 19, 2023
    Configuration menu
    Copy the full SHA
    cb9573d View commit details
    Browse the repository at this point in the history

  2. clean up some uze budget code

    @aprovost-usgs
    aprovost-usgs committed May 19, 2023
    Configuration menu
    Copy the full SHA
    cc13084 View commit details
    Browse the repository at this point in the history

  3. work on streambed conduction in sfe budget

    @aprovost-usgs
    aprovost-usgs committed May 19, 2023
    Configuration menu
    Copy the full SHA
    35c3b36 View commit details
    Browse the repository at this point in the history

  4. Some work on LKE

    @emorway-usgs
    emorway-usgs committed May 19, 2023
    Configuration menu
    Copy the full SHA
    2ce48fd View commit details
    Browse the repository at this point in the history

  5. Merge branch 'gwe' of github.com:emorway-usgs/modflow6 into gwe

    @emorway-usgs
    emorway-usgs committed May 19, 2023
    Configuration menu
    Copy the full SHA
    055cda4 View commit details
    Browse the repository at this point in the history

  6. Get the SFE example with conduction working again, fix a sign convens… 

    …ion sfe_fc_expanded for getting the correct groundwater temperature changes associated with conduction.
    @emorway-usgs
    emorway-usgs committed May 19, 2023
    Configuration menu
    Copy the full SHA
    aad427c View commit details
    Browse the repository at this point in the history

Commits on May 22, 2023

  1. Some fixes in SFE, get the LKE budget working correctly

    @emorway-usgs
    emorway-usgs committed May 22, 2023
    Configuration menu
    Copy the full SHA
    3b9d847 View commit details
    Browse the repository at this point in the history

Commits on May 23, 2023

  1. Dfn file modifications that need to be checked in

    @emorway-usgs
    emorway-usgs committed May 23, 2023
    Configuration menu
    Copy the full SHA
    ee47136 View commit details
    Browse the repository at this point in the history

  2. Some preliminary work on MWE

    @emorway-usgs
    emorway-usgs committed May 23, 2023
    Configuration menu
    Copy the full SHA
    0d92ea7 View commit details
    Browse the repository at this point in the history

  3. Get MWT caught up

    @emorway-usgs
    emorway-usgs committed May 23, 2023
    Configuration menu
    Copy the full SHA
    2087a12 View commit details
    Browse the repository at this point in the history

Commits on May 24, 2023

  1. Minor variable name cleanup

    @emorway-usgs
    emorway-usgs committed May 24, 2023
    Configuration menu
    Copy the full SHA
    b4191b7 View commit details
    Browse the repository at this point in the history

  2. Some fixes in MWE for getting the budget terms looking better

    @emorway-usgs
    emorway-usgs committed May 24, 2023
    Configuration menu
    Copy the full SHA
    e5f0750 View commit details
    Browse the repository at this point in the history

  3. Small fix in MWE for getting the output associated with PRINT_BUDGET … 

    …to index correctly
    @emorway-usgs
    emorway-usgs committed May 24, 2023
    Configuration menu
    Copy the full SHA
    e899f82 View commit details
    Browse the repository at this point in the history

Commits on May 30, 2023

  1. Add error msg to avoid 'divide by zero' error

    @emorway-usgs
    emorway-usgs committed May 30, 2023
    Configuration menu
    Copy the full SHA
    fb24605 View commit details
    Browse the repository at this point in the history

  2. wrong evaluation on previous commit

    @emorway-usgs
    emorway-usgs committed May 30, 2023
    Configuration menu
    Copy the full SHA
    7cfba8a View commit details
    Browse the repository at this point in the history

Commits on May 31, 2023

  1. Merge branch 'develop' into gwe 

    # Conflicts:
#	src/Model/GroundWaterTransport/tsp1ssm1.f90
    @emorway-usgs
    emorway-usgs committed May 31, 2023
    Configuration menu
    Copy the full SHA
    1b27da5 View commit details
    Browse the repository at this point in the history

  2. Redoing some SSM changes that were stomped on during the last update … 

    …from the develop branch (GWE branch was six commits behind develop)
    @emorway-usgs
    emorway-usgs committed May 31, 2023
    Configuration menu
    Copy the full SHA
    c606a99 View commit details
    Browse the repository at this point in the history

Commits on Jun 1, 2023

  1. Adding lake conduction autotest

    @emorway-usgs
    emorway-usgs committed Jun 1, 2023
    Configuration menu
    Copy the full SHA
    173e697 View commit details
    Browse the repository at this point in the history

  2. Adding streambed thermal conduction autotest

    @emorway-usgs
    emorway-usgs committed Jun 1, 2023
    Configuration menu
    Copy the full SHA
    bf0a67f View commit details
    Browse the repository at this point in the history

  3. Adding well bore (MAW) conductive exchange with aquifer autotest

    @emorway-usgs
    emorway-usgs committed Jun 1, 2023
    Configuration menu
    Copy the full SHA
    312ac94 View commit details
    Browse the repository at this point in the history

Commits on Jun 2, 2023

  1. Reorganization of generalized transport model files

    @emorway-usgs
    emorway-usgs committed Jun 2, 2023
    Configuration menu
    Copy the full SHA
    ee54ccb View commit details
    Browse the repository at this point in the history

  2. gwe.f90 doxygen

    @emorway-usgs
    emorway-usgs committed Jun 2, 2023
    Configuration menu
    Copy the full SHA
    0135f6a View commit details
    Browse the repository at this point in the history

  3. gwe1sfe1.f90 doxygen compliance

    @emorway-usgs
    emorway-usgs committed Jun 2, 2023
    Configuration menu
    Copy the full SHA
    c4bc174 View commit details
    Browse the repository at this point in the history

  4. gwe1src1.f90 doxygen compliance

    @emorway-usgs
    emorway-usgs committed Jun 2, 2023
    Configuration menu
    Copy the full SHA
    dafe2cb View commit details
    Browse the repository at this point in the history

  5. gwe1uze1.f90 doxygen compliance

    @emorway-usgs
    emorway-usgs committed Jun 2, 2023
    Configuration menu
    Copy the full SHA
    798f102 View commit details
    Browse the repository at this point in the history

  6. gwe1lke1.f90 doxygen compliance. A few touch-ups in gwe1sfe1.f90

    @emorway-usgs
    emorway-usgs committed Jun 2, 2023
    Configuration menu
    Copy the full SHA
    34036ee View commit details
    Browse the repository at this point in the history

Commits on Jun 3, 2023

  1. gwe1mst1.f90 doxygen compliance (was mostly already done)

    @emorway-usgs
    emorway-usgs committed Jun 3, 2023
    Configuration menu
    Copy the full SHA
    219e66e View commit details
    Browse the repository at this point in the history

  2. gwe1dsp1.f90 doxygen compliance

    @emorway-usgs
    emorway-usgs committed Jun 3, 2023
    Configuration menu
    Copy the full SHA
    e1f93f1 View commit details
    Browse the repository at this point in the history

  3. tsp1adv1.f90 doxygen compliance

    @emorway-usgs
    emorway-usgs committed Jun 3, 2023
    Configuration menu
    Copy the full SHA
    8e07188 View commit details
    Browse the repository at this point in the history

Commits on Jun 5, 2023

  1. tsp1.f90 doxygen compliance. Touch-up in gwe1dsp1.f90

    @emorway-usgs
    emorway-usgs committed Jun 5, 2023
    Configuration menu
    Copy the full SHA
    b8bef96 View commit details
    Browse the repository at this point in the history

  2. tsp1apt1.f90 doxygen compliance. Touch-up in gwe1lke1.f90

    @emorway-usgs
    emorway-usgs committed Jun 5, 2023
    Configuration menu
    Copy the full SHA
    5034a26 View commit details
    Browse the repository at this point in the history

  3. tsp1cnc1.f90 doxygen compliance. Touch-up in gwe1dsp1.f90

    @emorway-usgs
    emorway-usgs committed Jun 5, 2023
    Configuration menu
    Copy the full SHA
    ed5e366 View commit details
    Browse the repository at this point in the history

  4. tsp1fmi1.f90 doxygen compliance.

    @emorway-usgs
    emorway-usgs committed Jun 5, 2023
    Configuration menu
    Copy the full SHA
    3d386bf View commit details
    Browse the repository at this point in the history

  5. tsp1ic1.f90 doxygen compliance

    @emorway-usgs
    emorway-usgs committed Jun 5, 2023
    Configuration menu
    Copy the full SHA
    16bedfe View commit details
    Browse the repository at this point in the history

  6. tsp1mvt1.f90 doxygen compliance

    @emorway-usgs
    emorway-usgs committed Jun 5, 2023
    Configuration menu
    Copy the full SHA
    e48ed8c View commit details
    Browse the repository at this point in the history

  7. tsp1obs1.f90 doxygen compliance

    @emorway-usgs
    emorway-usgs committed Jun 5, 2023
    Configuration menu
    Copy the full SHA
    44f5d7e View commit details
    Browse the repository at this point in the history

  8. gwt1uzt1.f90 doxygen compliance. Other minor touch-up

    @emorway-usgs
    emorway-usgs committed Jun 5, 2023
    Configuration menu
    Copy the full SHA
    7e34050 View commit details
    Browse the repository at this point in the history

  9. gwt1src1.f90 doxygen compliance. Minor touch-up in gwe1src.f90

    @emorway-usgs
    emorway-usgs committed Jun 5, 2023
    Configuration menu
    Copy the full SHA
    483bb6a View commit details
    Browse the repository at this point in the history

  10. gwt1sft1.f90 doxygen compliance. Minor touch-up in gwe1sfe1.f90

    @emorway-usgs
    emorway-usgs committed Jun 5, 2023
    Configuration menu
    Copy the full SHA
    3f283e6 View commit details
    Browse the repository at this point in the history

Commits on Jun 6, 2023

  1. gwt1mwt1.f90 & gwe1mwe1.f90 doxygen compliance.

    @emorway-usgs
    emorway-usgs committed Jun 6, 2023
    Configuration menu
    Copy the full SHA
    4926396 View commit details
    Browse the repository at this point in the history

  2. gwt1lkt1.f90 doxygen compliance. Touch-up in gwe1lke1.f90

    @emorway-usgs
    emorway-usgs committed Jun 6, 2023
    Configuration menu
    Copy the full SHA
    8dbbc1e View commit details
    Browse the repository at this point in the history

  3. gwt1dsp1.f90 doxygen compliance. Touch-up in gwe1dsp1.f90

    @emorway-usgs
    emorway-usgs committed Jun 6, 2023
    Configuration menu
    Copy the full SHA
    43c489c View commit details
    Browse the repository at this point in the history

  4. gwt1.f90 doxygen compliance. Touch-up in gwe1.f90

    @emorway-usgs
    emorway-usgs committed Jun 6, 2023
    Configuration menu
    Copy the full SHA
    b096d07 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'develop' into gwe

    @emorway-usgs
    emorway-usgs committed Jun 6, 2023
    Configuration menu
    Copy the full SHA
    c52062e View commit details
    Browse the repository at this point in the history

  6. fprettify on gwe src code

    @emorway-usgs
    emorway-usgs committed Jun 6, 2023
    Configuration menu
    Copy the full SHA
    a833988 View commit details
    Browse the repository at this point in the history

  7. fprettify on gwt

    @emorway-usgs
    emorway-usgs committed Jun 6, 2023
    Configuration menu
    Copy the full SHA
    534b90a View commit details
    Browse the repository at this point in the history

  8. fprettify on generalized transport src code

    @emorway-usgs
    emorway-usgs committed Jun 6, 2023
    Configuration menu
    Copy the full SHA
    afdee06 View commit details
    Browse the repository at this point in the history

  9. First push of mf6io-related .tex files.

    @emorway-usgs
    emorway-usgs committed Jun 6, 2023
    Configuration menu
    Copy the full SHA
    2962a6b View commit details
    Browse the repository at this point in the history

Commits on Jun 8, 2023

  1. Merge branch 'develop' into gwe

    @emorway-usgs
    emorway-usgs committed Jun 8, 2023
    Configuration menu
    Copy the full SHA
    6ad0539 View commit details
    Browse the repository at this point in the history

  2. mf6io stuff (and lots of it)

    @emorway-usgs
    emorway-usgs committed Jun 8, 2023
    Configuration menu
    Copy the full SHA
    d8abaef View commit details
    Browse the repository at this point in the history

  3. Merge branch 'gwe' of github.com:emorway-usgs/modflow6 into gwe

    @emorway-usgs
    emorway-usgs committed Jun 8, 2023
    Configuration menu
    Copy the full SHA
    e2ded93 View commit details
    Browse the repository at this point in the history

  4. fprettify

    @emorway-usgs
    emorway-usgs committed Jun 8, 2023
    Configuration menu
    Copy the full SHA
    63df2de View commit details
    Browse the repository at this point in the history

  5. Merge branch 'develop' into gwe

    @emorway-usgs
    emorway-usgs committed Jun 8, 2023
    Configuration menu
    Copy the full SHA
    46490ec View commit details
    Browse the repository at this point in the history

  6. Meson

    @emorway-usgs
    emorway-usgs committed Jun 8, 2023
    Configuration menu
    Copy the full SHA
    a2063ab View commit details
    Browse the repository at this point in the history

  7. Meson typo

    @emorway-usgs
    emorway-usgs committed Jun 8, 2023
    Configuration menu
    Copy the full SHA
    e3ee300 View commit details
    Browse the repository at this point in the history

  8. forgot to run distribution/build_makefiles.py

    @emorway-usgs
    emorway-usgs committed Jun 8, 2023
    Configuration menu
    Copy the full SHA
    8873acf View commit details
    Browse the repository at this point in the history

  9. Merge branch 'develop' into gwe 

    # Conflicts:
#	doc/mf6io/mf6io.bbl
#	src/Model/GroundWaterTransport/gwt1.f90
#	src/Model/GroundWaterTransport/gwt1dsp1.f90
    @emorway-usgs
    emorway-usgs committed Jun 8, 2023
    Configuration menu
    Copy the full SHA
    b3fb621 View commit details
    Browse the repository at this point in the history

  10. Updating some material that was lost in a merge conflict

    @emorway-usgs
    emorway-usgs committed Jun 8, 2023
    Configuration menu
    Copy the full SHA
    013691e View commit details
    Browse the repository at this point in the history

  11. trying to find errors caused by an inadvertent rename

    @emorway-usgs
    emorway-usgs committed Jun 8, 2023
    Configuration menu
    Copy the full SHA
    f85d0ad View commit details
    Browse the repository at this point in the history

  12. more meson

    @emorway-usgs
    emorway-usgs committed Jun 8, 2023
    Configuration menu
    Copy the full SHA
    abaaa3d View commit details
    Browse the repository at this point in the history

  13. Removed unused variable from cnc

    @emorway-usgs
    emorway-usgs committed Jun 8, 2023
    Configuration menu
    Copy the full SHA
    7951e60 View commit details
    Browse the repository at this point in the history

Commits on Jun 9, 2023

  1. Merge branch 'develop' into gwe

    @emorway-usgs
    emorway-usgs committed Jun 9, 2023
    Configuration menu
    Copy the full SHA
    12fcff2 View commit details
    Browse the repository at this point in the history

  2. Remove more unused variables

    @emorway-usgs
    emorway-usgs committed Jun 9, 2023
    Configuration menu
    Copy the full SHA
    f8e1972 View commit details
    Browse the repository at this point in the history

  3. touch-up gwe & gwt

    @emorway-usgs
    emorway-usgs committed Jun 9, 2023
    Configuration menu
    Copy the full SHA
    ca4458b View commit details
    Browse the repository at this point in the history

  4. more meson

    @emorway-usgs
    emorway-usgs committed Jun 9, 2023
    Configuration menu
    Copy the full SHA
    2226757 View commit details
    Browse the repository at this point in the history

Commits on Jun 10, 2023

  1. Merge branch 'develop' into gwe

    @emorway-usgs
    emorway-usgs committed Jun 10, 2023
    Configuration menu
    Copy the full SHA
    44e5914 View commit details
    Browse the repository at this point in the history

Commits on Jun 12, 2023

  1. fix for autotest/test_gwe_dsp.py

    @emorway-usgs
    emorway-usgs committed Jun 12, 2023
    Configuration menu
    Copy the full SHA
    480aca3 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'develop' into gwe 

    # Conflicts:
#	make/makefile
#	msvs/mf6core.vfproj
#	src/meson.build
    @emorway-usgs
    emorway-usgs committed Jun 12, 2023
    Configuration menu
    Copy the full SHA
    9d94ed1 View commit details
    Browse the repository at this point in the history

  3. Restore some build files I broke with the last merge conflict

    @emorway-usgs
    emorway-usgs committed Jun 12, 2023
    Configuration menu
    Copy the full SHA
    de9f982 View commit details
    Browse the repository at this point in the history

  4. more fixes

    @emorway-usgs
    emorway-usgs committed Jun 12, 2023
    Configuration menu
    Copy the full SHA
    23163fe View commit details
    Browse the repository at this point in the history

  5. providing a fix for at least one of the GWT-GWT autotests

    @emorway-usgs
    emorway-usgs committed Jun 12, 2023
    Configuration menu
    Copy the full SHA
    42f9de4 View commit details
    Browse the repository at this point in the history

Commits on Jun 13, 2023

  1. Merge branch 'develop' into gwe

    @emorway-usgs
    emorway-usgs committed Jun 13, 2023
    Configuration menu
    Copy the full SHA
    3487ba3 View commit details
    Browse the repository at this point in the history

Commits on Jun 14, 2023

  1. Should not be part of the GWE PR

    @emorway-usgs
    emorway-usgs committed Jun 14, 2023
    Configuration menu
    Copy the full SHA
    1467616 View commit details
    Browse the repository at this point in the history

Commits on Jun 15, 2023

  1. These changes should not exist

    @emorway-usgs
    emorway-usgs committed Jun 15, 2023
    Configuration menu
    Copy the full SHA
    ddc301a View commit details
    Browse the repository at this point in the history

  2. Another unecessary change, restoring

    @emorway-usgs
    emorway-usgs committed Jun 15, 2023
    Configuration menu
    Copy the full SHA
    3a81ef6 View commit details
    Browse the repository at this point in the history

  3. Minor clean-up

    @emorway-usgs
    emorway-usgs committed Jun 15, 2023
    Configuration menu
    Copy the full SHA
    e2a5185 View commit details
    Browse the repository at this point in the history

Commits on Jun 16, 2023

  1. Inconsequential

    @emorway-usgs
    emorway-usgs committed Jun 16, 2023
    Configuration menu
    Copy the full SHA
    ca33cb8 View commit details
    Browse the repository at this point in the history

  2. Friday afternoon piece of hay in a needlestack

    @emorway-usgs
    emorway-usgs committed Jun 16, 2023
    Configuration menu
    Copy the full SHA
    b138fbe View commit details
    Browse the repository at this point in the history

Commits on Jun 17, 2023

  1. Merge branch 'develop' into gwe 

    # Conflicts:
#	make/makefile
    @emorway-usgs
    emorway-usgs committed Jun 17, 2023
    Configuration menu
    Copy the full SHA
    13d0a23 View commit details
    Browse the repository at this point in the history

  2. resolve a conflict from the last merge.

    @emorway-usgs
    emorway-usgs committed Jun 17, 2023
    Configuration menu
    Copy the full SHA
    7b1062f View commit details
    Browse the repository at this point in the history

Commits on Jun 20, 2023

  1. Amend UZT with the tsplabels class

    @emorway-usgs
    emorway-usgs committed Jun 20, 2023
    Configuration menu
    Copy the full SHA
    5bf187e View commit details
    Browse the repository at this point in the history

  2. Merge branch 'develop' into gwe

    @emorway-usgs
    emorway-usgs committed Jun 20, 2023
    Configuration menu
    Copy the full SHA
    5cb6453 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'gwe' of github.com:emorway-usgs/modflow6 into gwe

    @emorway-usgs
    emorway-usgs committed Jun 20, 2023
    Configuration menu
    Copy the full SHA
    7233fd3 View commit details
    Browse the repository at this point in the history

  4. fprettify

    @emorway-usgs
    emorway-usgs committed Jun 20, 2023
    Configuration menu
    Copy the full SHA
    b7a4923 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'develop' into gwe

    @emorway-usgs
    emorway-usgs committed Jun 20, 2023
    Configuration menu
    Copy the full SHA
    2f877d4 View commit details
    Browse the repository at this point in the history

  6. Line should not be in the makefile

    @emorway-usgs
    emorway-usgs committed Jun 20, 2023
    Configuration menu
    Copy the full SHA
    1959778 View commit details
    Browse the repository at this point in the history

  7. Maybe some yet-to-be-checked-in changes to GweInterfaceModel are the … 

    …issue with gfortran12
    @emorway-usgs
    emorway-usgs committed Jun 20, 2023
    Configuration menu
    Copy the full SHA
    7978dfa View commit details
    Browse the repository at this point in the history

Commits on Jun 21, 2023

  1. add another uze autotest (ran black)

    @emorway-usgs
    emorway-usgs committed Jun 21, 2023
    Configuration menu
    Copy the full SHA
    416e8c8 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'develop' into gwe

    @emorway-usgs
    emorway-usgs committed Jun 21, 2023
    Configuration menu
    Copy the full SHA
    2824da2 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'gwe' of github.com:emorway-usgs/modflow6 into gwe

    @emorway-usgs
    emorway-usgs committed Jun 21, 2023
    Configuration menu
    Copy the full SHA
    9720df7 View commit details
    Browse the repository at this point in the history

  4. yet another uze autotest (ran black). Also fixing sig figs in previou… 

    …s new autotest
    @emorway-usgs
    emorway-usgs committed Jun 21, 2023
    Configuration menu
    Copy the full SHA
    dcebbfc View commit details
    Browse the repository at this point in the history

  5. relax tolerance(s) by 1e-10

    @emorway-usgs
    emorway-usgs committed Jun 21, 2023
    Configuration menu
    Copy the full SHA
    cc731bc View commit details
    Browse the repository at this point in the history

Commits on Jun 23, 2023

  1. Autotest for conduction among dry cells and a dry 'pass-thru' cell

    @emorway-usgs
    emorway-usgs committed Jun 23, 2023
    Configuration menu
    Copy the full SHA
    daff71e View commit details
    Browse the repository at this point in the history

  2. 2nd autotest for conduction among neighboring dry cells

    @emorway-usgs
    emorway-usgs committed Jun 23, 2023
    Configuration menu
    Copy the full SHA
    e9cde27 View commit details
    Browse the repository at this point in the history

  3. These changes were made with cb11acf, that under the GWE refactor go … 

    …in tsp1.f90 instead
    @emorway-usgs
    emorway-usgs committed Jun 23, 2023
    Configuration menu
    Copy the full SHA
    13e9c55 View commit details
    Browse the repository at this point in the history

  4. These changes were made with cb11acfbut were lost in a merge conflict… 

    …, reinstating
    @emorway-usgs
    emorway-usgs committed Jun 23, 2023
    Configuration menu
    Copy the full SHA
    8ab0695 View commit details
    Browse the repository at this point in the history

Commits on Jun 24, 2023

  1. Merge branch 'develop' into gwe 

    # Conflicts:
#	src/Model/GroundWaterTransport/gwt1.f90
#	src/Model/TransportModel/tsp1apt1.f90
#	src/Model/TransportModel/tsp1cnc1.f90
    @emorway-usgs
    emorway-usgs committed Jun 24, 2023
    Configuration menu
    Copy the full SHA
    30f7c3d View commit details
    Browse the repository at this point in the history

  2. Merge branch 'develop' into gwe

    @emorway-usgs
    emorway-usgs committed Jun 24, 2023
    Configuration menu
    Copy the full SHA
    58d51c1 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'gwe' of github.com:emorway-usgs/modflow6 into gwe

    @emorway-usgs
    emorway-usgs committed Jun 24, 2023
    Configuration menu
    Copy the full SHA
    c63f361 View commit details
    Browse the repository at this point in the history

Commits on Jun 27, 2023

  1. fprettify

    @emorway-usgs
    emorway-usgs committed Jun 27, 2023
    Configuration menu
    Copy the full SHA
    e6d9255 View commit details
    Browse the repository at this point in the history

  2. Another drycell conduction-only autotest

    @emorway-usgs
    emorway-usgs committed Jun 27, 2023
    Configuration menu
    Copy the full SHA
    7ef5f5b View commit details
    Browse the repository at this point in the history

  3. Restore a fix that was lost during a merge conflict. This fix was ori… 

    …ginally part of cb11acf (MODFLOW-USGS#1267)
    @emorway-usgs
    emorway-usgs committed Jun 27, 2023
    Configuration menu
    Copy the full SHA
    8508a2f View commit details
    Browse the repository at this point in the history

  4. Merge branch 'develop' into gwe

    @emorway-usgs
    emorway-usgs committed Jun 27, 2023
    Configuration menu
    Copy the full SHA
    acbe866 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'gwe' of github.com:emorway-usgs/modflow6 into gwe

    @emorway-usgs
    emorway-usgs committed Jun 27, 2023
    Configuration menu
    Copy the full SHA
    80d7ca7 View commit details
    Browse the repository at this point in the history

Commits on Jun 29, 2023

  1. Merge branch 'develop' into gwe

    @emorway-usgs
    emorway-usgs committed Jun 29, 2023
    Configuration menu
    Copy the full SHA
    1b12813 View commit details
    Browse the repository at this point in the history

Commits on Jul 21, 2023

  1. The missing gfortran12 link?

    @emorway-usgs
    emorway-usgs committed Jul 21, 2023
    Configuration menu
    Copy the full SHA
    aac5e52 View commit details
    Browse the repository at this point in the history

  2. update makefiles

    @wpbonelli
    wpbonelli committed Jul 21, 2023
    Configuration menu
    Copy the full SHA
    1dfc08f View commit details
    Browse the repository at this point in the history

Commits on Aug 10, 2023

  1. Goes with MODFLOW-USGS#1306 (comment)

    @emorway-usgs
    emorway-usgs committed Aug 10, 2023
    Configuration menu
    Copy the full SHA
    fe20af1 View commit details
    Browse the repository at this point in the history