Skip to content

Commit 08bd4c6

Browse files
dkachumacastelletto1DENEL Bertrand
authored
Trim tests (#4055)
* Trim tests * Update baseline notes with recent PR entries Added entries for pull requests 4055, 4029, and 3959 with details. * Update baseline for integrated tests * rebaseline --------- Co-authored-by: Nicola Castelletto <38361926+castelletto1@users.noreply.github.com> Co-authored-by: DENEL Bertrand <bertrand.denel@total.com>
1 parent 634f2f9 commit 08bd4c6

25 files changed

Lines changed: 200 additions & 558 deletions

‎.integrated_tests.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
baselines:
22
bucket: geosx
3-
baseline: integratedTests/baseline_integratedTests-pr4041-16664-9a29348
3+
baseline: integratedTests/baseline_integratedTests-pr4055-16683-0251bb6
44

55
allow_fail:
66
all: ''

‎BASELINE_NOTES.md‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,10 @@ This file is designed to track changes to the integrated test baselines.
55
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.
66
These notes should be in reverse-chronological order, and use the following time format: (YYYY-MM-DD).
77

8+
PR #4055 (2026-05-18) <https://storage.googleapis.com/geosx/integratedTests/baseline_integratedTests-pr4055-16683-0251bb6.tar.gz>
9+
Trim some fluid model tests
10+
811
PR #4041 (2026-05-16) <https://storage.googleapis.com/geosx/integratedTests/baseline_integratedTests-pr4041-16664-9a29348.tar.gz>
9-
=====================
1012
Fix wellbore nonlinear thermal diffusion
1113

1214
PR #3977 (2026-05-15) <https://storage.googleapis.com/geosx/integratedTests/baseline_integratedTests-pr3977-16644-9fc03e7.tar.gz>

‎inputFiles/compositionalMultiphaseWell/compositionalMultiphaseWell.ats‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -137,14 +137,14 @@ decks = [
137137
name="dome_soreide_whitson_smoke",
138138
description="Injection into a depleted reservoir using the Soreide Whitson EoS",
139139
partitions=[(1, 1, 1), (2, 2, 1)],
140-
restart_step=50,
140+
restart_step=100,
141141
check_step=150,
142142
restartcheck_params=RestartcheckParameters(**restartcheck_params)),
143143
TestDeck(
144144
name="dome_kvalue_smoke",
145145
description="Injection into a depleted reservoir using a K-Value model",
146146
partitions=[(1, 1, 1), (2, 2, 1)],
147-
restart_step=50,
147+
restart_step=100,
148148
check_step=150,
149149
restartcheck_params=RestartcheckParameters(**restartcheck_params))
150150
]

‎inputFiles/compositionalMultiphaseWell/dome_initialisation.xml‎

Lines changed: 0 additions & 145 deletions
This file was deleted.

‎inputFiles/compositionalMultiphaseWell/dome_kvalue_base.xml‎

