Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
4ec0e13
Merge remote-tracking branch 'origin/bugfix/rey/split-statistics-comp…
MelReyCG Mar 12, 2026
2226319
🚧 added user inputs to define the general concept
MelReyCG Mar 12, 2026
d362afa
🐛 wrapper params fix
MelReyCG Mar 13, 2026
2ab71be
📝 missing docs
MelReyCG Mar 13, 2026
876b54b
♻️ method should be private
MelReyCG Mar 13, 2026
db60577
♻️ follow conventions
MelReyCG Mar 13, 2026
db9049b
🚧 add set selection to stat aggregators
MelReyCG Mar 13, 2026
5271c27
✅ add a test case
MelReyCG Mar 13, 2026
0f6fb9c
📦 schema update
MelReyCG Mar 13, 2026
3143d5c
Merge remote-tracking branch 'origin/bugfix/rey/split-statistics-comp…
MelReyCG Mar 13, 2026
605e02f
🐛 fix merge issue
MelReyCG Mar 13, 2026
aa42af4
📝more precise docs
MelReyCG Mar 13, 2026
39f9fb0
✅ test fix (5x5 selection verified)
MelReyCG Mar 13, 2026
86499b8
📝 added sets data structure docs + show which name is dynamic
MelReyCG Mar 16, 2026
dda3ac6
🚧 infrastructure to support statistics processing on element sets
MelReyCG Mar 23, 2026
d30b810
🚧 infrastructure to support statistics aggregation of intersecting el…
MelReyCG Mar 24, 2026
1814382
✨ implemented statistics on sets
MelReyCG Mar 24, 2026
d78bae2
✨ smartly show different levels of stats (if needed / requested)
MelReyCG Mar 24, 2026
9778ad7
✨ added elements count in log
MelReyCG Mar 25, 2026
d16c26c
Merge branch 'bugfix/rey/split-statistics-components' into feature/re…
MelReyCG Mar 25, 2026
3265e39
🐛 wrong stats shown at set level
MelReyCG Mar 25, 2026
5b328ba
♻️ naming & explaining comments
MelReyCG Mar 25, 2026
da67ced
✅ add sets statistics to integrated tests
MelReyCG Mar 25, 2026
a789e0c
⚰️ useless comments
MelReyCG Mar 26, 2026
bb3e106
📝 docs adjustments
MelReyCG Mar 26, 2026
3c16d9c
🐛 fix set stats example
MelReyCG Mar 26, 2026
2a0e64e
📦 schema
MelReyCG Mar 26, 2026
c8544d1
🐛 correct way to take into account compound sets over MPI ranks (+ mi…
MelReyCG Apr 1, 2026
8cbc7e1
📝 verified stats time
MelReyCG Apr 8, 2026
daf2f46
fix: Infinite hang when MPI process crashes (#4001)
arng40 Apr 8, 2026
42588e1
Merge remote-tracking branch 'origin/bugfix/rey/split-statistics-comp…
MelReyCG Apr 8, 2026
56cc33a
📝 updated datarepo docs graph
MelReyCG Apr 8, 2026
c419a83
refactor: Change nodeset import from Int64 to unsigned integer (#4018)
castelletto1 Apr 8, 2026
6784689
Fix warning (#4020)
dkachuma Apr 9, 2026
547442e
feat: Add restart entries to constitutive drivers (#3883)
dkachuma Apr 10, 2026
de8920c
fix: balance compilation time and memory usage for MFD kernels (#4026)
OmarDuran Apr 11, 2026
3bda7f6
feat: Add Young Modulus & Poisson import from VTK mesh (#4021)
npillardou Apr 14, 2026
57b34fb
Merge remote-tracking branch 'origin/develop' into feature/rey/arbitr…
MelReyCG Apr 15, 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
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
baselines:
bucket: geosx
baseline: integratedTests/baseline_integratedTests-pr4007-16213-67a3002
baseline: integratedTests/baseline_integratedTests-pr4021-16339-bb862da

allow_fail:
all: ''
Expand Down
10 changes: 8 additions & 2 deletions BASELINE_NOTES.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,22 @@ PR #3836 (2026-03-11) <https://storage.googleapis.com/geosx/integratedTests/base
=====================
Added statistics `Group` objects for each statistics `Task` instance

PR #4021 (2026-04-14) <https://storage.googleapis.com/geosx/integratedTests/baseline_integratedTests-pr4021-16339-bb862da.tar.gz>
=====================
Add Young Modulus & Poisson import from VTK mesh

PR #3883 (2026-04-10) <https://storage.googleapis.com/geosx/integratedTests/baseline_integratedTests-pr3883-16299-3037085.tar.gz>
=====================
Move PVT Driver tests from unit tests to integrated tests

PR #4007 (2026-04-03) <https://storage.googleapis.com/geosx/integratedTests/baseline_integratedTests-pr4007-16213-67a3002.tar.gz>
=====================
Add XML input parameter: "hypredriveInputFile"

PR #3957 (2026-03-30) <https://storage.googleapis.com/geosx/integratedTests/baseline_integratedTests-pr3957-16171-da51804.tar.gz>
=====================
Add checkEulerCharacteristic option, rebaseline due to new input.

PR #3967 (2026-03-27) <https://storage.googleapis.com/geosx/integratedTests/baseline_integratedTests-pr3967-16106-c0f34de.tar.gz>
=====================
Fix 2D/3D cell co-location in parallel mesh redistribution

PR #3986 (2026-02-27) <https://storage.googleapis.com/geosx/integratedTests/baseline_integratedTests-pr3986-15734-7487221.tar.gz>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -191,15 +191,38 @@
</Outputs>
<!-- SPHINX_FIELD_CASE_Co2_OUTPUT_END -->


<!--
Do not remove the multiple CompositionalMultiphaseStatistics below:
the goal is also to test here the behaviour of intersecting & complementary sets.
-->

<!-- SPHINX_FIELD_CASE_Co2_TASKS -->
<Tasks>
<PackCollection
name="wellPressureCollection"
objectPath="ElementRegions/wellRegion/wellRegionUniqueSubRegion"
fieldName="pressure" />

<!-- stats table to compare the domain element set with the well surroundings element set -->
<CompositionalMultiphaseStatistics
name="domainAndInjectorFlowStats"
flowSolverName="compositionalMultiphaseFlow"
setNames="{all, injectorSurrounding}"
logLevel="1"
writeCSV="1"/>

<!-- stats table to compare the domain top part with the bottom part -->
<CompositionalMultiphaseStatistics
name="domainTopAndDownFlowStats"
flowSolverName="compositionalMultiphaseFlow"
setNames="{domainBottom, domainTop}"
logLevel="1"
writeCSV="1"/>

</Tasks>
<!-- SPHINX_FIELD_CASE_Co2_TASKS_END -->

<Functions>
<TableFunction
name="permxFunc"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,14 +26,38 @@
{ 525.0, 525.0, 6600.00 } }"
polylineSegmentConn="{ { 0, 1 } }"
radius="0.1"
numElementsPerSegment="2">
numElementsPerSegment="2"
logLevel="1">
<Perforation
name="injector1_perf1"
distanceFromHead="45"/>
</InternalWell>
</InternalMesh>
</Mesh>
<!-- SPHINX_FIELD_CASE_Co2_MESH_END -->

<!-- SPHINX_FIELD_CASE_Co2_GEOMETRY -->
<Geometry>

<!-- This Box should select 5 x 5 elements around the perforation -->
<!-- ( Perforated cell center is at [530, 500, 6008] ) -->
<Box
name="injectorSurrounding"
xMin="{ 470.0, 400.0, 6584.0 }"
xMax="{ 590.0, 600.0, 6632.0 }" />

<!-- These two boxes are the top and bottom parts of the domain, and should contain an equal number of elements -->
<Box
name="domainTop"
xMin="{ 0.0, 450.0, 6500.0 }"
xMax="{ 1000.0, 550.0, 7100.0 }" />
<Box
name="domainBottom"
xMin="{ 0.0, 450.0, 7100.0 }"
xMax="{ 1000.0, 550.0, 7700.0 }" />

</Geometry>
<!-- SPHINX_FIELD_CASE_Co2_GEOMETRY_END -->

<!-- SPHINX_FIELD_CASE_Co2_EVENTS -->
<Events
Expand Down Expand Up @@ -68,6 +92,16 @@
maxEventDt="5e5"
target="/Solvers/coupledFlowAndWells"/>

<PeriodicEvent
name="domainAndInjectorFlowStatsEvent"
cycleFrequency="10"
target="/Tasks/domainAndInjectorFlowStats"/>

<PeriodicEvent
name="domainTopAndDownFlowStatsEvent"
cycleFrequency="10"
target="/Tasks/domainTopAndDownFlowStats"/>

</Events>
<!-- SPHINX_FIELD_CASE_Co2_EVENTS_END -->
</Problem>
24 changes: 24 additions & 0 deletions inputFiles/constitutiveDriver/constitutiveDriver.ats
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
from geos.ats.test_builder import TestDeck, RestartcheckParameters, generate_geos_tests

restartcheck_params = {'atol': 1e-08, 'rtol': 4e-07}

def create_pvt_test(name, description=None):
if description is None: description = name
return TestDeck(
name=name,
description=description,
partitions=[(1, 1, 1)],
restart_step=0,
check_step=0,
restartcheck_params=RestartcheckParameters(**restartcheck_params))

decks = [
create_pvt_test("testPVT"),
create_pvt_test("testPVT_CO2Brine", "PVT Driver test for CO2 fluid models"),
create_pvt_test("testPVT_CO2BrineTables", "PVT Driver test for CO2 fluid models with solubility tables"),
create_pvt_test("testPVT_PhaseComposition", "PVT Driver test with composition output"),
create_pvt_test("testPVT_ThreePhaseCompositional", "PVT Driver test for three phase compositional models"),
create_pvt_test("testPVT_docExample", "PVT Driver documentation example")
]

generate_geos_tests(decks)
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
feedComposition="{ 0.1, 0.9 }"
pressureControl="pressureFunction"
temperatureControl="temperatureFunction"
steps="49"
baseline="testPVT_hydrogenMixtureA.txt"
steps="50"
output="testPVT_hydrogenMixtureA.txt"
logLevel="1"/>

<PVTDriver
Expand All @@ -18,8 +18,8 @@
feedComposition="{ 0.5, 0.5 }"
pressureControl="pressureFunction"
temperatureControl="temperatureFunction"
steps="49"
baseline="testPVT_hydrogenMixtureB.txt"
steps="50"
output="testPVT_hydrogenMixtureB.txt"
logLevel="1"/>

<PVTDriver
Expand All @@ -28,8 +28,8 @@
feedComposition="{ 1.0, 0.0 }"
pressureControl="pressureFunction"
temperatureControl="temperatureFunction"
steps="49"
baseline="testPVT_CO2.txt"
steps="50"
output="testPVT_CO2.txt"
logLevel="1"/>

<PVTDriver
Expand All @@ -38,11 +38,16 @@
feedComposition="{ 0.0, 1.0 }"
pressureControl="pressureFunction"
temperatureControl="temperatureFunction"
steps="49"
baseline="testPVT_brine.txt"
steps="50"
output="testPVT_Brine.txt"
logLevel="1"/>
</Tasks>

<Outputs>
<Restart
name="restartOutput"/>
</Outputs>

<Events
maxTime="1">
<SoloEvent
Expand All @@ -60,6 +65,12 @@
<SoloEvent
name="eventD"
target="/Tasks/testBrine"/>

<PeriodicEvent
name="restarts"
timeFrequency="1"
targetExactTimestep="0"
target="/Outputs/restartOutput"/>
</Events>

<Constitutive>
Expand All @@ -69,7 +80,7 @@
componentNames="{ co2, water }"
componentMolarWeight="{ 44e-3, 18e-3 }"
phasePVTParaFiles="{ testPVT_data/carbonDioxidePVT.txt, testPVT_data/brinePVT.txt }"
flashModelParaFile="testPVT_data/carbonDioxideFlash.txt"/>
flashModelParaFile="testPVT_data/carbonDioxideFlash.txt" />

<CompositionalMultiphaseFluid
name="hydrogenMixture"
Expand All @@ -95,25 +106,4 @@
coordinates="{ 0.0, 1.0 }"
values="{ 350, 350 }"/>
</Functions>

<!-- Mesh is not used, but GEOSX throws an error without one. Will resolve soon-->
<Mesh>
<InternalMesh
name="mesh1"
elementTypes="{ C3D8 }"
xCoords="{ 0, 1 }"
yCoords="{ 0, 1 }"
zCoords="{ 0, 1 }"
nx="{ 1 }"
ny="{ 1 }"
nz="{ 1 }"
cellBlockNames="{ cellBlock01 }"/>
</Mesh>

<ElementRegions>
<CellElementRegion
name="dummy"
cellBlocks="{ * }"
materialList="{ dummy }"/>
</ElementRegions>
</Problem>
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
steps="20"
outputCompressibility="1"
outputPhaseComposition="1"
baseline="testPVT_CO2Brine_testCo2BrinePhillipsMixtureA.txt"
output="testPVT_CO2Brine_testCo2BrinePhillipsMixtureA.txt"
logLevel="1" />
<PVTDriver
name="testCo2BrinePhillipsMixtureB"
Expand All @@ -22,7 +22,7 @@
steps="20"
outputCompressibility="1"
outputPhaseComposition="1"
baseline="testPVT_CO2Brine_testCo2BrinePhillipsMixtureB.txt"
output="testPVT_CO2Brine_testCo2BrinePhillipsMixtureB.txt"
precision="6"
logLevel="1" />
<PVTDriver
Expand All @@ -34,7 +34,7 @@
steps="20"
outputCompressibility="1"
outputPhaseComposition="1"
baseline="testPVT_CO2Brine_testCo2BrineEzrokhiMixtureA.txt"
output="testPVT_CO2Brine_testCo2BrineEzrokhiMixtureA.txt"
logLevel="1" />
<PVTDriver
name="testCo2BrineEzrokhiMixtureB"
Expand All @@ -45,7 +45,7 @@
steps="20"
outputCompressibility="1"
outputPhaseComposition="1"
baseline="testPVT_CO2Brine_testCo2BrineEzrokhiMixtureB.txt"
output="testPVT_CO2Brine_testCo2BrineEzrokhiMixtureB.txt"
logLevel="1" />
<PVTDriver
name="testCo2SpycherPruessBrinePhillipsMixtureA"
Expand All @@ -56,7 +56,7 @@
steps="20"
outputCompressibility="1"
outputPhaseComposition="1"
baseline="testPVT_CO2Brine_testCo2SpycherPruessBrinePhillipsMixtureA.txt"
output="testPVT_CO2Brine_testCo2SpycherPruessBrinePhillipsMixtureA.txt"
logLevel="1" />
<PVTDriver
name="testCo2SpycherPruessBrinePhillipsMixtureB"
Expand All @@ -67,7 +67,7 @@
steps="20"
outputCompressibility="1"
outputPhaseComposition="1"
baseline="testPVT_CO2Brine_testCo2SpycherPruessBrinePhillipsMixtureB.txt"
output="testPVT_CO2Brine_testCo2SpycherPruessBrinePhillipsMixtureB.txt"
logLevel="1" />
<PVTDriver
name="testCo2BrinePhillipsMixtureThermalA"
Expand All @@ -79,7 +79,7 @@
outputCompressibility="1"
outputPhaseComposition="1"
outputMassDensity="1"
baseline="testPVT_CO2Brine_testCo2BrinePhillipsMixtureThermalA.txt"
output="testPVT_CO2Brine_testCo2BrinePhillipsMixtureThermalA.txt"
logLevel="1" />
<PVTDriver
name="testCo2BrinePhillipsMixtureThermalB"
Expand All @@ -91,9 +91,14 @@
outputCompressibility="1"
outputPhaseComposition="1"
outputMassDensity="1"
baseline="testPVT_CO2Brine_testCo2BrinePhillipsMixtureThermalB.txt"
output="testPVT_CO2Brine_testCo2BrinePhillipsMixtureThermalB.txt"
logLevel="1" />
</Tasks>

<Outputs>
<Restart
name="restartOutput"/>
</Outputs>

<Events
maxTime="1">
Expand Down Expand Up @@ -121,6 +126,12 @@
<SoloEvent
name="eventCo2BrinePhillipsMixtureThermalB"
target="/Tasks/testCo2BrinePhillipsMixtureThermalB" />

<PeriodicEvent
name="restarts"
timeFrequency="1"
targetExactTimestep="0"
target="/Outputs/restartOutput"/>
</Events>

<Constitutive>
Expand Down
Loading
Loading