Skip to content

Commit 357d29e

Browse files
jhuang2601jhuang2601
authored
Merge branch 'develop' into feature/mfrigo/singlephase-ALM
2 parents 7fc27e1 + cf69a2b commit 357d29e

20 files changed

Lines changed: 773 additions & 34 deletions

‎.github/CODEOWNERS‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@
6969
/src/coreComponents/finiteVolume @rrsettgast @paveltomin @castelletto1 @CusiniM @OmarDuran
7070
/src/coreComponents/functions @rrsettgast @paveltomin @cssherman @wrtobin @MelReyCG
7171
/src/coreComponents/linearAlgebra @rrsettgast @paveltomin @CusiniM @castelletto1 @victorapm
72-
/src/coreComponents/mainInterface @rrsettgast @paveltomin @corbett5 @wrtobin
72+
/src/coreComponents/mainInterface @rrsettgast @paveltomin @corbett5 @wrtobin @MelReyCG
7373
/src/coreComponents/math @rrsettgast @paveltomin @corbett5 @wrtobin @OmarDuran
7474
/src/coreComponents/mesh @rrsettgast @paveltomin @CusiniM @wrtobin @OmarDuran
7575
/src/coreComponents/physicsSolvers @rrsettgast @paveltomin @CusiniM @OmarDuran
@@ -85,6 +85,7 @@
8585
/src/coreComponents/schema @rrsettgast @paveltomin @CusiniM @herve-gross @castelletto1 @jhuang2601 @dkachuma @OmarDuran
8686
/src/coreComponents/integrationTests @rrsettgast @paveltomin @CusiniM @corbett5 @wrtobin @MelReyCG @dkachuma @OmarDuran
8787
/src/docs @rrsettgast @paveltomin @CusiniM @herve-gross @castelletto1 @jhuang2601 @dkachuma @OmarDuran
88+
/src/main @rrsettgast @paveltomin @MelReyCG
8889

8990
# Here is a list of GEOS-DEV members as of 2024-07-02
9091
# username name

‎.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-pr3880-14441-1132122
3+
baseline: integratedTests/baseline_integratedTests-pr3849-14514-aaaf0f9
44

55
allow_fail:
66
all: ''

‎BASELINE_NOTES.md‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,8 +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 #3849 (2025-10-23) <https://storage.googleapis.com/geosx/integratedTests/baseline_integratedTests-pr3849-14514-aaaf0f9.tar.gz>
10+
Add multiphase contact with wells
11+
912
PR #3880 (2025-10-13) <https://storage.googleapis.com/geosx/integratedTests/baseline_integratedTests-pr3880-14441-1132122.tar.gz>
10-
=====================
1113
Fix a bug introduced in #3485: mass that is used in accumulation term was not updated with porosity change after mechanics leading to always converged sequential outer loop.
1214

1315
PR #3299 (2025-10-13) <https://storage.googleapis.com/geosx/integratedTests/baseline_integratedTests-pr3299-14426-6c93a0d.tar.gz>

‎inputFiles/poromechanicsFractures/multiphasePoromechanics_FaultModel_well_base.xml‎

