feat(GWE): Groundwater Energy Transport #1237
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…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
…ting to see if git will figure out the conflicts on its own
* 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
… 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.
# Conflicts: # src/Model/GroundWaterFlow/gwf3vsc8.f90
…lt with Chris & Alden
… species test problem.
# Conflicts: # src/Model/Connection/GwtInterfaceModel.f90 # src/Model/GroundWaterFlow/gwf3npf8.f90
… the current 'develop' branch
…6 'develop' branch (stuff in this commit should have been included in the previous commit)
…in tsp1.f90 instead
# Conflicts: # src/Model/GroundWaterTransport/gwt1.f90 # src/Model/TransportModel/tsp1apt1.f90 # src/Model/TransportModel/tsp1cnc1.f90
|
@w-bonelli the makefile should not include any of the parallel files. There is an exclude files option ( |
|
@jdhughes-usgs it looks like some parallel files (e.g. src/Solution/PETSc) are already in develop. The |
I think all of the parallel files that Meson adds if |
emorway-usgs
added a commit
to geohackweek/modflow6-tempfork
that referenced
this pull request
Jan 31, 2024
emorway-usgs
added a commit
to geohackweek/modflow6-tempfork
that referenced
this pull request
Feb 6, 2024
emorway-usgs
added a commit
to geohackweek/modflow6-tempfork
that referenced
this pull request
Feb 8, 2024
wpbonelli
pushed a commit
to wpbonelli/modflow6
that referenced
this pull request
Feb 9, 2024
emorway-usgs
added a commit
to geohackweek/modflow6-tempfork
that referenced
this pull request
Feb 9, 2024
emorway-usgs
added a commit
to geohackweek/modflow6-tempfork
that referenced
this pull request
Feb 9, 2024
langevin-usgs
pushed a commit
that referenced
this pull request
Feb 9, 2024
* feat(GWE): Introduce Groundwater Energy Transport * fix typo in meson file * fix a formating issue that was popping up in an MST autotest * some legacy line leftover from a botched rebase, possibly * Need update initial autotest to conform to new autotest standards adopted with #1464 * Start looking for post-rebase breakages * Get gwfgwe and gwegwe exchanges up-to-date based on #1505 * Code that had been moved to set_active_status in FMI was still present in fmi_fc(). Removing. * Forgot to remove unused variables after making changes in 4d76729 * Adding another autotest specific to GWE * Adding another autotest after getting it #1464 compliant * Compliantizing another new autotest with PR #1464 * Fixes in response to #1493 (comment) * Fix in response to #1493 (comment) * Rerunning black in response to #1493 (comment) * Fix in response to #1493 (comment) * Made changes to dfn files in response to #1493 (comment) and #1493 (comment) and reran mf6ivar.py, which updated the tex files in this commit * Fix in response to #1493 (comment) * remove unnecessary line of script * Add missing lines to ConnectionBuilder.f90 related to GWE * Add a GWE vs GWT comparison autotest * GWE-GWE exchanges now working. Other clean-up for code uniformity * Rebrand constant temperature package acronym to CTP * Missed an import renaming update * Forgot to remove a now obsolete file due to renaming. * Rebrand energy storage and transfer package acronym to EST * Forgot to remove a now obsolete file due to renaming (again) * Rebrand gwe dispersion package acronym to CND (conduction) since that is the dominant process in heat transport * Remove gwe-related code from generalized transport code (tsp1.f90 & tsp1ssm1.f90) * add single-cell test for energy source loading (ESL) package * Adding energy source loading (ESL) package * remove unused variable * fprettify * Add another ESL autotest * Adding another autotest that compares gwe to three different analytical solutions from Carslaw & Jaeger (1947) * Bringing over Stallman autotest from previous GWE PR (#1237) * Adding streamflow energy transport (SFE) package * Add autotest for SFE * Adding lake energy transport (LKE) package. Includes new autotest * forgot meson update * Adding multi-aquifer well energy transport (MWE) package. Includes new autotest * Adding unsaturated-zone energy transport (UZE) package. Includes 2 new autotests * Attempting to reapply a failing autotest. Unable to discern why it is failing as downloaded contents from its failure are working locally. * removing troublesome autotest. Downloaded contents from failed run on Actions doesn't yield the same output that the logs are reporting. This particular autotest has an analytical solution (and a plot) that might be better shown on the modflow6-examples repo anyway * Removing a file that shouldn't have been added (snuck in among other staged files) * Update release notes
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Two important areas that need review:
gwtandgweinherit a good idea?GweGweConnectionandGweGweExchangeessentially duplicateGwtGwtConnectionandGwtGwtExchange, respectively. Perhaps there is a more generalized approach available?More autotests to follow