Skip to content

Creation of a CoupleSolidModel to handle Poro-Solid-Damage models. #1455

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 55 commits into from
Jul 22, 2021
Merged

Creation of a CoupleSolidModel to handle Poro-Solid-Damage models. #1455

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
55 commits
Select commit Hold shift + click to select a range
f0dee83
Initial commit
CusiniM Jun 4, 2021
36f0a89
CoupleSolid design.
CusiniM Jun 8, 2021
7a717f4
Distinction between poro and compressible solids.
CusiniM Jun 8, 2021
6c39e6e
Should now work.
CusiniM Jun 8, 2021
214b101
biotCoefficientUpdate
CusiniM Jun 8, 2021
d68e4d5
getBulkModulus
CusiniM Jun 8, 2021
5fd36d0
First round of compilation errors.
CusiniM Jun 8, 2021
9588df7
more fixes
CusiniM Jun 8, 2021
6a78a07
REgister catalog porousSolid
CusiniM Jun 8, 2021
8376aa2
trying to understand compiling issues.
Jun 9, 2021
7dc9a8d
uncrustified and fixed all porosity issues. Still compilation error f…
Jun 9, 2021
1f07b96
fix missing namespace closeout
rrsettgast Jun 14, 2021
70ce545
It now builds.
CusiniM Jun 14, 2021
b16462e
Merge remote-tracking branch 'origin/develop' into cusini/feature/por…
CusiniM Jun 14, 2021
12e867f
adding damage models to passThrough
CusiniM Jun 15, 2021
6cc05db
fixed compilation errors.
CusiniM Jun 15, 2021
687d8df
adding permeability Models.
CusiniM Jun 15, 2021
78a9534
Register catalog of porous+damage
CusiniM Jun 16, 2021
3d95812
Addressed most of Thomas comments.
CusiniM Jun 17, 2021
d21f5eb
remove useless file
CusiniM Jun 17, 2021
9ccb04d
Adding perm to PorousSolid and small fixes based on reviews.
CusiniM Jun 17, 2021
829ef48
Permeability models added to Porous and Compressible solids.
CusiniM Jun 18, 2021
d2aaa7d
starting removal of poroealstic
CusiniM Jun 22, 2021
215991f
Merge remote-tracking branch 'origin/develop' into cusini/feature/por…
CusiniM Jun 22, 2021
13f375d
Mandel runs fine
CusiniM Jun 23, 2021
81b2241
got back the PoroElastic
CusiniM Jun 23, 2021
6b2d1fe
Use permeability from constitutive model everywhere.
CusiniM Jun 29, 2021
ace16f4
Merge remote-tracking branch 'origin/develop' into cusini/feature/por…
CusiniM Jun 29, 2021
21029f1
rst files
Jun 29, 2021
cadc45e
Merge branch 'cusini/feature/porousSolidModel' of github.com:GEOSX/GE…
Jun 30, 2021
054e7e4
Modified all xml files.
CusiniM Jul 8, 2021
c3ca4b8
Usage of ConstitutivePassThruHandler
CusiniM Jul 8, 2021
a6db464
Merge remote-tracking branch 'origin/develop' into cusini/feature/por…
CusiniM Jul 8, 2021
99962aa
rst files
Jul 9, 2021
42641c3
Merge branch 'cusini/feature/porousSolidModel' of github.com:GEOSX/GE…
Jul 9, 2021
cfa5233
fixed some more xml files.
CusiniM Jul 9, 2021
3aad2b0
Merge branch 'cusini/feature/porousSolidModel' of github.com:GEOSX/GE…
Jul 9, 2021
81d7ccf
rst files fixed
Jul 9, 2021
111e7e6
fixes to xmls.
CusiniM Jul 9, 2021
367ab49
should have fixed all integratedTests xmls.
CusiniM Jul 9, 2021
d5c0b24
fixed a few xmls.
CusiniM Jul 9, 2021
f8eb741
fixed xmls + unit tests. Still need to fix wells.
CusiniM Jul 10, 2021
2ac003f
fixed multiphasePoro + xmls in examples
CusiniM Jul 12, 2021
72fd0f4
hopefully last xmls.
CusiniM Jul 12, 2021
3d8d521
Fixing use of porosity in acc term + fixing xml files for poroelastic…
CusiniM Jul 13, 2021
f8e152d
Merge remote-tracking branch 'origin/develop' into cusini/feature/por…
CusiniM Jul 13, 2021
49a5700
porosity initializaiton works fine. Poroelastic cases match perfectly.
CusiniM Jul 15, 2021
2c864ba
fixed compilation error.
Jul 16, 2021
cf03d46
fixed coeffModelNames issue.
Jul 19, 2021
3bbf0e0
Merge remote-tracking branch 'origin/develop' into cusini/feature/por…
Jul 19, 2021
7e34d46
integrated tests can all run apart from poroelastic_embedded.
Jul 19, 2021
69cdc1e
fix travis failures.
CusiniM Jul 20, 2021
23bc5be
fixed vncc error. Added comp=-1 to porosity field spec.
Jul 20, 2021
28a9cf5
passing integrated tests. Update of submodule tag.
Jul 21, 2021
eff7146
update integrated tests tag.
Jul 21, 2021
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
37 changes: 8 additions & 29 deletions examples/AdaptiveTimeStepping/deadoil_3ph_baker_1d.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
targetRegions="{ Region1 }"
fluidNames="{ fluid1 }"
solidNames="{ rock }"
permeabilityNames="{rockPerm}"
relPermNames="{ relperm }"
temperature="300"
useMass="0"
Expand Down Expand Up @@ -77,15 +78,16 @@
<TwoPointFluxApproximation
name="fluidTPFA"
fieldName="pressure"
coefficientName="permeability"/>
coefficientName="permeability"
coefficientModelNames="{rockPerm}"/>
</FiniteVolume>
</NumericalMethods>

