From aafd403bc77eedd825baa8a2a27a2c009438fadf Mon Sep 17 00:00:00 2001 From: Byer Date: Tue, 21 Jul 2026 11:41:28 -0700 Subject: [PATCH 1/5] dont set residual tracking var to zero when processing shut well --- .../fluidFlow/wells/CompositionalMultiphaseWell.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/src/coreComponents/physicsSolvers/fluidFlow/wells/CompositionalMultiphaseWell.cpp b/src/coreComponents/physicsSolvers/fluidFlow/wells/CompositionalMultiphaseWell.cpp index 6a72af7a90c..8870bddcd7d 100644 --- a/src/coreComponents/physicsSolvers/fluidFlow/wells/CompositionalMultiphaseWell.cpp +++ b/src/coreComponents/physicsSolvers/fluidFlow/wells/CompositionalMultiphaseWell.cpp @@ -1443,7 +1443,6 @@ CompositionalMultiphaseWell::calculateResidualNorm( real64 const & time_n, { for( integer i = 0; i < numNorm; ++i ) { - localResidualNorm[i] = 0.0; localResidualNormalizer[i] = m_nonlinearSolverParameters.m_minNormalizer; } } From b186e15a4bc45577261d4986cdc314ae8f9ae69d Mon Sep 17 00:00:00 2001 From: Byer Date: Tue, 21 Jul 2026 14:01:31 -0700 Subject: [PATCH 2/5] baseline update for 2 models --- .integrated_tests.yaml | 2 +- BASELINE_NOTES.md | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.integrated_tests.yaml b/.integrated_tests.yaml index 3de3368090d..c8d1395ad75 100644 --- a/.integrated_tests.yaml +++ b/.integrated_tests.yaml @@ -1,6 +1,6 @@ baselines: bucket: geosx - baseline: integratedTests/baseline_integratedTests-pr3836-17046-2e89f64 + baseline: integratedTests/baseline_integratedTests-pr4100-17125-aafd40 allow_fail: all: '' diff --git a/BASELINE_NOTES.md b/BASELINE_NOTES.md index 6f77c74b57b..274d149e606 100644 --- a/BASELINE_NOTES.md +++ b/BASELINE_NOTES.md @@ -5,8 +5,10 @@ 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 #4100 (2026-07-22) +Fix to include all well residuals in convergence check. + PR #3836 (2026-05-20) -===================== Added statistics `Group` objects for each statistics `Task` instance PR #4040 (2026-06-16) From 94d74b58e9dd7e2647c117e7428a3eb4745636a4 Mon Sep 17 00:00:00 2001 From: Thomas James Byer Date: Wed, 22 Jul 2026 08:01:35 -0700 Subject: [PATCH 3/5] missing digit --- .integrated_tests.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.integrated_tests.yaml b/.integrated_tests.yaml index c8d1395ad75..3a15c942b22 100644 --- a/.integrated_tests.yaml +++ b/.integrated_tests.yaml @@ -1,6 +1,6 @@ baselines: bucket: geosx - baseline: integratedTests/baseline_integratedTests-pr4100-17125-aafd40 + baseline: integratedTests/baseline_integratedTests-pr4100-17125-aafd403 allow_fail: all: '' From dfdbc6a5e6b4c2b1503ff67a8c392ca0b6a55fc9 Mon Sep 17 00:00:00 2001 From: Byer Date: Fri, 31 Jul 2026 11:07:53 -0700 Subject: [PATCH 4/5] uncrustify --- .../wells/CompositionalMultiphaseWell.cpp | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/coreComponents/physicsSolvers/fluidFlow/wells/CompositionalMultiphaseWell.cpp b/src/coreComponents/physicsSolvers/fluidFlow/wells/CompositionalMultiphaseWell.cpp index 274b19ead9e..1bbb3113618 100644 --- a/src/coreComponents/physicsSolvers/fluidFlow/wells/CompositionalMultiphaseWell.cpp +++ b/src/coreComponents/physicsSolvers/fluidFlow/wells/CompositionalMultiphaseWell.cpp @@ -1498,16 +1498,16 @@ CompositionalMultiphaseWell::calculateLocalWellResidualNorm( real64 const & time // step 1: compute the norm in the subRegion - if( !isWellOpen() ) - { - for( integer i = 0; i < numNorm; ++i ) - { - localResidualNormalizer[i] = m_nonlinearSolverParameters.m_minNormalizer; - } - } - else if( isThermal() ) - { - real64 subRegionResidualNorm[2]{}; + if( !isWellOpen() ) + { + for( integer i = 0; i < numNorm; ++i ) + { + localResidualNormalizer[i] = m_nonlinearSolverParameters.m_minNormalizer; + } + } + else if( isThermal() ) + { + real64 subRegionResidualNorm[2]{}; thermalCompositionalMultiphaseWellKernels::ResidualNormKernelFactory:: createAndLaunch< parallelDevicePolicy<> >( m_numComponents, From 1e7d9f493138f053dbb1b9c082b5f3c463077499 Mon Sep 17 00:00:00 2001 From: Byer Date: Fri, 31 Jul 2026 12:44:22 -0700 Subject: [PATCH 5/5] fix typo --- .../fluidFlow/wells/CompositionalMultiphaseWell.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/coreComponents/physicsSolvers/fluidFlow/wells/CompositionalMultiphaseWell.cpp b/src/coreComponents/physicsSolvers/fluidFlow/wells/CompositionalMultiphaseWell.cpp index 1bbb3113618..66ad4b387dd 100644 --- a/src/coreComponents/physicsSolvers/fluidFlow/wells/CompositionalMultiphaseWell.cpp +++ b/src/coreComponents/physicsSolvers/fluidFlow/wells/CompositionalMultiphaseWell.cpp @@ -1502,7 +1502,7 @@ CompositionalMultiphaseWell::calculateLocalWellResidualNorm( real64 const & time { for( integer i = 0; i < numNorm; ++i ) { - localResidualNormalizer[i] = m_nonlinearSolverParameters.m_minNormalizer; + localResidualNormalizer[i] = nonlinearSolverParameters.m_minNormalizer; } } else if( isThermal() )