Skip to content

Commit c18b631

Browse files
rrsettgastrrsettgast
committed
Merge branch 'develop' into feature/cusini/addMpiWrapperForArrays
2 parents eba5803 + 18e0c4e commit c18b631

File tree

74 files changed

+4693
-1193
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

74 files changed

+4693
-1193
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-pr3495-9552-257c87e
3+
baseline: integratedTests/baseline_integratedTests-pr3228-9676-61994fe
44
allow_fail:
55
all: ''
66
streak: ''

‎BASELINE_NOTES.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@ 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 #3228 (2024-01-15)
10+
=====================
11+
deltaVolume added in multiphase.
12+
913
PR #3495 (2024-01-08)
1014
=====================
1115
Add missing logic to support switching from fixed mass rate injection rate constraint to max injection pressure.

‎inputFiles/poromechanicsFractures/co2flash.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
FlashModel CO2Solubility 1e6 10e7 5e4 367.15 369.15 1 0

‎inputFiles/poromechanicsFractures/elevation.txt‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
0
2+
1e4

‎inputFiles/poromechanicsFractures/initCO2CompFrac.txt‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
0.001
2+
0.001

‎inputFiles/poromechanicsFractures/initTemp.txt‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
368.15
2+
368.15

‎inputFiles/poromechanicsFractures/initWaterCompFrac.txt‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
0.999
2+
0.999

‎inputFiles/poromechanicsFractures/multiphasePoromechanics_FaultModel_base.xml‎