<ElementRegions>
<CellElementRegion
name="Region1"
cellBlocks="{ block1 }"
materialList="{ fluid1, rock, relperm }"/>
materialList="{ fluid1, rock, relperm, rockPerm }"/>
</ElementRegions>

<Constitutive>
Expand All @@ -109,36 +111,13 @@
waterOilRelPermMaxValue="{ 0.8, 0.9 }"
gasOilRelPermExponent="{ 3, 3 }"
gasOilRelPermMaxValue="{ 0.4, 0.9 }"/>

<ConstantPermeability
name="rockPerm"
permeabilityComponents="{1.0e-14, 1.0e-14, 1.0e-14}"/>
</Constitutive>

<FieldSpecifications>
<FieldSpecification
name="permx"
component="0"
initialCondition="1"
setNames="{ all }"
objectPath="ElementRegions/Region1/block1"
fieldName="permeability"
scale="1.0e-14"/>

<FieldSpecification
name="permy"
component="1"
initialCondition="1"
setNames="{ all }"
objectPath="ElementRegions/Region1/block1"
fieldName="permeability"
scale="1.0e-14"/>

<FieldSpecification
name="permz"
component="2"
initialCondition="1"
setNames="{ all }"
objectPath="ElementRegions/Region1/block1"
fieldName="permeability"
scale="1.0e-14"/>

<FieldSpecification
name="referencePorosity"
initialCondition="1"
Expand Down
1 change: 1 addition & 0 deletions examples/advanced_xml_features/included/included_a.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
targetRegions="{ Fracture }"
fluidNames="{ water }"
solidNames="{ rock }"
permeabilityNames="{ rockPerm }"
inputFluxEstimate="1">
<LinearSolverParameters
solverType="gmres"
Expand Down
10 changes: 8 additions & 2 deletions examples/advanced_xml_features/included/included_b.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,15 +26,16 @@
<TwoPointFluxApproximation
name="singlePhaseTPFA"
fieldName="pressure"
coefficientName="permeability"/>
coefficientName="permeability"
coefficientModelNames="{rocPerm}"/>
</FiniteVolume>
</NumericalMethods>

<ElementRegions>
<CellElementRegion
name="Region1"
cellBlocks="{ block1 }"
materialList="{ water, rock }"/>
materialList="{ water, rock, rockPerm }"/>
</ElementRegions>

<Constitutive>
Expand All @@ -52,6 +53,11 @@
name="rock"
referencePressure="0.0"
compressibility="1e-9"/>

<ConstantPermeability
name="rockPerm"
permeabilityComponents="{2.0e-16, 2.0e-16, 2.0e-16}"/>

