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(GeneralizedTransport): Introduce generalized transport parent class, sets up PR for GWE #1306

Closed
wants to merge 4 commits into from
Closed

feat(GeneralizedTransport): Introduce generalized transport parent class, sets up PR for GWE #1306

wants to merge 4 commits into from

Conversation

emorway-usgs
Copy link
Contributor

  • This PR includes the generalized transport class from which GWT and GWE will inherit
  • A couple of supporting files introduced, like generalized labeling class (e.g., mass vs energy in listing file)
  • Actual GWE src not introduced in this PR
  • updated meson
  • updated makefile
  • ran fprettify

This represents a component of #1237, which is being redone in smaller, staged PRs

langevin-usgs
langevin-usgs reviewed Jul 24, 2023
View reviewed changes
Copy link
Contributor

@langevin-usgs langevin-usgs left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for taking this on, Eric. There is so much here! I feel like there are still some structural issues that need to be discussed, especially any mention of GWE (or GWT) in the Tsp modules. There are also just so many changes related to comments, which are useful (thank you), but make this change set unwieldy. I recognize that some of the challenges here are simply due to GWT needing some more work, so I apologize for that. We should probably discuss how to move this forward and whether or not it would be beneficial to separate this even further with a deeper level of staging the changes.

src/Model/GroundWaterTransport/gwt1.f90 Outdated Show resolved Hide resolved
src/Model/ModelUtilities/TspLabels.f90 Outdated Show resolved Hide resolved
src/Model/ModelUtilities/TspLabels.f90 Outdated Show resolved Hide resolved
src/Model/GroundWaterTransport/gwt1.f90 Outdated Show resolved Hide resolved
src/Model/GroundWaterTransport/gwt1.f90 Outdated Show resolved Hide resolved
src/Model/TransportModel/tsp1cnc1.f90 Outdated Show resolved Hide resolved
src/Model/TransportModel/tsp1cnc1.f90 Outdated Show resolved Hide resolved
src/Model/TransportModel/tsp1ssm1.f90 Outdated Show resolved Hide resolved
src/Utilities/Budget.f90 Outdated Show resolved Hide resolved
utils/zonebudget/make/makefile Outdated Show resolved Hide resolved
emorway-usgs added a commit to emorway-usgs/modflow6 that referenced this pull request Aug 9, 2023
@emorway-usgs
fixes MODFLOW-USGS#1306 (comment)
23eec93
@emorway-usgs emorway-usgs force-pushed the generalized_transport branch 2 times, most recently from b641fee to 23eec93 Compare August 9, 2023 21:13
emorway-usgs added a commit to emorway-usgs/modflow6 that referenced this pull request Aug 10, 2023
@emorway-usgs
fixes MODFLOW-USGS#1306 (comment)
357ca10
@emorway-usgs emorway-usgs force-pushed the generalized_transport branch from b3b5f6b to 7ba6519 Compare August 10, 2023 00:24
emorway-usgs added a commit to emorway-usgs/modflow6 that referenced this pull request Aug 10, 2023
@emorway-usgs
fixes MODFLOW-USGS#1306 (comment)
717e8fb
emorway-usgs added a commit to emorway-usgs/modflow6 that referenced this pull request Aug 10, 2023
@emorway-usgs
fixes the following comments: MODFLOW-USGS#1306 (comment)
609209d 
MODFLOW-USGS#1306 (comment)
MODFLOW-USGS#1306 (comment)
emorway-usgs added a commit to emorway-usgs/modflow6 that referenced this pull request Aug 10, 2023
@emorway-usgs
Goes with MODFLOW-USGS#1306 (comment)
fe20af1
emorway-usgs added a commit to emorway-usgs/modflow6 that referenced this pull request Aug 11, 2023
@emorway-usgs
fixes the following comments: MODFLOW-USGS#1306 (comment)
69513dd 
MODFLOW-USGS#1306 (comment)
responds to MODFLOW-USGS#1306 (comment)
emorway-usgs added a commit to emorway-usgs/modflow6 that referenced this pull request Aug 15, 2023
@emorway-usgs
Attemps to fix a number of review comments in MODFLOW-USGS#1306, incl…
625136d 
…uding:

