From a5c7cfad12f5ffec120b7c849ee68486fec9b11d Mon Sep 17 00:00:00 2001 From: dkachuma Date: Tue, 13 Oct 2026 17:48:19 +0200 Subject: [PATCH 1/6] Use user supplied water compressibility --- .../CO2Brine/functions/PhillipsBrineDensity.cpp | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/coreComponents/constitutive/fluid/multifluid/CO2Brine/functions/PhillipsBrineDensity.cpp b/src/coreComponents/constitutive/fluid/multifluid/CO2Brine/functions/PhillipsBrineDensity.cpp index da8b4c868e9..53eb3f221d4 100644 --- a/src/coreComponents/constitutive/fluid/multifluid/CO2Brine/functions/PhillipsBrineDensity.cpp +++ b/src/coreComponents/constitutive/fluid/multifluid/CO2Brine/functions/PhillipsBrineDensity.cpp @@ -74,7 +74,8 @@ void calculateBrineDensity( PTTableCoordinates const & tableCoords, void calculatePureWaterDensity( PTTableCoordinates const & tableCoords, string const & functionName, - array1d< real64 > const & densities ) + array1d< real64 > const & densities, + real64 const waterCompressibility ) { // if no salinity, we fall back to the standard approach in three steps // 1- Get the saturation density as a function of temperature @@ -102,9 +103,6 @@ void calculatePureWaterDensity( PTTableCoordinates const & tableCoords, // Step 2: get the saturation pressure real64 const waterSatPressure = waterSatPressureTable->evaluate( &T ); // Step 3: get the pure water density - // Note: for now, we keep a constant water compressibility for consistency with the Ezrokhi model - // In the future, we should query the water compressibility as a function of pressure and temperature in a table - real64 const waterCompressibility = 4.5e-10; // Pa-1 // TODO: consolidate to a unique file as Dick started doing densities[j*nPressures+i] = waterSatDensity * exp( waterCompressibility * ( P - waterSatPressure ) ); } } @@ -147,7 +145,8 @@ TableFunction const * makeDensityTable( BrineFluidParameters const & brineFluidP { // the Phillips correlation is inaccurate in the absence of salinity. // since this is a very frequent case, we implement an alternate (more accurate) method below - calculatePureWaterDensity( tableCoords, functionName, densities ); + real64 const waterCompressibility = brineFluidParameters.m_waterCompressibility; + calculatePureWaterDensity( tableCoords, functionName, densities, waterCompressibility ); } TableFunction * const densityTable = dynamicCast< TableFunction * >( functionManager.createChild( "TableFunction", tableName ) ); From 9c8a12ecf1bf43e466b40e9d3559ba5bfb9fc7bc Mon Sep 17 00:00:00 2001 From: dkachuma Date: Fri, 16 Oct 2026 14:06:27 +0200 Subject: [PATCH 2/6] Add regression test --- .../constitutiveDriver/testPVT_CO2Brine.xml | 26 +++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/inputFiles/constitutiveDriver/testPVT_CO2Brine.xml b/inputFiles/constitutiveDriver/testPVT_CO2Brine.xml index b53ab93aac3..7b411729543 100644 --- a/inputFiles/constitutiveDriver/testPVT_CO2Brine.xml +++ b/inputFiles/constitutiveDriver/testPVT_CO2Brine.xml @@ -93,6 +93,18 @@ outputMassDensity="1" output="testPVT_CO2Brine_testCo2BrinePhillipsMixtureThermalB.txt" logLevel="1" /> + @@ -126,6 +138,9 @@ + + From 049b9b34b9da96170f4efd77d0ff80030d464243 Mon Sep 17 00:00:00 2001 From: dkachuma Date: Fri, 16 Oct 2026 16:17:19 +0200 Subject: [PATCH 3/6] Rebaseline --- .integrated_tests.yaml | 2 +- BASELINE_NOTES.md | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/.integrated_tests.yaml b/.integrated_tests.yaml index 74cea56702e..acf148e72df 100644 --- a/.integrated_tests.yaml +++ b/.integrated_tests.yaml @@ -1,6 +1,6 @@ baselines: bucket: geosx - baseline: integratedTests/baseline_integratedTests-pr3996-17639-718fc69 + baseline: integratedTests/baseline_integratedTests-pr4165-17772-9c8a12e allow_fail: all: '' diff --git a/BASELINE_NOTES.md b/BASELINE_NOTES.md index e700a96f185..32614a1da94 100644 --- a/BASELINE_NOTES.md +++ b/BASELINE_NOTES.md @@ -4,6 +4,11 @@ Notes 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 #4165 (2026-10-16) +===================== +Add zero salinity, non-default compressibility pvt driver test + PR #3996 (2026-09-20) ===================== Switch the single-phase reactive transport solver to a molality-based primary From 82b6fc81abd615bc9328362d9d4aefd3379348b9 Mon Sep 17 00:00:00 2001 From: MelReyCG Date: Wed, 28 Oct 2026 18:27:20 +0100 Subject: [PATCH 4/6] =?UTF-8?q?=F0=9F=92=9A=20rebaseline=20(structural=20o?= =?UTF-8?q?nly)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .integrated_tests.yaml | 2 +- BASELINE_NOTES.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.integrated_tests.yaml b/.integrated_tests.yaml index ec41ed6c4b9..d5994413ab7 100644 --- a/.integrated_tests.yaml +++ b/.integrated_tests.yaml @@ -1,6 +1,6 @@ baselines: bucket: geosx - baseline: integratedTests/baseline_integratedTests-pr4005-17824-bac337a + baseline: integratedTests/baseline_integratedTests-pr4165-17833-2b34841 allow_fail: all: '' diff --git a/BASELINE_NOTES.md b/BASELINE_NOTES.md index 23b7c6c978c..414f07a38f1 100644 --- a/BASELINE_NOTES.md +++ b/BASELINE_NOTES.md @@ -5,7 +5,7 @@ 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 #4165 (2026-10-16) +PR #4165 (2026-10-28) Add zero salinity, non-default compressibility pvt driver test PR #4005 (2026-10-23) From 2c8eb0f6aa94c8f5924dea71efe6b14df3ee5272 Mon Sep 17 00:00:00 2001 From: "Victor A. P. Magri" <50467563+victorapm@users.noreply.github.com> Date: Wed, 28 Oct 2026 16:13:28 -0400 Subject: [PATCH 5/6] Update baseline --- .integrated_tests.yaml | 2 +- BASELINE_NOTES.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.integrated_tests.yaml b/.integrated_tests.yaml index 7168aca1149..373eae27d7a 100644 --- a/.integrated_tests.yaml +++ b/.integrated_tests.yaml @@ -1,6 +1,6 @@ baselines: bucket: geosx - baseline: integratedTests/baseline_integratedTests-pr4165-17833-2b34841 + baseline: integratedTests/baseline_integratedTests-pr4165-17850-4a6ed2e allow_fail: all: '' streak: '' \ No newline at end of file diff --git a/BASELINE_NOTES.md b/BASELINE_NOTES.md index 09d97717238..a0806667245 100644 --- a/BASELINE_NOTES.md +++ b/BASELINE_NOTES.md @@ -5,7 +5,7 @@ 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 #4165 (2026-10-28) +PR #4165 (2026-10-28) ===================== Add zero salinity, non-default compressibility pvt driver test From 215c25c334f696ceada79e5bc79fc547c705c761 Mon Sep 17 00:00:00 2001 From: "Victor A. P. Magri" <50467563+victorapm@users.noreply.github.com> Date: Thu, 29 Oct 2026 07:40:52 -0400 Subject: [PATCH 6/6] Trigger CI --- BASELINE_NOTES.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/BASELINE_NOTES.md b/BASELINE_NOTES.md index a0806667245..d18697ae942 100644 --- a/BASELINE_NOTES.md +++ b/BASELINE_NOTES.md @@ -5,7 +5,7 @@ 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 #4165 (2026-10-28) +PR #4165 (2026-10-29) ===================== Add zero salinity, non-default compressibility pvt driver test