Lines changed: 45 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -7,22 +7,19 @@
77
wellSolverName="WELL.SOLVER"
88
targetRegions="{ SAND, CLAY, WATER.INJECTOR, GAS.INJECTOR, PRODUCER }"
99
logLevel="1"
10-
initialDt="3600">
10+
initialDt="86400">
1111
<NonlinearSolverParameters
1212
newtonTol="1.0e-3"
1313
lineSearchAction="None"
14-
lineSearchStartingIteration="4"
15-
timeStepIncreaseIterLimit="0.5"
16-
timeStepDecreaseIterLimit="0.6"
14+
timeStepIncreaseIterLimit="0.4"
15+
timeStepDecreaseIterLimit="0.9"
1716
maxTimeStepCuts="100"
1817
maxSubSteps="1000"
19-
newtonMaxIter="10"
18+
newtonMaxIter="12"
2019
logLevel="0" />
2120
<LinearSolverParameters
2221
solverType="fgmres"
2322
preconditionerType="mgr"
24-
iluFill="1"
25-
directParallel="0"
2623
krylovMaxIter="200"
2724
krylovTol="1e-4"
2825
krylovAdaptiveTol="1"
@@ -178,7 +175,20 @@
178175
wettingNonWettingSurfaceTension="13.86955e-3"
179176
permeabilityDirection="X" />
180177
</Constitutive>
181-
178+
179+
<FieldSpecifications>
180+
<HydrostaticEquilibrium
181+
name="EQUILIBRIUM"
182+
objectPath="ElementRegions"
183+
datumElevation="-4453.75"
184+
datumPressure="2.7e7"
185+
elevationIncrementInHydrostaticPressureTable="1.0"
186+
phaseContacts="{ -4400.0 }"
187+
componentNames="{ CH4, CO2, H2S, H2O }"
188+
componentFractionVsElevationTableNames="{ CH4.VD, CO2.VD, H2S.VD, H2O.VD }"
189+
temperatureVsElevationTableName="TEMP.VD" />
190+
</FieldSpecifications>
191+
182192
<Outputs>
183193
<VTK
184194
name="VTK.OUTPUT" />
@@ -200,7 +210,7 @@
200210
<TableFunction
201211
name="KRW.SAND"
202212
interpolation="linear"
203-
coordinates="{ 0.14000,0.20000,0.24938,0.29875,0.34813,0.39750,0.44688,0.49625,0.54563,0.59500,0.64438,0.69375,0.74313,0.79250,0.84187,0.89125,0.92000,0.94063,0.99000 }"
213+
coordinates="{ 0.04000,0.20000,0.24938,0.29875,0.34813,0.39750,0.44688,0.49625,0.54563,0.59500,0.64438,0.69375,0.74313,0.79250,0.84187,0.89125,0.92000,0.94063,0.99000 }"
204214
values="{ 0.00000,0.00000,0.00680,0.02368,0.04914,0.08247,0.12323,0.17110,0.22582,0.28717,0.35499,0.42913,0.50944,0.59581,0.68815,0.78635,0.84619,0.89032,1.00000 }" />
205215
<TableFunction
206216
name="KRG.SAND"
@@ -210,12 +220,12 @@
210220
<TableFunction
211221
name="PCGW.SAND"
212222
interpolation="linear"
213-
coordinates="{ 0.14000,0.20000,0.24938,0.29875,0.34813,0.39750,0.44688,0.49625,0.54563,0.59500,0.64438,0.69375,0.74313,0.79250,0.84187,0.89125,0.92000,0.94063,0.99000 }"
223+
coordinates="{ 0.04000,0.20000,0.24938,0.29875,0.34813,0.39750,0.44688,0.49625,0.54563,0.59500,0.64438,0.69375,0.74313,0.79250,0.84187,0.89125,0.92000,0.94063,0.98000 }"
214224
values="{ 1.22628e+06,1.18131e+06,1.13877e+06,1.09118e+06,1.03875e+06,9.82212e+05,9.21985e+05,8.58471e+05,7.92077e+05,7.23208e+05,6.52271e+05,5.77796e+05,4.96916e+05,4.08363e+05,3.13267e+05,2.12756e+05,1.51885e+05,1.07957e+05,0.00000e+00 }" />
215225
<TableFunction
216226
name="KRW.CLAY"
217227
interpolation="linear"
218-
coordinates="{ 0.23000,0.28000,0.32312,0.36625,0.40938,0.45250,0.49562,0.53875,0.58188,0.62500,0.66812,0.71125,0.75438,0.79750,0.84062,0.88000,0.92688,0.97000 }"
228+
coordinates="{ 0.04000,0.28000,0.32312,0.36625,0.40938,0.45250,0.49562,0.53875,0.58188,0.62500,0.66812,0.71125,0.75438,0.79750,0.84062,0.88000,0.92688,0.97000 }"
219229
values="{ 0.00000,0.00000,0.00170,0.00837,0.02128,0.04123,0.06889,0.10478,0.14937,0.20306,0.26625,0.33925,0.42240,0.51599,0.62029,0.72510,0.86205,1.00000 }" />
220230
<TableFunction
221231
name="KRG.CLAY"
@@ -225,7 +235,7 @@
225235
<TableFunction
226236
name="PCGW.CLAY"
227237
interpolation="linear"
228-
coordinates="{ 0.23000,0.28000,0.32312,0.36625,0.40938,0.45250,0.49562,0.53875,0.58188,0.62500,0.66812,0.71125,0.75438,0.79750,0.84062,0.88000,0.92688,0.97000 }"
238+
coordinates="{ 0.04000,0.28000,0.32312,0.36625,0.40938,0.45250,0.49562,0.53875,0.58188,0.62500,0.66812,0.71125,0.75438,0.79750,0.84062,0.88000,0.92688,0.95000 }"
229239
values="{ 6.13141e+01,5.91753e+01,5.70544e+01,5.46673e+01,5.20482e+01,4.92216e+01,4.62081e+01,4.30281e+01,3.97023e+01,3.62512e+01,3.26953e+01,2.89654e+01,2.49159e+01,2.04791e+01,1.57120e+01,1.11278e+01,5.41541e+00,0.00000e+00 }" />
230240