MODFLOW-USGS#1306 (comment)
MODFLOW-USGS#1306 (comment)
MODFLOW-USGS#1306 (comment)
MODFLOW-USGS#1306 (comment)
emorway-usgs added a commit to emorway-usgs/modflow6 that referenced this pull request Aug 15, 2023
@emorway-usgs
addresses: MODFLOW-USGS#1306 (comment)
d8796b4 
MODFLOW-USGS#1306 (comment)
emorway-usgs added a commit to emorway-usgs/modflow6 that referenced this pull request Aug 17, 2023
@emorway-usgs
fixes MODFLOW-USGS#1306 (comment)
14515c3
emorway-usgs added a commit to emorway-usgs/modflow6 that referenced this pull request Aug 17, 2023
@emorway-usgs
fixes MODFLOW-USGS#1306 (comment)
902b6e8
emorway-usgs added a commit to emorway-usgs/modflow6 that referenced this pull request Aug 17, 2023
@emorway-usgs
fixes the following comments: MODFLOW-USGS#1306 (comment)
f1c97d0 
MODFLOW-USGS#1306 (comment)
MODFLOW-USGS#1306 (comment)
emorway-usgs added a commit to emorway-usgs/modflow6 that referenced this pull request Aug 17, 2023
@emorway-usgs
fixes the following comments: MODFLOW-USGS#1306 (comment)
989fef7 
MODFLOW-USGS#1306 (comment)
responds to MODFLOW-USGS#1306 (comment)
emorway-usgs added a commit to emorway-usgs/modflow6 that referenced this pull request Aug 17, 2023
@emorway-usgs
Attemps to fix a number of review comments in MODFLOW-USGS#1306, incl…
7b2b6cb 
…uding:

MODFLOW-USGS#1306 (comment)
MODFLOW-USGS#1306 (comment)
MODFLOW-USGS#1306 (comment)
MODFLOW-USGS#1306 (comment)
emorway-usgs added a commit to emorway-usgs/modflow6 that referenced this pull request Aug 17, 2023
@emorway-usgs
addresses: MODFLOW-USGS#1306 (comment)
c44872e 
MODFLOW-USGS#1306 (comment)
@emorway-usgs emorway-usgs force-pushed the generalized_transport branch from d8796b4 to c44872e Compare August 17, 2023 11:19
emorway-usgs added a commit to emorway-usgs/modflow6 that referenced this pull request Aug 18, 2023
@emorway-usgs
fixes MODFLOW-USGS#1306 (comment)
e4cdbe4
emorway-usgs added a commit to emorway-usgs/modflow6 that referenced this pull request Aug 18, 2023
@emorway-usgs
fixes MODFLOW-USGS#1306 (comment)
82f56ec
emorway-usgs added a commit to emorway-usgs/modflow6 that referenced this pull request Aug 18, 2023
@emorway-usgs
fixes the following comments: MODFLOW-USGS#1306 (comment)
5bccd38 
MODFLOW-USGS#1306 (comment)
MODFLOW-USGS#1306 (comment)
emorway-usgs added a commit to emorway-usgs/modflow6 that referenced this pull request Aug 18, 2023
@emorway-usgs
fixes the following comments: MODFLOW-USGS#1306 (comment)
9b59d9f 
MODFLOW-USGS#1306 (comment)
responds to MODFLOW-USGS#1306 (comment)
emorway-usgs added a commit to emorway-usgs/modflow6 that referenced this pull request Aug 18, 2023
@emorway-usgs
Attemps to fix a number of review comments in MODFLOW-USGS#1306, incl…
50db7c7 
…uding:

