Skip to content

Commit 58b19fe

Browse files
authored
test: refine comp flow tests (#3479)
1 parent 95ef429 commit 58b19fe

17 files changed

+74
-79
lines changed

.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-pr3490-9351-03417a1
3+
baseline: integratedTests/baseline_integratedTests-pr3479-9362-cffefcc
44
allow_fail:
55
all: ''
66
streak: ''

BASELINE_NOTES.md

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

9+
PR #3479 (2024-12-15)
10+
=====================
11+
Refine inputFiles/compositionalMultiphaseFlow: shift reference pressures to initial pressures, make nonlinear tuning more reasonable, minimize output.
12+
913
PR #3450 (2024-12-14)
1014
=====================
11-
Fix time step selecor flaw in SolidMechanicsLagrangeContact.
15+
Fix timestep selector flaw in SolidMechanicsLagrangeContact.
1216

1317
PR #3450 (2024-12-08)
1418
=====================

inputFiles/compositionalMultiphaseFlow/2ph_cap_1d_ihu.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@
9494
<PressurePorosity
9595
name="rockPorosity"
9696
defaultReferencePorosity="0.2"
97-
referencePressure="0.0"
97+
referencePressure="7.5e6"
9898
compressibility="1.0e-9"/>
9999

100100
<BrooksCoreyRelativePermeability

inputFiles/compositionalMultiphaseFlow/4comp_2ph_1d.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@
104104
<PressurePorosity
105105
name="rockPorosity"
106106
defaultReferencePorosity="0.2"
107-
referencePressure="0.0"
107+
referencePressure="5e6"
108108
compressibility="1.0e-9"/>
109109

110110
<BrooksCoreyRelativePermeability

inputFiles/compositionalMultiphaseFlow/4comp_2ph_cap_1d.xml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
maxTime="2e7">
4646
<PeriodicEvent
4747
name="outputs"
48-
timeFrequency="1e6"
48+
timeFrequency="1e7"
4949
target="/Outputs/siloOutput"/>
5050

5151
<PeriodicEvent
@@ -77,8 +77,7 @@
7777
<NumericalMethods>
7878
<FiniteVolume>
7979
<TwoPointFluxApproximation
80-
name="fluidTPFA"
81-
/>
80+
name="fluidTPFA"/>
8281
</FiniteVolume>
8382
</NumericalMethods>
8483

@@ -117,7 +116,7 @@
117116
<PressurePorosity
118117
name="rockPorosity"
119118
defaultReferencePorosity="0.2"
120-
referencePressure="0.0"
119+
referencePressure="5e6"
121120
compressibility="1.0e-9"/>
122121

123122
<BrooksCoreyRelativePermeability

inputFiles/compositionalMultiphaseFlow/co2_flux_3d.xml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,10 @@
99
temperature="368.15"
1010
useMass="1"
1111
useTotalMassEquation="0"
12-
useSimpleAccumulation="1"
1312
targetRegions="{ region }">
1413
<NonlinearSolverParameters
1514
newtonTol="1.0e-5"
16-
newtonMaxIter="100"
17-
maxTimeStepCuts="5"
15+
newtonMaxIter="10"
1816
lineSearchAction="None"/>
1917
<LinearSolverParameters
2018
directParallel="0"/>
@@ -92,7 +90,7 @@
9290

9391
<PeriodicEvent
9492
name="outputs"
95-
timeFrequency="1e5"
93+
timeFrequency="5e5"
9694
target="/Outputs/vtkOutput"/>
9795

9896
<PeriodicEvent
@@ -136,7 +134,7 @@
136134
<PressurePorosity
137135
name="rockPorosity"
138136
defaultReferencePorosity="0.2"
139-
referencePressure="0.0"
137+
referencePressure="1.1e7"
140138
compressibility="1.0e-9"/>
141139
<ConstantPermeability
142140
name="rockPerm"

inputFiles/compositionalMultiphaseFlow/co2_flux_dirichlet.xml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,7 @@
1111
targetRegions="{ region }">
1212
<NonlinearSolverParameters
1313
newtonTol="1.0e-4"
14-
newtonMaxIter="100"
15-
maxTimeStepCuts="5"
14+
newtonMaxIter="20"
1615
lineSearchAction="None"/>
1716
<LinearSolverParameters
1817
solverType="fgmres"
@@ -61,7 +60,7 @@
6160

6261
<PeriodicEvent
6362
name="outputs"
64-
timeFrequency="1e5"
63+
timeFrequency="5e5"
6564
targetExactTimestep="1"
6665
target="/Outputs/vtkOutput" />
6766

inputFiles/compositionalMultiphaseFlow/co2_hybrid_1d.xml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,7 @@
1414
targetRegions="{ region }">
1515
<NonlinearSolverParameters
1616
newtonTol="1.0e-6"
17-
newtonMaxIter="100"
18-
maxTimeStepCuts="5"/>
17+
newtonMaxIter="10"/>
1918
<LinearSolverParameters
2019
directParallel="0"/>
2120
</CompositionalMultiphaseHybridFVM>
@@ -50,7 +49,7 @@
5049
maxTime="1e5">
5150
<PeriodicEvent
5251
name="outputs"
53-
timeFrequency="1e4"
52+
timeFrequency="5e4"
5453
target="/Outputs/vtkOutput"/>
5554

5655
<PeriodicEvent
@@ -100,7 +99,7 @@
10099
<PressurePorosity
101100
name="rockPorosity"
102101
defaultReferencePorosity="0.2"
103-
referencePressure="0.0"
102+
referencePressure="9e6"
104103
compressibility="1.0e-9"/>
105104

106105
<BrooksCoreyRelativePermeability

inputFiles/compositionalMultiphaseFlow/compositionalMultiphaseFlow.ats

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,22 @@ decks = [
2121
restart_step=118,
2222
check_step=218,
2323
restartcheck_params=RestartcheckParameters(**restartcheck_params)),
24+
TestDeck(
25+
name="co2_hybrid_1d",
26+
description=
27+
"Compositional co2-brine flow test (1D displacement, hybrid FVM, Brooks-Corey pairwise 2-phase relperm curves)",
28+
partitions=((1, 1, 1), (2, 1, 1), (3, 1, 1)),
29+
restart_step=5,
30+
check_step=10,
31+
restartcheck_params=RestartcheckParameters(**restartcheck_params)),
32+
TestDeck(
33+
name="2ph_cap_1d_ihu",
34+
description=
35+
"Two-phase flow test for IHU (1D displacement, 2-phase, capillary pressure)",
36+
partitions=((1, 1, 1), (3, 1, 1)),
37+
restart_step=34,
38+
check_step=60,
39+
restartcheck_params=RestartcheckParameters(**restartcheck_params)),
2440
TestDeck(
2541
name="deadoil_3ph_corey_1d",
2642
description=
@@ -45,14 +61,6 @@ decks = [
4561
restart_step=0,
4662
check_step=209,
4763
restartcheck_params=RestartcheckParameters(**restartcheck_params)),
48-
TestDeck(
49-
name="co2_hybrid_1d",
50-
description=
51-
"Compositional co2-brine flow test (1D displacement, hybrid FVM, Brooks-Corey pairwise 2-phase relperm curves)",
52-
partitions=((1, 1, 1), (2, 1, 1), (3, 1, 1)),
53-
restart_step=5,
54-
check_step=10,
55-
restartcheck_params=RestartcheckParameters(**restartcheck_params)),
5664
TestDeck(
5765
name="deadoil_3ph_baker_1d",
5866
description=
@@ -77,6 +85,14 @@ decks = [
7785
restart_step=28,
7886
check_step=38,
7987
restartcheck_params=RestartcheckParameters(**restartcheck_params)),
88+
TestDeck(
89+
name="deadoil_3ph_staircase_obl_3d",
90+
description=
91+
"Smoke test for a staircase deadoil test (3D displacement, 3-phase dead-oil, OBL)",
92+
partitions=((1, 1, 1), (2, 2, 2)),
93+
restart_step=28,
94+
check_step=38,
95+
restartcheck_params=RestartcheckParameters(**restartcheck_params)),
8096
TestDeck(
8197
name="deadoil_2ph_staircase_gravity_segregation_3d",
8298
description=
@@ -100,23 +116,7 @@ decks = [
100116
partitions=((1, 1, 1), (2, 1, 3)),
101117
restart_step=23,
102118
check_step=46,
103-
restartcheck_params=RestartcheckParameters(**restartcheck_params)),
104-
TestDeck(
105-
name="deadoil_3ph_staircase_obl_3d",
106-
description=
107-
"Smoke test for a staircase deadoil test (3D displacement, 3-phase dead-oil, OBL)",
108-
partitions=((1, 1, 1), (2, 2, 2)),
109-
restart_step=28,
110-
check_step=38,
111-
restartcheck_params=RestartcheckParameters(**restartcheck_params)),
112-
TestDeck(
113-
name="2ph_cap_1d_ihu",
114-
description=
115-
"Two-phase flow test for IHU (1D displacement, 2-phase, capillary pressure)",
116-
partitions=((1, 1, 1), (3, 1, 1)),
117-
restart_step=34,
118-
check_step=60,
119-
restartcheck_params=RestartcheckParameters(**restartcheck_params)),
119+
restartcheck_params=RestartcheckParameters(**restartcheck_params))
120120
]
121121

122122
generate_geos_tests(decks)

inputFiles/compositionalMultiphaseFlow/deadoil_2ph_staircase_gravity_segregation_3d.xml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,7 @@
1313
temperature="300">
1414
<NonlinearSolverParameters
1515
newtonTol="1.0e-9"
16-
newtonMaxIter="15"
17-
lineSearchMaxCuts="2"/>
16+
newtonMaxIter="15"/>
1817
<LinearSolverParameters
1918
directParallel="0"/>
2019
</CompositionalMultiphaseFVM>
@@ -108,7 +107,7 @@
108107
<PressurePorosity
109108
name="rockPorosity"
110109
defaultReferencePorosity="0.2"
111-
referencePressure="0.0"
110+
referencePressure="5e6"
112111
compressibility="1.0e-9"/>
113112
<ConstantPermeability
114113
name="rockPerm"

0 commit comments

Comments
 (0)