Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
038c57c
fix effective stress for thermoporomechancis
frankfeifan Oct 27, 2025
8d3a97e
Merge remote-tracking branch 'origin/develop' into fix/frankfei/therm…
frankfeifan Oct 27, 2025
989ebeb
avoid hiding overloaded function
frankfeifan Oct 27, 2025
cce7300
Merge remote-tracking branch 'origin/develop' into fix/frankfei/therm…
frankfeifan Oct 31, 2025
deaa1bd
added an integrated test
frankfeifan Oct 31, 2025
af35f4d
Merge remote-tracking branch 'origin/develop' into fix/frankfei/therm…
frankfeifan Apr 17, 2026
4b6ed9e
move temperature derivative to DiscretizationOps
frankfeifan Apr 21, 2026
969c1e7
remove thermal strain part from the avgPlasticStrain calculation
frankfeifan Apr 22, 2026
b9ddbe4
added sequential version
frankfeifan Apr 22, 2026
03ccac6
Merge remote-tracking branch 'origin/develop' into fix/frankfei/therm…
frankfeifan Apr 22, 2026
e944875
fixed the names and commas
frankfeifan Apr 22, 2026
36908b5
Merge remote-tracking branch 'origin/develop' into fix/frankfei/therm…
frankfeifan Jun 22, 2026
34163bd
Merge remote-tracking branch 'origin/develop' into fix/frankfei/therm…
frankfeifan Aug 11, 2026
be786c8
docs: update tutorial example for thermoporoelastic consolidation (#4…
npillardou Aug 11, 2026
ee268c4
Merge remote-tracking branch 'origin/develop' into fix/frankfei/therm…
frankfeifan Aug 13, 2026
1a477a8
revert to the integrated test id on develop
frankfeifan Aug 13, 2026
845268f
update script for readthedocs CI error
npillardou Aug 14, 2026
2a0300c
fix the NameError issue for readthedoc build
jhuang2601 Aug 14, 2026
9faffd1
Merge branch 'develop' into fix/frankfei/thermoPorousSolidTotalStress
jhuang2601 Aug 14, 2026
faeb645
Merge branch 'develop' into fix/frankfei/thermoPorousSolidTotalStress
jhuang2601 Aug 14, 2026
39debdc
Merge remote-tracking branch 'origin/develop' into fix/frankfei/therm…
frankfeifan Aug 16, 2026
1af082d
rebaseline
frankfeifan Aug 16, 2026
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
2 changes: 1 addition & 1 deletion .integrated_tests.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
baselines:
bucket: geosx
baseline: integratedTests/baseline_integratedTests-pr4114-17283-3bb33cb
baseline: integratedTests/baseline_integratedTests-pr3884-17320-39debdc

allow_fail:
all: ''
Expand Down
3 changes: 3 additions & 0 deletions BASELINE_NOTES.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@ This file is designed to track changes to the integrated test baselines.
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.
These notes should be in reverse-chronological order, and use the following time format: (YYYY-MM-DD).

PR #3884 (2026-08-16) <https://storage.googleapis.com/geosx/integratedTests/baseline_integratedTests-pr3884-17320-39debdc.tar.gz>
Total stress fix in the thermo-poromechanics model

PR #4114 (2026-08-14) <https://storage.googleapis.com/geosx/integratedTests/baseline_integratedTests-pr4114-17283-3bb33cb.tar.gz>
Stop dumping linear systems from ATS decks (`writeLinearSystem` no longer set). That flag is stored in restart files, so `perf_status_test` restartchecks need a new baseline.

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,159 @@
<?xml version="1.0" ?>

<Problem>
<Included>
<File name="./ThermoMech_1DCooling_base.xml" />
</Included>

<Solvers
gravityVector="{ 0.0, 0.0, 0.0 }">

<SinglePhasePoromechanics
name="thermoPoroSolver"
solidSolverName="solidMechSolver"
flowSolverName="flowSolver"
isThermal="1"
logLevel="1"
targetRegions="{ Domain }">
<NonlinearSolverParameters
couplingType="FullyImplicit"
lineSearchAction="None"
newtonMaxIter="200"/>
<LinearSolverParameters
directParallel="0"/>
</SinglePhasePoromechanics>

<SolidMechanicsLagrangianFEM
name="solidMechSolver"
logLevel="1"
discretization="FE1"
targetRegions="{ Domain }"/>

<SinglePhaseFVM
name="flowSolver"
logLevel="1"
discretization="tpfaFlow"
temperature="273.0"
isThermal="1"
targetRegions="{ Domain }">
<NonlinearSolverParameters
newtonMaxIter="100"
newtonMinIter="0"
newtonTol="1.0e-6"/>
<LinearSolverParameters
directParallel="0"/>
</SinglePhaseFVM>
</Solvers>

<Constitutive>
<PorousDruckerPrager
name="rock"
solidModelName="rockSolid"
porosityModelName="rockPorosity"
permeabilityModelName="rockPerm"
solidInternalEnergyModelName="rockInternalEnergy"
/>

<DruckerPrager
name="rockSolid"
defaultDensity="2700"
defaultBulkModulus="0.5e9"
defaultShearModulus="0.3e9"
defaultCohesion="5e3"
defaultFrictionAngle="15.27"
defaultDilationAngle="0.0"
defaultHardeningRate="0.0"
defaultDrainedLinearTEC="3e-7"/>

<BiotPorosity
name="rockPorosity"
defaultGrainBulkModulus="1.0e27"
defaultReferencePorosity="0.2"/>

<SolidInternalEnergy
name="rockInternalEnergy"
referenceVolumetricHeatCapacity="1.672e5"
referenceTemperature="0.0"
referenceInternalEnergy="0.0"/>

<ThermalCompressibleSinglePhaseFluid
name="water"
defaultDensity="1000"
defaultViscosity="1e-3"
referencePressure="0.0"
referenceTemperature="0.0"
compressibility="0.0"
thermalExpansionCoeff="0.0"
viscosibility="0.0"
specificHeatCapacity="1.672e2"
referenceInternalEnergy="0.001"/>

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

<SinglePhaseThermalConductivity
name="thermalCond"
defaultThermalConductivityComponents="{ 836, 836, 836 }"/>
</Constitutive>

<Mesh>
<InternalMesh
name="mesh1"
elementTypes="{ C3D8 }"
xCoords="{ 0, 1 }"
yCoords="{ 0, 7 }"
zCoords="{ 0, 1 }"
nx="{ 1 }"
ny="{ 14 }"
nz="{ 1 }"
cellBlockNames="{ cb1 }"/>
</Mesh>

<Events
maxTime="100.0">

<PeriodicEvent
name="outputs0"
cycleFrequency="1"
target="/Outputs/thermoPoroVTKOutput"/>

<PeriodicEvent
name="stressHistoryCollection"
cycleFrequency="1"
target="/Tasks/stressCollection"/>
<PeriodicEvent
name="stressTimeHistoryOutput"
cycleFrequency="1"
target="/Outputs/stressHistoryOutput"/>

<PeriodicEvent
name="displacementHistoryCollection"
cycleFrequency="1"
target="/Tasks/displacementCollection"/>
<PeriodicEvent
name="displacementTimeHistoryOutput"
cycleFrequency="1"
target="/Outputs/displacementHistoryOutput"/>

<PeriodicEvent
name="solverApplication0"
endTime="1e-10"
forceDt="1e-10"
target="/Solvers/thermoPoroSolver"/>

<PeriodicEvent
name="solverApplication1"
beginTime="1e-10"
endTime="100.0"
forceDt="1.0"
target="/Solvers/thermoPoroSolver"/>

<PeriodicEvent
name="restarts"
beginTime="0"
timeFrequency="50.0"
target="/Outputs/restartOutput"/>
</Events>

</Problem>
155 changes: 155 additions & 0 deletions inputFiles/thermoPoromechanics/ThermoElastic_1DCooling_fim_smoke.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,155 @@
<?xml version="1.0" ?>

<Problem>
<Included>
<File name="./ThermoMech_1DCooling_base.xml" />
</Included>

<Solvers
gravityVector="{ 0.0, 0.0, 0.0 }">

<SinglePhasePoromechanics
name="thermoPoroSolver"
solidSolverName="solidMechSolver"
flowSolverName="flowSolver"
isThermal="1"
logLevel="1"
targetRegions="{ Domain }">
<NonlinearSolverParameters
couplingType="FullyImplicit"
lineSearchAction="None"
newtonMaxIter="200"/>
<LinearSolverParameters
directParallel="0"/>
</SinglePhasePoromechanics>

<SolidMechanicsLagrangianFEM
name="solidMechSolver"
logLevel="1"
discretization="FE1"
targetRegions="{ Domain }"/>

<SinglePhaseFVM
name="flowSolver"
logLevel="1"
discretization="tpfaFlow"
temperature="273.0"
isThermal="1"
targetRegions="{ Domain }">
<NonlinearSolverParameters
newtonMaxIter="100"
newtonMinIter="0"
newtonTol="1.0e-6"/>
<LinearSolverParameters
directParallel="0"/>
</SinglePhaseFVM>
</Solvers>

<Constitutive>
<PorousElasticIsotropic
name="rock"
solidModelName="rockSolid"
porosityModelName="rockPorosity"
permeabilityModelName="rockPerm"
solidInternalEnergyModelName="rockInternalEnergy"
/>

<ElasticIsotropic
name="rockSolid"
defaultDensity="2700"
defaultBulkModulus="0.5e9"
defaultShearModulus="0.3e9"
defaultDrainedLinearTEC="3e-7"/>

<BiotPorosity
name="rockPorosity"
defaultGrainBulkModulus="1.0e27"
defaultReferencePorosity="0.2"/>

<SolidInternalEnergy
name="rockInternalEnergy"
referenceVolumetricHeatCapacity="1.672e5"
referenceTemperature="0.0"
referenceInternalEnergy="0.0"/>

<ThermalCompressibleSinglePhaseFluid
name="water"
defaultDensity="1000"
defaultViscosity="1e-3"
referencePressure="0.0"
referenceTemperature="0.0"
compressibility="0.0"
thermalExpansionCoeff="0.0"
viscosibility="0.0"
specificHeatCapacity="1.672e2"
referenceInternalEnergy="0.001"/>

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

<SinglePhaseThermalConductivity
name="thermalCond"
defaultThermalConductivityComponents="{ 836, 836, 836 }"/>
</Constitutive>

<Mesh>
<InternalMesh
name="mesh1"
elementTypes="{ C3D8 }"
xCoords="{ 0, 1 }"
yCoords="{ 0, 7 }"
zCoords="{ 0, 1 }"
nx="{ 1 }"
ny="{ 14 }"
nz="{ 1 }"
cellBlockNames="{ cb1 }"/>
</Mesh>

<Events
maxTime="100.0">

<PeriodicEvent
name="outputs0"
cycleFrequency="1"
target="/Outputs/thermoPoroVTKOutput"/>

<PeriodicEvent
name="stressHistoryCollection"
cycleFrequency="1"
target="/Tasks/stressCollection"/>
<PeriodicEvent
name="stressTimeHistoryOutput"
cycleFrequency="1"
target="/Outputs/stressHistoryOutput"/>

<PeriodicEvent
name="displacementHistoryCollection"
cycleFrequency="1"
target="/Tasks/displacementCollection"/>
<PeriodicEvent
name="displacementTimeHistoryOutput"
cycleFrequency="1"
target="/Outputs/displacementHistoryOutput"/>

<PeriodicEvent
name="solverApplication0"
endTime="1e-10"
forceDt="1e-10"
target="/Solvers/thermoPoroSolver"/>

<PeriodicEvent
name="solverApplication1"
beginTime="1e-10"
endTime="100.0"
forceDt="1.0"
target="/Solvers/thermoPoroSolver"/>

<PeriodicEvent
name="restarts"
beginTime="0"
timeFrequency="50.0"
target="/Outputs/restartOutput"/>
</Events>

</Problem>
Loading
Loading