Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
61 commits
Select commit Hold shift + click to select a range
e0ff166
Integrate SinglePhase Geothermal Gradient capacities
npillardou Jun 28, 2024
947daa8
Merge branch 'develop' into feature/npillardou/singlePhaseGeothermalG…
paveltomin Dec 3, 2024
bfba284
Merge branch 'develop' into feature/npillardou/singlePhaseGeothermalG…
npillardou Feb 11, 2025
2a08168
Merge branch 'develop' into feature/npillardou/singlePhaseGeothermalG…
jhuang2601 Sep 23, 2025
1f4ae42
use full exp for densRelation in single phase flow
jhuang2601 Sep 23, 2025
e30462f
use temperature in HydrostaticPressureKernel
jhuang2601 Sep 23, 2025
751b27f
update SinglePhaseBase
jhuang2601 Sep 25, 2025
b952d4f
update SingleFluidBase
jhuang2601 Sep 25, 2025
4a60c6c
fix DirichletFluxComputeKernel
jhuang2601 Sep 25, 2025
6aaea79
seperate HydrostaticPressureKernel for thermal and isothermal cases
jhuang2601 Sep 25, 2025
cf2a574
Merge branch 'develop' into feature/npillardou/singlePhaseGeothermalG…
jhuang2601 Sep 25, 2025
9e750a1
include ThermalHydrostaticPressureKernel
jhuang2601 Sep 25, 2025
951443a
update ThermalHydrostaticPressureKernel
jhuang2601 Sep 25, 2025
0761b04
code style
jhuang2601 Sep 25, 2025
327369d
code style
jhuang2601 Sep 25, 2025
b8c8668
missing semicolon
jhuang2601 Sep 25, 2025
f7bac29
Getting rid of component in HSE init for singlephase flow
jafranc Sep 26, 2025
e877d99
Add Geothermal gradient test + add in automatic integrated tests
npillardou Sep 29, 2025
da89cb4
update ats for steps
jhuang2601 Sep 29, 2025
5428da9
Merge branch 'develop' into feature/npillardou/singlePhaseGeothermalG…
paveltomin Sep 29, 2025
aba6902
add temperatureVsElevationTableName for a thermal simulation
jhuang2601 Sep 29, 2025
5c2f443
Merge branch 'develop' into feature/npillardou/singlePhaseGeothermalG…
jhuang2601 Sep 29, 2025
3556f2f
Merge branch 'develop' into feature/npillardou/singlePhaseGeothermalG…
jhuang2601 Sep 30, 2025
4578411
switch to direct solver for smoke tests
jhuang2601 Sep 30, 2025
05b4a0d
Merge branch 'develop' into feature/npillardou/singlePhaseGeothermalG…
jhuang2601 Sep 30, 2025
9d84a71
Merge branch 'develop' into feature/npillardou/singlePhaseGeothermalG…
jhuang2601 Oct 1, 2025
70e262f
Merge branch 'develop' into feature/npillardou/singlePhaseGeothermalG…
jhuang2601 Oct 2, 2025
8b9a590
Update ci_tests.yml - Bound check cuda+clang
jafranc Oct 2, 2025
8ec226e
Disable GEOS bounds checking in CI tests
paveltomin Oct 3, 2025
6bca95d
Merge branch 'develop' into feature/npillardou/singlePhaseGeothermalG…
paveltomin Oct 3, 2025
6eed590
update .integrated_tests.yaml
jhuang2601 Oct 3, 2025
aa1e927
update BASELINE_NOTES.md
jhuang2601 Oct 3, 2025
fd9319e
Disable sccache usage in CI workflow
paveltomin Oct 3, 2025
ee8e121
Remove USE_SCCACHE variable from CI workflow
paveltomin Oct 3, 2025
3029c34
Remove USE_SCCACHE from CI tests workflow
paveltomin Oct 4, 2025
6996c7b
Change KernelWrapper to use Linear approximation type
paveltomin Oct 6, 2025
9493460
Change KernelWrapper type to Full approximation
paveltomin Oct 7, 2025
f4a30eb
Merge branch 'develop' into feature/npillardou/singlePhaseGeothermalG…
paveltomin Oct 7, 2025
d008909
try this
Oct 7, 2025
c575723
Merge branch 'feature/npillardou/singlePhaseGeothermalGradient' of ht…
Oct 7, 2025
770d0d7
try that
Oct 7, 2025
71ddca7
Remove default move assignment operator from KernelWrapper
paveltomin Oct 8, 2025
45fe429
Remove blank line in KernelWrapper definition
paveltomin Oct 8, 2025
b62c8f3
Remove blank line in KernelWrapper definition
paveltomin Oct 8, 2025
0431c58
fix?
Oct 8, 2025
52bf319
correct check
Oct 8, 2025
dcc09f0
correct check
Oct 8, 2025
bb676a1
try this
Oct 8, 2025
afc2b16
revert
Oct 9, 2025
467c466
debug output
Oct 9, 2025
69851a9
Merge remote-tracking branch 'origin/develop' into feature/npillardou…
Oct 9, 2025
8840d18
make host
Oct 9, 2025
1fe52a2
remove debug output
jhuang2601 Oct 9, 2025
74b9d83
update .integrated_tests.yaml
jhuang2601 Oct 9, 2025
87aa22c
update BASELINE_NOTES.md
jhuang2601 Oct 9, 2025
c637cbb
update .integrated_tests.yaml
jhuang2601 Oct 9, 2025
5e1369e
Merge branch 'develop' into feature/npillardou/singlePhaseGeothermalG…
jhuang2601 Oct 9, 2025
d4b5430
fix the timeout issue of PoroElastic_hybridHexPrism_co2_fim_3d
jhuang2601 Oct 10, 2025
8ee1c34
revert file path
jhuang2601 Oct 10, 2025
b1ebdc0
update .integrated_tests.yaml
jhuang2601 Oct 10, 2025
412f94d
update BASELINE_NOTES.md
jhuang2601 Oct 10, 2025
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-pr3359-14024-3c9ebb4
baseline: integratedTests/baseline_integratedTests-pr3193-14118-8ee1c34

