Skip to content

Reset fluid state after convergence failure #4088

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

Merged
MelReyCG merged 8 commits into from
Aug 5, 2026
+12 −1
Merged

Reset fluid state after convergence failure #4088

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
3ca2cd6
Draft
Jun 17, 2026
f47430d
Use initializeState
dkachuma Jun 22, 2026
3a435ff
Empty change
dkachuma Jun 22, 2026
c2ce857
Empty change
dkachuma Jun 22, 2026
5e1834c
Merge branch 'develop' into bug/bd713/kvalues
dkachuma Jul 27, 2026
631086c
Rebaseline
dkachuma Jul 27, 2026
4247846
Merge branch 'develop' into bug/bd713/kvalues
MelReyCG Aug 3, 2026
9c2fc7b
💚 rebaseline
MelReyCG Aug 4, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .integrated_tests.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
baselines:
bucket: geosx
baseline: integratedTests/baseline_integratedTests-pr3972-17154-316e6d8
baseline: integratedTests/baseline_integratedTests-pr4088-17188-4247846

allow_fail:
all: ''
Expand Down
3 changes: 3 additions & 0 deletions BASELINE_NOTES.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@ This file is designed to track changes to the integrated test baselines.
Any developer who updates the baseline ID in the .integrated_tests.yaml file is expected to create an entry in this file with the pull request number, date, and their justification for rebaselining.
These notes should be in reverse-chronological order, and use the following time format: (YYYY-MM-DD).

PR #4088 (2026-07-27) <https://storage.googleapis.com/geosx/integratedTests/baseline_integratedTests-pr4088-17188-4247846.tar.gz>
Fluid reset after convergence failure

PR #3972 (2026-07-28) <https://storage.googleapis.com/geosx/integratedTests/baseline_integratedTests-pr3972-17154-316e6d8.tar.gz>
Well model refactor . Integrated test update due to schema changes

Expand Down
8 changes: 8 additions & 0 deletions src/coreComponents/physicsSolvers/fluidFlow/CompositionalMultiphaseBase.cpp
View file
Open in desktop

@tjb-ltk tjb-ltk Jul 7, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Just to clarify the change. This resets K-values to those of last successful timestep?

@dkachuma dkachuma Jul 7, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Resets to zero so they can be reinitialised using Wilson's correlation. Similar treatment to the well. The storage of the k-values is a heuristic attempt to improve convergence. If they are reinitialised, the flash might take a bit longer to converge but the solution should ultimately be the same.

Original file line number Diff line number Diff line change
Expand Up @@ -2790,6 +2790,14 @@ void CompositionalMultiphaseBase::resetStateToBeginningOfStep( DomainPartition &

// update porosity, permeability
updatePorosityAndPermeability( subRegion );
// discard any warm-started state held by the fluid model (e.g. K-values
// used to seed the flash) so the rolled-back step does not inherit
// iterate-dependent state from the failed Newton attempt.
{
string const & fluidName = subRegion.template getReference< string >( viewKeyStruct::fluidNamesString() );
MultiFluidBase const & fluid = getConstitutiveModel< MultiFluidBase >( subRegion, fluidName );
fluid.initializeState();
}
// update all fluid properties
updateFluidState( subRegion );
// for thermal simulations, update solid internal energy
Expand Down