Lines changed: 235 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,235 @@
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+
33+
<!-- Material inside the fault -->
34+
<CompressibleSolidParallelPlatesPermeability
35+
name="faultFilling"
36+
solidModelName="nullSolid"
37+
porosityModelName="fracturePorosity"
38+
permeabilityModelName="fracturePerm" />
39+
40+
<PressurePorosity
41+
name="fracturePorosity"
42+
defaultReferencePorosity="1.0"
43+
referencePressure="0e6"
44+
compressibility="0.0" />
45+
46+
<ParallelPlatesPermeability
47+
name="fracturePerm" />
48+
49+
<Coulomb
50+
name="fractureContact"
51+
cohesion="40.0e6"
52+
frictionCoefficient="0.01" />
53+
54+
<HydraulicApertureTable
55+
name="hApertureModel"
56+
apertureTableName="apertureTable" />
57+
58+
<NullModel
59+
name="nullSolid" />
60+
61+
<TableRelativePermeability
62+
name="relperm"
63+
phaseNames="{ gas, water }"
64+
wettingNonWettingRelPermTableNames="{ waterRelativePermeabilityTable,
65+
gasRelativePermeabilityTable }" />
66+
67+
</Constitutive>
68+
69+
<Geometry>
70+
<Box
71+
name="xposFace"
72+
xMin="{ 5999.99, -6000.01, -4000.01 }"
73+
xMax="{ 6000.01, 6000.01, 0.01 }" />
74+
75+
<Box
76+
name="xnegFace"
77+
xMin="{-6000.01, -6000.01, -4000.01 }"
78+
xMax="{-5999.99, 6000.01, 0.01 }" />
79+
80+
<Box
81+
name="yposFace"
82+
xMin="{-6000.01, 5999.99, -4000.01 }"
83+
xMax="{ 6000.01, 6000.01, 0.01 }" />
84+
85+
<Box
86+
name="ynegFace"
87+
xMin="{-6000.01, -6000.01, -4000.01 }"
88+
xMax="{ 6000.01, -5999.99, 0.01 }" />
89+
90+
<Box
91+
name="zposFace"
92+
xMin="{-6000.01, -6000.01, -0.01 }"
93+
xMax="{ 6000.01, 6000.01, 0.01 }" />
94+
95+
<Box
96+
name="znegFace"
97+
xMin="{-6000.01, -6000.01, -4000.01 }"
98+
xMax="{ 6000.01, 6000.01, -3999.99 }" />
99+
</Geometry>
100+
101+
<FieldSpecifications>
102+
103+
<FieldSpecification
104+
name="fracPorosity"
105+
initialCondition="1"
106+
setNames="{ all }"
107+
objectPath="ElementRegions/Fault"
108+
fieldName="fracturePorosity_porosity"
109+
scale="1.0" />
110+
111+
<FieldSpecification
112+
name="xconstraint"
113+
component="0"
114+
fieldName="totalDisplacement"
115+
objectPath="nodeManager"
116+
scale="0.0"
117+
setNames="{ xnegFace, xposFace }" />
118+
119+
<FieldSpecification
120+
name="yconstraint"
121+
component="1"
122+
fieldName="totalDisplacement"
123+
objectPath="nodeManager"
124+
scale="0.0"
125+
setNames="{ ynegFace, yposFace }" />
126+
127+
<FieldSpecification
128+
name="zconstraint"
129+
component="2"
130+
fieldName="totalDisplacement"
131+
objectPath="nodeManager"
132+
scale="0.0"
133+
setNames="{ znegFace }" />
134+
135+
<Traction
136+
name="tractionTop"
137+
objectPath="faceManager"
138+
tractionType="normal"
139+
scale="-1e7"
140+
setNames="{ zposFace }" />
141+
142+
<HydrostaticEquilibrium
143+
name="equil"
144+
objectPath="ElementRegions"
145+
datumElevation="-2000"
146+
datumPressure="2e7"
147+
initialPhaseName="water"
148+
componentNames="{ co2, water }"
149+
componentFractionVsElevationTableNames="{ initCO2CompFracTable,
150+
initWaterCompFracTable }"
151+
temperatureVsElevationTableName="initTempTable" />
152+
</FieldSpecifications>
153+
154+
<ElementRegions>
155+
<CellElementRegion
156+
name="Region"
157+
cellBlocks="{ 2_hexahedra, 1_hexahedra, 0_hexahedra }"
158+
materialList="{ fluid, relperm, porousRock }" />
159+
160+
<SurfaceElementRegion
161+
name="Fault"
162+
faceBlock="fracture"
163+
materialList="{ fluid, relperm, faultFilling, fractureContact, hApertureModel }"
164+
defaultAperture="1e-3" />
165+
166+
<WellElementRegion
167+
name="wellInjector"
168+
materialList="{ fluid, relperm }" />
169+
</ElementRegions>
170+
171+
<NumericalMethods>
172+
<FiniteElements>
173+
<FiniteElementSpace
174+
name="FE1"
175+
order="1" />
176+
</FiniteElements>
177+
178+
<FiniteVolume>
179+
<TwoPointFluxApproximation
180+
name="TPFA" />
181+
<TwoPointFluxApproximation
182+
name="TPFA_stab" />
183+
</FiniteVolume>
184+
</NumericalMethods>
185+
186+
<Tasks>
187+
<CompositionalMultiphaseReservoirPoromechanicsConformingFracturesInitialization
188+
logLevel="1"
189+
name="poroelasticityPreEquilibrationStep"
190+
poromechanicsSolverName="reservoirSolver" />
191+
</Tasks>
192+
193+
<Outputs>
194+
<VTK
195+
name="vtkOutput"
196+
fieldNames="{ initialPressure}" />
197+
198+
<Restart
199+
name="restartOutput" />
200+
</Outputs>
201+
202+
<Functions>
203+
204+
<TableFunction
205+
name="initCO2CompFracTable"
206+
coordinateFiles="{ elevation.txt }"
207+
voxelFile="initCO2CompFrac.txt" />
208+
209+
<TableFunction
210+
name="initWaterCompFracTable"
211+
coordinateFiles="{ elevation.txt }"
212+
voxelFile="initWaterCompFrac.txt" />
213+
214+
<TableFunction
215+
name="initTempTable"
216+
coordinateFiles="{ elevation.txt }"
217+
voxelFile="initTemp.txt" />
218+
219+
<TableFunction
220+
name="apertureTable"
221+
coordinates="{ -1.0e-3, 0.0 }"
222+
values="{ 1.0e-3, 1.0e-3 }" />
223+
224+
<TableFunction
225+
name="waterRelativePermeabilityTable"
226+
coordinateFiles="{ phaseVolFraction_water.txt }"
227+
voxelFile="relPerm_water.txt" />
228+
229+
<TableFunction
230+
name="gasRelativePermeabilityTable"
231+
coordinateFiles="{ phaseVolFraction_gas.txt }"
232+
voxelFile="relPerm_gas.txt" />
233+
234+
</Functions>
235+
</Problem>

0 commit comments

Comments
 (0)