Lines changed: 207 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,207 @@
1+
<Problem>
2+
<Constitutive>
3+
<PorousElasticIsotropic
4+
name="porousRock"
5+
permeabilityModelName="rockPerm"
6+
porosityModelName="rockPorosity"
7+
solidModelName="rock" />
8+
9+
<ElasticIsotropic
10+
name="rock"
11+
defaultDensity="2927"
12+
defaultPoissonRatio="0.15"
13+
defaultYoungModulus="14950000000" />
14+
15+
<CO2BrinePhillipsFluid
16+
name="fluid"
17+
logLevel="1"
18+
phaseNames="{ gas, water }"
19+
componentNames="{ co2, water }"
20+
componentMolarWeight="{ 44e-3, 18e-3 }"
21+
phasePVTParaFiles="{ pvtgas.txt, pvtliquid.txt }"
22+
flashModelParaFile="co2flash.txt"/>
23+
24+
<BiotPorosity
25+
name="rockPorosity"
26+
defaultReferencePorosity="0.3"
27+
defaultGrainBulkModulus="7.12e30" />
28+
29+
<ConstantPermeability
30+
name="rockPerm"
31+
permeabilityComponents="{ 1.0e-12, 1.0e-12, 1.0e-12 }" />
32+
<!-- Material inside the fault -->
33+
<CompressibleSolidParallelPlatesPermeability
34+
name="faultFilling"
35+
solidModelName="nullSolid"
36+
porosityModelName="fracturePorosity"
37+
permeabilityModelName="fracturePerm"/>
38+
39+
<PressurePorosity
40+
name="fracturePorosity"
41+
defaultReferencePorosity="1.00"
42+
referencePressure="0e6"
43+
compressibility="0.0"/>
44+
45+
<ParallelPlatesPermeability
46+
name="fracturePerm"/>
47+
48+
<Coulomb
49+
name="fractureContact"
50+
cohesion="40.0e6"
51+
frictionCoefficient="0.01"/>
52+
53+
<HydraulicApertureTable
54+
name="hApertureModel"
55+
apertureTableName="apertureTable"/>
56+
57+
<NullModel
58+
name="nullSolid"/>
59+
60+
<TableRelativePermeability
61+
name="relperm"
62+
phaseNames="{ gas, water }"
63+
wettingNonWettingRelPermTableNames="{ waterRelativePermeabilityTable,
64+
gasRelativePermeabilityTable }"/>
65+
66+
</Constitutive>
67+
68+
<FieldSpecifications>
69+
70+
<FieldSpecification
71+
name="fracPorosity"
72+
initialCondition="1"
73+
setNames="{ all }"
74+
objectPath="ElementRegions/Fault"
75+
fieldName="fracturePorosity_porosity"
76+
scale="1.00"/>
77+
78+
<FieldSpecification
79+
name="xconstraint"
80+
component="0"
81+
fieldName="totalDisplacement"
82+
objectPath="nodeManager"
83+
scale="0.0"
84+
setNames="{ xnegFace, xposFace }" />
85+
86+
<FieldSpecification
87+
name="yconstraint"
88+
component="1"
89+
fieldName="totalDisplacement"
90+
objectPath="nodeManager"
91+
scale="0.0"
92+
setNames="{ ynegFace, yposFace }" />
93+
94+
<FieldSpecification
95+
name="zconstraint"
96+
component="2"
97+
fieldName="totalDisplacement"
98+
objectPath="nodeManager"
99+
scale="0.0"
100+
setNames="{ znegFace }" />
101+
102+
<Traction
103+
name="tractionTop"
104+
objectPath="faceManager"
105+
tractionType="normal"
106+
scale="-1e7"
107+
setNames="{ zposFace }"/>
108+
109+
<HydrostaticEquilibrium
110+
name="equil"
111+
objectPath="ElementRegions"
112+
datumElevation="-2000"
113+
datumPressure="2e7"
114+
initialPhaseName="water"
115+
componentNames="{ co2, water }"
116+
componentFractionVsElevationTableNames="{ initCO2CompFracTable,
117+
initWaterCompFracTable }"
118+
temperatureVsElevationTableName="initTempTable"/>
119+
120+
<SourceFlux
121+
name="sourceTerm"
122+
objectPath="ElementRegions"
123+
component="0"
124+
scale="-1e5"
125+
setNames="{ source }"/>
126+
127+
</FieldSpecifications>
128+
129+
<ElementRegions>
130+
<CellElementRegion
131+
name="Region"
132+
cellBlocks="{ 2_hexahedra, 1_hexahedra, 0_hexahedra }"
133+
materialList="{ fluid, relperm, porousRock }"/>
134+
135+
<SurfaceElementRegion
136+
name="Fault"
137+
faceBlock="fracture"
138+
materialList="{ fluid, relperm, faultFilling, fractureContact, hApertureModel }"
139+
defaultAperture="1e-3"/>
140+
</ElementRegions>
141+
142+
<NumericalMethods>
143+
<FiniteElements>
144+
<FiniteElementSpace
145+
name="FE1"
146+
order="1" />
147+
</FiniteElements>
148+
149+
<FiniteVolume>
150+
<TwoPointFluxApproximation
151+
name="TPFA"/>
152+
<TwoPointFluxApproximation
153+
name="TPFA_stab"/>
154+
</FiniteVolume>
155+
</NumericalMethods>
156+
157+
<Tasks>
158+
<MultiphasePoromechanicsConformingFracturesInitialization
159+
logLevel="1"
160+
name="poroelasticityPreEquilibrationStep"
161+
poromechanicsSolverName="poroFractureSolver"/>
162+
</Tasks>
163+
164+
<Outputs>
165+
<VTK
166+
name="vtkOutput"
167+
fieldNames="{ initialPressure}" />
168+
169+
<Restart
170+
name="restartOutput"/>
171+
</Outputs>
172+
173+
<Functions>
174+
175+
<TableFunction
176+
name="initCO2CompFracTable"
177+
coordinateFiles="{ elevation.txt }"
178+
voxelFile="initCO2CompFrac.txt"/>
179+
180+
<TableFunction
181+
name="initWaterCompFracTable"
182+
coordinateFiles="{ elevation.txt }"
183+
voxelFile="initWaterCompFrac.txt"/>
184+
185+
<TableFunction
186+
name="initTempTable"
187+
coordinateFiles="{ elevation.txt }"
188+
voxelFile="initTemp.txt"/>
189+
190+
<TableFunction
191+
name="apertureTable"
192+
coordinates="{ -1.0e-3, 0.0 }"
193+
values="{ 1.0e-3, 1.0e-3 }"
194+
/>
195+
196+
<TableFunction
197+
name="waterRelativePermeabilityTable"
198+
coordinateFiles="{ phaseVolFraction_water.txt }"
199+
voxelFile="relPerm_water.txt"/>
200+
201+
<TableFunction
202+
name="gasRelativePermeabilityTable"
203+
coordinateFiles="{ phaseVolFraction_gas.txt }"
204+
voxelFile="relPerm_gas.txt"/>
205+
206+
</Functions>
207+
</Problem>

‎inputFiles/poromechanicsFractures/multiphasePoromechanics_FaultModel_smoke.xml‎

Lines changed: 130 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,130 @@
1+
<Problem>
2+
<Included>
3+
<File name="./multiphasePoromechanics_FaultModel_base.xml"/>
4+
</Included>
5+
6+
<Solvers
7+
gravityVector="{ 0.0, 0.0, -9.81 }">
8+
9+
<MultiphasePoromechanicsConformingFractures
10+
name="poroFractureSolver"
11+
targetRegions="{ Region, Fault }"
12+
initialDt="1e5"
13+
flowSolverName="flowSolver"
14+
solidSolverName="fractureMechSolver"
15+
logLevel="1">
16+
<NonlinearSolverParameters
17+
lineSearchAction="None"
18+
maxTimeStepCuts="10"
19+
newtonTol="1e-2"
20+
newtonMaxIter="20"
21+
maxAllowedResidualNorm="1e+15"/>
22+
<LinearSolverParameters
23+
solverType="direct"
24+
krylovTol="1e-10"
25+
preconditionerType="mgr"/>
26+
</MultiphasePoromechanicsConformingFractures>
27+
28+
<SolidMechanicsLagrangeContact
29+
name="fractureMechSolver"
30+
stabilizationName="TPFA_stab"
31+
logLevel="1"
32+
targetRegions="{ Region, Fault }"
33+
timeIntegrationOption="QuasiStatic"
34+
discretization="FE1"/>
35+
36+
<CompositionalMultiphaseFVM
37+
name="flowSolver"
38+
logLevel="1"
39+
useMass="1"
40+
scalingType="Local"
41+
discretization="TPFA"
42+
targetRegions="{ Region, Fault}"
43+
temperature="297.15">
44+
</CompositionalMultiphaseFVM>
45+
</Solvers>
46+
47+
<Mesh>
48+
<VTKMesh
49+
name="mesh1"
50+
useGlobalIds="1"
51+
faceBlocks="{ fracture }"
52+
file="verticalFault_ExternalMesh.vtm"/>
53+
</Mesh>
54+
55+
<Geometry>
56+
<Box
57+
name="source"
58+
xMin="{ -1800, -1800, -2000 }"
59+
xMax="{ 600, 600, -2500 }"/>
60+
61+
<Box
62+
name="xposFace"
63+
xMin="{ 5999.99, -6000.01, -4000.01 }"
64+
xMax="{ 6000.01, 6000.01, 0.01 }"/>
65+
66+
<Box
67+
name="xnegFace"
68+
xMin="{-6000.01, -6000.01, -4000.01 }"
69+
xMax="{-5999.99, 6000.01, 0.01 }"/>
70+
71+
<Box
72+
name="yposFace"
73+
xMin="{-6000.01, 5999.99, -4000.01 }"
74+
xMax="{ 6000.01, 6000.01, 0.01 }"/>
75+
76+
<Box
77+
name="ynegFace"
78+
xMin="{-6000.01, -6000.01, -4000.01 }"
79+
xMax="{ 6000.01, -5999.99, 0.01 }"/>
80+
81+
<Box
82+
name="zposFace"
83+
xMin="{-6000.01, -6000.01, -0.01 }"
84+
xMax="{ 6000.01, 6000.01, 0.01 }"/>
85+
86+
<Box
87+
name="znegFace"
88+
xMin="{-6000.01, -6000.01, -4000.01 }"
89+
xMax="{ 6000.01, 6000.01, -3999.99 }"/>
90+
</Geometry>
91+
92+
<Events
93+
minTime="-1e5"
94+
maxTime="1.0e7">
95+
96+
<!-- Initialization -->
97+
<SoloEvent
98+
name="poroelasticityPreEquilibrationStep"
99+
targetTime="-1e5"
100+
beginTime="-1e5"
101+
target="/Tasks/poroelasticityPreEquilibrationStep"
102+
/>
103+
<!-- Injection -->
104+
<SoloEvent
105+
name="outputPostEquilibrationStep1"
106+
targetTime="0"
107+
targetExactTimestep="1"
108+
target="/Outputs/vtkOutput"/>
109+
110+
<PeriodicEvent
111+
name="outputs"
112+
beginTime="0.0"
113+
endTime="1.0e7"
114+
timeFrequency="1e5"
115+
target="/Outputs/vtkOutput"/>
116+
117+
<PeriodicEvent
118+
name="solverApplication"
119+
endTime="1.0e7"
120+
maxEventDt="1e5"
121+
target="/Solvers/poroFractureSolver"/>
122+
123+
<PeriodicEvent
124+
name="restarts"
125+
beginTime="0.0"
126+
timeFrequency="1e5"
127+
endTime="1.0e6"
128+
target="/Outputs/restartOutput"/>
129+
</Events>
130+
</Problem>

‎inputFiles/poromechanicsFractures/phaseVolFraction_gas.txt‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
0
2+
0.05
3+
0.1
4+
0.15
5+
0.2
6+
0.25
7+
0.3
8+
0.35
9+
0.4
10+
0.45
11+
0.5
12+
0.55
13+
0.6
14+
0.65
15+
0.7
16+
0.75
17+
0.8
18+
0.85
19+
0.9
20+
0.95
21+
1.0

0 commit comments

Comments
 (0)