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(idm): update DisConnExchangeTypes for IDM #1505

Merged
merged 6 commits into from
Dec 20, 2023

Conversation

mjreno
Copy link
Contributor

@mjreno mjreno commented Dec 14, 2023

This PR changes the way input is read for exchanges, specifically the GWF-GWF and GWT-GWT exchanges. The behavior is similar to how the input data model routines have been implemented for the GWF and GWT models. Generic load routines use information contained in DFN files to load the exchange input data into the INPUT context part of the memory manager. Then, when the exchanges are created, they source their information from the INPUT context. Some additional handling was required to handle the parallel case where an exchange may be virtual.

@mjreno mjreno marked this pull request as draft December 14, 2023 14:25
@mjreno mjreno marked this pull request as ready for review December 18, 2023 17:18
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.

This looks great, @mjreno. There is lots of revisions here, but it all looks in order to me. Let's get it in.

!
if (sv%idt%shape == 'NCELLDIM') then
!
call mem_setptr(ncelldim, sv%idt%shape, this%component_mempath)
! -- if EXCHANGE set to NCELLDIM of appropriate model
if (this%mf6_input%component_type == 'EXG') then
Copy link
Contributor

Choose a reason for hiding this comment

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

I understand the need for this here, but it's too bad that a low level routine needs to know about exchanges. Maybe in the future we can find a way to get additional information out of the dfn so we don't need custom code here.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Agreed, it would be best to keep all of the lower level code free of all package specific handling. I'll plan to revisit this soon- it is a good reminder as we head towards advanced and subpackage support.

@langevin-usgs langevin-usgs merged commit 78bfda9 into MODFLOW-USGS:develop Dec 20, 2023
15 checks passed
emorway-usgs added a commit to geohackweek/modflow6-tempfork that referenced this pull request Dec 20, 2023
emorway-usgs added a commit to geohackweek/modflow6-tempfork that referenced this pull request Dec 29, 2023
emorway-usgs added a commit to geohackweek/modflow6-tempfork that referenced this pull request Dec 30, 2023
emorway-usgs added a commit to geohackweek/modflow6-tempfork that referenced this pull request Jan 2, 2024
emorway-usgs added a commit to geohackweek/modflow6-tempfork that referenced this pull request Jan 17, 2024
emorway-usgs added a commit to geohackweek/modflow6-tempfork that referenced this pull request Jan 19, 2024
emorway-usgs added a commit to geohackweek/modflow6-tempfork that referenced this pull request Jan 19, 2024
emorway-usgs added a commit to geohackweek/modflow6-tempfork that referenced this pull request Jan 26, 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
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants