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

Merge elm_ats updates to master #266

Merged
merged 28 commits into from
Jul 25, 2024
Merged

Merge elm_ats updates to master #266

merged 28 commits into from
Jul 25, 2024

Conversation

rfiorella
Copy link
Contributor

@rfiorella rfiorella commented Jul 18, 2024

This PR is meant to replace #216. Merging a branch with elm_ats updates which has been rebased to master and had calls to boost removed.

A few steps still needed before merge:

  • current cmake logic will build elm_ats libraries always, need to add a build logical flag.
  • logical flag should be added to amanzi bootstrap script as well.

Also have noticed a single test fail on macOS M2 w/ gcc14 and openmpi 5.0.3.

jbeisman and others added 27 commits July 18, 2024 12:07
…nitialization code to protected coordinator_init function
… now; modified ELM_ATSDriver::advance to call Coordinator::advance for each single timestep
…ssed correctly, ATS pressure initialization from ELM water content, etc.
Adds BUILD_ELM_ATS_API flag to turn on/off building
of ELM-ATS API object files.
@rfiorella
Copy link
Contributor Author

Ready for review on the ATS side I think @ecoon - testing out the amanzi bootstrap changes now

@rfiorella rfiorella changed the title [wip] Merge elm_ats updates to master Merge elm_ats updates to master Jul 19, 2024

# set this here for now
# add option to bootstrap before completion
if (BUILD_ELM_ATS_API)
Copy link
Collaborator

Choose a reason for hiding this comment

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

this probably needs to be updated to ENABLE_ELM_ATS_API now, otherwise this PR is ready to go.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Done with c330f4f

@ecoon ecoon merged commit 1cd2b6a into master Jul 25, 2024
1 check passed
@ecoon ecoon deleted the rfiorella/elm_api branch July 25, 2024 21:36
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.

3 participants