allow_fail:
all: ''
Expand Down
4 changes: 4 additions & 0 deletions BASELINE_NOTES.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@ 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 #3193 (2025-10-10) <https://storage.googleapis.com/geosx/integratedTests/baseline_integratedTests-pr3193-14118-8ee1c34.tar.gz>
=====================
Enable geothermal gradient in HydrostaticEquilibrium for single-phase flow.

PR #3359 (2025-10-07) <https://storage.googleapis.com/geosx/integratedTests/baseline_integratedTests-pr3359-14024-3c9ebb4.tar.gz>
=====================
Add functions to connect well perforation to surface elements.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@

<PeriodicEvent
name="outputs"
timeFrequency="5e3"
timeFrequency="1e4"
target="/Outputs/vtkOutput"/>
<PeriodicEvent
name="linearElasticityStatistics"
Expand Down
4 changes: 2 additions & 2 deletions inputFiles/poromechanics/poroElasticCoupling.ats
Original file line number Diff line number Diff line change
Expand Up @@ -265,7 +265,7 @@ def _build_PoroElasticPEBICO2FIM_cases():
"Francois Hamon", True)
restartcheck_params = {"atol": 1.0e-5, "rtol": 2.0e-7}
return _build_poro_elastic_coupling_case(
"PoroElastic_hybridHexPrism_co2_fim_3d.xml", (10, 20),
"PoroElastic_hybridHexPrism_co2_fim_3d.xml", (5, 10),
((1, 1, 1), (2, 2, 1)), description, restartcheck_params)


Expand All @@ -275,7 +275,7 @@ def _build_PoroElasticPEBICO2Sequential_cases():
"auto", "Francois Hamon", True)
restartcheck_params = {"atol": 1.0e-5, "rtol": 2.0e-7}
return _build_poro_elastic_coupling_case(
"PoroElastic_hybridHexPrism_co2_sequential_3d.xml", (10, 20),
"PoroElastic_hybridHexPrism_co2_sequential_3d.xml", (5, 10),
((1, 1, 1), (2, 2, 1)), description, restartcheck_params)


Expand Down
183 changes: 183 additions & 0 deletions inputFiles/singlePhaseFlow/FieldCaseTutorial3_Isothermal_base.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,183 @@
<?xml version="1.0" ?>

<Problem>
<!-- SPHINX_FIELD_CASE_REGION -->
<ElementRegions>
<CellElementRegion
name="Reservoir"
cellBlocks="{ 2 }"
materialList="{ water, rock }"/>

<CellElementRegion
name="Burden"
cellBlocks="{ 1, 3 }"
materialList="{ water, rock }"/>
</ElementRegions>
<!-- SPHINX_FIELD_CASE_REGION_END -->

<!-- SPHINX_FIELD_CASE_CONSTITUTIVE -->
<Constitutive>
<CompressibleSinglePhaseFluid
name="water"
defaultDensity="1000"
defaultViscosity="0.001"
referencePressure="0.0"
compressibility="1e-9"
viscosibility="0.0"/>

<CompressibleSolidConstantPermeability
name="rock"
solidModelName="nullSolid"
porosityModelName="rockPorosity"
permeabilityModelName="rockPerm"/>

<NullModel
name="nullSolid"/>

<PressurePorosity
name="rockPorosity"
defaultReferencePorosity="0.05"
referencePressure="10e7"
compressibility="1.0e-9"/>

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

<!-- SPHINX_FIELD_CASE_NUMERICAL -->
<NumericalMethods>
<FiniteVolume>
<TwoPointFluxApproximation
name="singlePhaseTPFA"
/>
</FiniteVolume>
</NumericalMethods>
<!-- SPHINX_FIELD_CASE_NUMERICAL_END -->

<!-- SPHINX_FIELD_CASE_GEOMETRY -->
<Geometry>
<Box
name="all"
xMin="{ -1e9, -1e9, -1e9 }"
xMax="{ 1e9, 1e9, 1e9 }"/>

<Box
name="source"
xMin="{ 15500, 7000, -5000 }"
xMax="{ 16000, 7500, 0 }"/>