231241
<TableFunction
@@ -253,6 +263,27 @@
253263
coordinateFiles="{ tables/kv_pressure.txt, tables/kv_temperature.txt }"
254264
voxelFile="tables/kv_H2O.txt" />
255265

266+
<TableFunction
267+
name="TEMP.VD"
268+
coordinates="{ -5000.0, -4000.0 }"
269+
values="{ 344.15, 344.15 }" />
270+
<TableFunction
271+
name="CH4.VD"
272+
coordinates="{ -5000.0, -4000.0 }"
273+
values="{ 0.1, 0.80 }" />
274+
<TableFunction
275+
name="CO2.VD"
276+
coordinates="{ -5000.0, -4000.0 }"
277+
values="{ 0.0, 0.0 }" />
278+
<TableFunction
279+
name="H2S.VD"
280+
coordinates="{ -5000.0, -4000.0 }"
281+
values="{ 0.0, 0.05 }" />
282+
<TableFunction
283+
name="H2O.VD"
284+
coordinates="{ -5000.0, -4000.0 }"
285+
values="{ 0.9, 0.15 }" />
286+
256287
<TableFunction
257288
name="GAS.INJECTOR.RATE"
258289
interpolation="lower"
@@ -263,8 +294,8 @@
263294
name="PRODUCER.RATE"
264295
interpolation="lower"
265296
inputVarNames="{ time }"
266-
coordinates="{ 0, 157788000, 252460800 }"
267-
values="{ 15, 15, 0 }" />
297+
coordinates="{ -31557600, 0, 157788000, 252460800 }"
298+
values="{ 0, 15, 15, 0 }" />
268299
<TableFunction
269300
name="WATER.INJECTOR.RATE"
270301
interpolation="lower"
@@ -299,6 +330,5 @@
299330

300331
<Included>
301332
<File name="dome_properties.xml" />
302-
<File name="dome_initialisation.xml" />
303333
</Included>
304334
</Problem>

‎inputFiles/compositionalMultiphaseWell/dome_kvalue_bench.xml‎

Lines changed: 1 addition & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -2,52 +2,6 @@
22
<Problem>
33
<Included>
44
<File name="dome_kvalue_base.xml" />
5+
<File name="dome_mesh_bench.xml" />
56
</Included>
6-
7-
<Mesh>
8-
<VTKMesh
9-
name="mesh"
10-
file="dome_bench.vti"
11-
logLevel="2">
12-
<InternalWell
13-
logLevel="1"
14-
name="well.WATER.INJECTOR"
15-
wellRegionName="WATER.INJECTOR"
16-
wellControlsName="WATER.INJECTOR.CONTROL"
17-
polylineNodeCoords="{{ 125.0, 25.0, -4500.0 }, { 125.0, 25.0, -4510.0 }}"
18-
polylineSegmentConn="{{0,1}}"
19-
radius="0.083350"
20-
numElementsPerSegment="1">
21-
<Perforation
22-
name="WATER.INJECTOR.1"
23-
distanceFromHead="5.0" />
24-
</InternalWell>
25-
<InternalWell
26-
logLevel="1"
27-
name="well.GAS.INJECTOR"
28-
wellRegionName="GAS.INJECTOR"
29-
wellControlsName="GAS.INJECTOR.CONTROL"
30-
polylineNodeCoords="{{ 125.0, 25.0, -4500.0 }, { 125.0, 25.0, -4510.0 }}"
31-
polylineSegmentConn="{{0,1}}"
32-
radius="0.083350"
33-
numElementsPerSegment="1">
34-
<Perforation
35-
name="GAS.INJECTOR.1"
36-
distanceFromHead="5.0" />
37-
</InternalWell>
38-
<InternalWell
39-
logLevel="1"
40-
name="well.PRODUCER"
41-
wellRegionName="PRODUCER"
42-
wellControlsName="PRODUCER.CONTROL"
43-
polylineNodeCoords="{{ 125.0, 25.0, -4500.0 }, { 125.0, 25.0, -4510.0 }}"
44-
polylineSegmentConn="{{0,1}}"
45-
radius="0.083350"
46-
numElementsPerSegment="1">
47-
<Perforation
48-
name="PRODUCER.1"
49-
distanceFromHead="5.0" />
50-
</InternalWell>
51-
</VTKMesh>
52-
</Mesh>
537
</Problem>

0 commit comments

Comments
 (0)