MODFLOW-USGS#1306 (comment)
MODFLOW-USGS#1306 (comment)
MODFLOW-USGS#1306 (comment)
MODFLOW-USGS#1306 (comment)
emorway-usgs added a commit to emorway-usgs/modflow6 that referenced this pull request Aug 18, 2023
@emorway-usgs
addresses: MODFLOW-USGS#1306 (comment)
d02691f 
MODFLOW-USGS#1306 (comment)
@emorway-usgs emorway-usgs force-pushed the generalized_transport branch from c44872e to d02691f Compare August 18, 2023 14:21
emorway-usgs added a commit to emorway-usgs/modflow6 that referenced this pull request Aug 18, 2023
@emorway-usgs
Addresses: MODFLOW-USGS#1306 (comment)
3bdd3d7 
MODFLOW-USGS#1306 (comment)
MODFLOW-USGS#1306 (comment)
emorway-usgs added a commit to emorway-usgs/modflow6 that referenced this pull request Aug 21, 2023
@emorway-usgs
fixes MODFLOW-USGS#1306 (comment)
745856f
emorway-usgs added a commit to emorway-usgs/modflow6 that referenced this pull request Aug 21, 2023
@emorway-usgs
fixes MODFLOW-USGS#1306 (comment)
2845ab6
emorway-usgs added a commit to emorway-usgs/modflow6 that referenced this pull request Aug 21, 2023
@emorway-usgs
fixes the following comments: MODFLOW-USGS#1306 (comment)
a5085e6 
MODFLOW-USGS#1306 (comment)
MODFLOW-USGS#1306 (comment)
emorway-usgs added a commit to emorway-usgs/modflow6 that referenced this pull request Aug 21, 2023
@emorway-usgs
Undoing change associated with 7e8644d which was in response to MODFL…
53f0dc3 
…OW-USGS#1306 (comment)
@emorway-usgs emorway-usgs force-pushed the generalized_transport branch from df5ea45 to 53f0dc3 Compare August 21, 2023 15:51
emorway-usgs added a commit to emorway-usgs/modflow6 that referenced this pull request Aug 21, 2023
@emorway-usgs
Further refinement in response to MODFLOW-USGS#1306 (comment)
f686ee1
emorway-usgs added a commit to emorway-usgs/modflow6 that referenced this pull request Sep 14, 2023
@emorway-usgs
fixes MODFLOW-USGS#1306 (comment)
830646b
emorway-usgs added a commit to emorway-usgs/modflow6 that referenced this pull request Sep 14, 2023
@emorway-usgs
fixes the following comments: MODFLOW-USGS#1306 (comment)
8ba4d6f 
MODFLOW-USGS#1306 (comment)
MODFLOW-USGS#1306 (comment)
emorway-usgs added a commit to emorway-usgs/modflow6 that referenced this pull request Sep 14, 2023
@emorway-usgs
fixes the following comments: MODFLOW-USGS#1306 (comment)
fee10ea 
MODFLOW-USGS#1306 (comment)
responds to MODFLOW-USGS#1306 (comment)
emorway-usgs added a commit to emorway-usgs/modflow6 that referenced this pull request Sep 14, 2023
@emorway-usgs
Attemps to fix a number of review comments in MODFLOW-USGS#1306, incl…
4099bd3 
…uding:

MODFLOW-USGS#1306 (comment)
MODFLOW-USGS#1306 (comment)
MODFLOW-USGS#1306 (comment)
MODFLOW-USGS#1306 (comment)
emorway-usgs added a commit to emorway-usgs/modflow6 that referenced this pull request Sep 14, 2023
@emorway-usgs
addresses: MODFLOW-USGS#1306 (comment)
2b07c0e 
MODFLOW-USGS#1306 (comment)
emorway-usgs added a commit to emorway-usgs/modflow6 that referenced this pull request Sep 14, 2023
@emorway-usgs
Addresses: MODFLOW-USGS#1306 (comment)
0865083 
MODFLOW-USGS#1306 (comment)
MODFLOW-USGS#1306 (comment)
emorway-usgs added a commit to emorway-usgs/modflow6 that referenced this pull request Sep 14, 2023
@emorway-usgs
Fixes: MODFLOW-USGS#1306 (comment)
bf4ccdd 
MODFLOW-USGS#1306 (comment)
MODFLOW-USGS#1306 (comment)
@emorway-usgs emorway-usgs marked this pull request as draft September 15, 2023 16:39
@emorway-usgs emorway-usgs force-pushed the generalized_transport branch 8 times, most recently from 8693d1f to a0b159c Compare October 4, 2023 17:18
@emorway-usgs emorway-usgs force-pushed the generalized_transport branch from a0b159c to b337b19 Compare October 6, 2023 23:55
@emorway-usgs emorway-usgs mentioned this pull request Nov 15, 2023
Merged
@emorway-usgs
Copy link
Contributor Author

This PR effectively reworked into a series of more readily reviewable PRs:
#1386
#1391
#1392
#1396
#1398
#1399
#1400
#1428
#1445

@emorway-usgs emorway-usgs mentioned this pull request Feb 11, 2024
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@langevin-usgs langevin-usgs langevin-usgs left review comments

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@emorway-usgs @langevin-usgs