<Box
name="sink"
xMin="{ 6500, 1500, -5000 }"
xMax="{ 7000, 2000, 0 }"/>
</Geometry>
<!-- SPHINX_FIELD_CASE_GEOMETRY_END -->

<!-- SPHINX_FIELD_CASE_FIELD -->
<FieldSpecifications>

<FieldSpecification
name="permx"
initialCondition="1"
component="0"
setNames="{ all }"
objectPath="ElementRegions/Reservoir"
fieldName="rockPerm_permeability"
scale="1e-15"
functionName="permxFunc"/>

<FieldSpecification
name="permy"
initialCondition="1"
component="1"
setNames="{ all }"
objectPath="ElementRegions/Reservoir"
fieldName="rockPerm_permeability"
scale="1e-15"
functionName="permyFunc"/>

<FieldSpecification
name="permz"
initialCondition="1"
component="2"
setNames="{ all }"
objectPath="ElementRegions/Reservoir"
fieldName="rockPerm_permeability"
scale="3e-15"
functionName="permzFunc"/>

<FieldSpecification
name="initialPressure"
initialCondition="1"
setNames="{ all }"
objectPath="ElementRegions/Reservoir/2_tetrahedra"
fieldName="pressure"
scale="1e7"
/>

<FieldSpecification
name="sourceTerm"
objectPath="ElementRegions/Reservoir/2_tetrahedra"
fieldName="pressure"
scale="15e7"
setNames="{ source }"
/>

<FieldSpecification
name="sinkTerm"
objectPath="ElementRegions/Reservoir/2_tetrahedra"
fieldName="pressure"
scale="5e7"
setNames="{ sink }"/>
</FieldSpecifications>
<!-- SPHINX_FIELD_CASE_FIELD_END -->

<!-- SPHINX_FIELD_CASE_OUTPUT -->
<Outputs>
<VTK
name="reservoir_with_properties"/>
<Restart
name="restartOutput"/>
</Outputs>
<!-- SPHINX_FIELD_CASE_OUTPUT_END -->

<!-- SPHINX_FIELD_CASE_TFUNC -->
<Functions>
<TableFunction
name="timeInj"
inputVarNames="{ time }"
coordinates="{ 1e6, 10e6, 50e6 }"
values="{ 1, 0.01, 0.00001 }"/>

<TableFunction
name="initialPressureFunc"
inputVarNames="{ elementCenter }"
coordinateFiles="{ tables_FieldCaseTuto/xlin.geos, tables_FieldCaseTuto/ylin.geos, tables_FieldCaseTuto/zlin.geos }"
voxelFile="tables_FieldCaseTuto/pressure.geos"/>

<TableFunction
name="permxFunc"
inputVarNames="{ elementCenter }"
coordinateFiles="{ tables_FieldCaseTuto/xlin.geos, tables_FieldCaseTuto/ylin.geos, tables_FieldCaseTuto/zlin.geos }"
voxelFile="tables_FieldCaseTuto/permx.geos"
interpolation="nearest"/>

<TableFunction
name="permyFunc"
inputVarNames="{ elementCenter }"
coordinateFiles="{ tables_FieldCaseTuto/xlin.geos, tables_FieldCaseTuto/ylin.geos, tables_FieldCaseTuto/zlin.geos }"
voxelFile="tables_FieldCaseTuto/permy.geos"
interpolation="nearest"/>

<TableFunction
name="permzFunc"
inputVarNames="{ elementCenter }"
coordinateFiles="{ tables_FieldCaseTuto/xlin.geos, tables_FieldCaseTuto/ylin.geos, tables_FieldCaseTuto/zlin.geos }"
voxelFile="tables_FieldCaseTuto/permz.geos"
interpolation="nearest"/>
</Functions>
<!-- SPHINX_FIELD_CASE_TFUNC_END -->

</Problem>
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
<?xml version="1.0" ?>

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

<!-- SPHINX_FIELD_CASE_SOLVER -->
<Solvers>
<SinglePhaseFVM
name="SinglePhaseFlow"
discretization="singlePhaseTPFA"
targetRegions="{ Reservoir }"
logLevel="1">
<NonlinearSolverParameters
newtonTol="1.0e-6"
newtonMaxIter="8"
lineSearchAction="None"
logLevel="1"/>
<LinearSolverParameters
directParallel="0"/>
</SinglePhaseFVM>
</Solvers>
<!-- SPHINX_FIELD_CASE_SOLVER_END -->

<!-- SPHINX_FIELD_CASE_MESH -->
<Mesh>
<VTKMesh name="SyntheticMesh"
file="synthetic.vtu" />
</Mesh>
<!-- SPHINX_FIELD_CASE_MESH_END -->

<!-- SPHINX_FIELD_CASE_EVENTS -->
<Events maxTime="100.0e6">
<PeriodicEvent name="solverApplications"
forceDt="50.0e6"
target="/Solvers/SinglePhaseFlow" />


<PeriodicEvent name="restarts"
timeFrequency="50.0e6"
target="/Outputs/restartOutput"/>

</Events>
<!-- SPHINX_FIELD_CASE_EVENTS_END -->

</Problem>
Loading
Loading