</Constitutive>

<Outputs>
Expand Down
27 changes: 0 additions & 27 deletions examples/advanced_xml_features/included/included_c.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,33 +2,6 @@

<Problem>
<FieldSpecifications>
<FieldSpecification
name="permx"
component="0"
initialCondition="1"
setNames="{ all }"
objectPath="ElementRegions/Region1/block1"
fieldName="permeability"
scale="2.0e-16"/>

<FieldSpecification
name="permy"
component="1"
initialCondition="1"
setNames="{ all }"
objectPath="ElementRegions/Region1/block1"
fieldName="permeability"
scale="2.0e-16"/>

<FieldSpecification
name="permz"
component="2"
initialCondition="1"
setNames="{ all }"
objectPath="ElementRegions/Region1/block1"
fieldName="permeability"
scale="2.0e-16"/>

<FieldSpecification
name="referencePorosity"
initialCondition="1"
Expand Down
37 changes: 8 additions & 29 deletions examples/advanced_xml_features/parameters_example.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ XML Units:
targetRegions="{ Fracture }"
fluidNames="{ water }"
solidNames="{ rock }"
permeabilityNames="{ rockPerm }"
inputFluxEstimate="1">
<LinearSolverParameters
solverType="gmres"
Expand Down Expand Up @@ -97,15 +98,16 @@ XML Units:
<TwoPointFluxApproximation
name="singlePhaseTPFA"
fieldName="pressure"
coefficientName="permeability"/>
coefficientName="permeability"
coefficientModelNames="{rockPerm}"/>
</FiniteVolume>
</NumericalMethods>

<ElementRegions>
<CellElementRegion
name="Region1"
cellBlocks="{ block1 }"
materialList="{ water, rock }"/>
materialList="{ water, rock, rockPerm }"/>
</ElementRegions>

<Constitutive>
Expand All @@ -123,6 +125,10 @@ XML Units:
name="rock"
referencePressure="0.0"
compressibility="1e-9"/>

<ConstantPermeability
name="rockPerm"
permeabilityComponents="{$permeability$, $permeability$, $permeability$}"/>
</Constitutive>

<Outputs>
Expand All @@ -134,33 +140,6 @@ XML Units:
</Outputs>

<FieldSpecifications>
<FieldSpecification
name="permx"
component="0"
initialCondition="1"
setNames="{ all }"
objectPath="ElementRegions/Region1/block1"
fieldName="permeability"
scale="$permeability$"/>

<FieldSpecification
name="permy"
component="1"
initialCondition="1"
setNames="{ all }"
objectPath="ElementRegions/Region1/block1"
fieldName="permeability"
scale="$permeability$"/>

<FieldSpecification
name="permz"
component="2"
initialCondition="1"
setNames="{ all }"
objectPath="ElementRegions/Region1/block1"
fieldName="permeability"
scale="$permeability$"/>

<FieldSpecification
name="referencePorosity"
initialCondition="1"
Expand Down
37 changes: 8 additions & 29 deletions examples/advanced_xml_features/symbolic_math_example.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ XML Symbolic Math:
targetRegions="{ Fracture }"
fluidNames="{ water }"
solidNames="{ rock }"
permeabilityNames="{ rockPerm }"
inputFluxEstimate="1">
<LinearSolverParameters
solverType="gmres"
Expand Down Expand Up @@ -107,15 +108,16 @@ XML Symbolic Math:
<TwoPointFluxApproximation
name="singlePhaseTPFA"
fieldName="pressure"
coefficientName="permeability"/>
coefficientName="permeability"
coefficientModelNames="{rockPerm}"/>
</FiniteVolume>
</NumericalMethods>

<ElementRegions>
<CellElementRegion
name="Region1"
cellBlocks="{ block1 }"
materialList="{ water, rock }"/>
materialList="{ water, rock, rockPerm }"/>
</ElementRegions>

<Constitutive>
Expand All @@ -133,6 +135,10 @@ XML Symbolic Math:
name="rock"
referencePressure="0.0"
compressibility="1e-9"/>

<ConstantPermeability
name="rockPerm"
permeabilityComponents="{2*$permeability$, 0.5*$permeability$, 1*$permeability$}"/>
</Constitutive>

<Outputs>
Expand All @@ -144,33 +150,6 @@ XML Symbolic Math:
</Outputs>

<FieldSpecifications>
<FieldSpecification
name="permx"
component="0"
initialCondition="1"
setNames="{ all }"
objectPath="ElementRegions/Region1/block1"
fieldName="permeability"
scale="`2*$permeability$`"/>

<FieldSpecification
name="permy"
component="1"
initialCondition="1"
setNames="{ all }"
objectPath="ElementRegions/Region1/block1"
fieldName="permeability"
scale="`0.5*$permeability$`"/>

<FieldSpecification
name="permz"
component="2"
initialCondition="1"
setNames="{ all }"
objectPath="ElementRegions/Region1/block1"
fieldName="permeability"
scale="`1*$permeability$`"/>

<FieldSpecification
name="referencePorosity"
initialCondition="1"
Expand Down
38 changes: 9 additions & 29 deletions examples/compositionalFlow/kernelTest/kernelTest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
discretization="fluidTPFA"
fluidNames="{ fluid1 }"
solidNames="{ rock }"
permeabilityNames="{rockPerm}"
relPermNames="{ relperm }"
temperature="368.15"
useMass="1"
Expand Down Expand Up @@ -82,15 +83,16 @@
<TwoPointFluxApproximation
name="fluidTPFA"
fieldName="pressure"
coefficientName="permeability"/>
coefficientName="permeability"
coefficientModelNames="{rockPerm}"/>
</FiniteVolume>
</NumericalMethods>

<ElementRegions>
<CellElementRegion
name="Region1"
cellBlocks="{ cb1 }"
materialList="{ fluid1, rock, relperm }"/>
materialList="{ fluid1, rock, relperm, rockPerm }"/>
</ElementRegions>

<Constitutive>
Expand All @@ -113,36 +115,14 @@
phaseMinVolumeFraction="{ 0.05, 0.05 }"
phaseRelPermExponent="{ 1.5, 1.5 }"
phaseRelPermMaxValue="{ 0.9, 0.9 }"/>

<ConstantPermeability
name="rockPerm"
permeabilityComponents="{1.0e-13, 1.0e-13, 1.0e-13}"/>

</Constitutive>

<FieldSpecifications>
<FieldSpecification
name="permx"
component="0"
initialCondition="1"
setNames="{ all }"
objectPath="ElementRegions/Region1/cb1"
fieldName="permeability"
scale="1.0e-13"/>

<FieldSpecification
name="permy"
component="1"
initialCondition="1"
setNames="{ all }"
objectPath="ElementRegions/Region1/cb1"
fieldName="permeability"
scale="1.0e-13"/>

<FieldSpecification
name="permz"
component="2"
initialCondition="1"
setNames="{ all }"
objectPath="ElementRegions/Region1/cb1"
fieldName="permeability"
scale="1.0e-13"/>

<FieldSpecification
name="referencePorosity"
initialCondition="1"
Expand Down
9 changes: 7 additions & 2 deletions examples/hydraulicFracturing/KGD/KGD.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@
targetRegions="{ Fracture }"
fluidNames="{ water }"
solidNames="{ rock }"
permeabilityNames="{fracPerm}"
inputFluxEstimate="1">
<LinearSolverParameters
solverType="gmres"
Expand Down Expand Up @@ -144,7 +145,8 @@
<TwoPointFluxApproximation
name="singlePhaseTPFA"
fieldName="pressure"
coefficientName="permeability"/>
coefficientName="permeability"
coefficientModelNames="{fracPerm}"/>
</FiniteVolume>
</NumericalMethods>

Expand All @@ -157,7 +159,7 @@
<SurfaceElementRegion
name="Fracture"
defaultAperture="0.1e-3"
materialList="{ water, rock }"/>
materialList="{ water, rock, fracPerm }"/>
</ElementRegions>

<Constitutive>
Expand Down Expand Up @@ -188,6 +190,9 @@
coordinates="{ -1.0e-3, 0.0 }"
values="{ 1.0e-6, 0.1e-3 }"/>
</Contact>

<ParallelPlatesPermeability
name="fracPerm"/>
</Constitutive>

<FieldSpecifications>
Expand Down
Loading