Skip to content

Commit

Permalink
Merge branch 'develop' into feature/sytuan/temperatureDependentTEC
Browse files Browse the repository at this point in the history
  • Loading branch information
jhuang2601 committed Dec 10, 2024
2 parents e3076ce + 7e2c33b commit a579f4c
Show file tree
Hide file tree
Showing 303 changed files with 42,453 additions and 2,334 deletions.
2 changes: 1 addition & 1 deletion .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"build": {
"dockerfile": "Dockerfile",
"args": {
"GEOS_TPL_TAG": "284-535"
"GEOS_TPL_TAG": "286-547"
}
},
"runArgs": [
Expand Down
3 changes: 1 addition & 2 deletions .integrated_tests.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
baselines:
bucket: geosx
baseline: integratedTests/baseline_integratedTests-pr3374-8621-bbb3cb2

baseline: integratedTests/baseline_integratedTests-pr3450-9221-37d940c
allow_fail:
all: ''
streak: ''
52 changes: 52 additions & 0 deletions BASELINE_NOTES.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,58 @@ 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 #3450 (2024-12-08)
=====================
Added test for explicit runge kutta sprinslider.

PR #3480 (2024-12-06)
=====================
Add "logLevel" parameter under /Problem/Outputs in baseline files

PR #3361 (2024-12-03)
=====================
Revert default gravity treatment to old version. Make the way introduced in #3337 optional.

PR #3361 (2024-12-03)
=====================
Baseline diffs after reimplementation of wave equation acoustic gradient for velocity and density parameters: new field "partialGradient2" and "pressureForward" field replacing "pressureDoubleDerivative".

PR #3393 (2024-12-02)
=====================
Fix netToGross bug.

PR #3381 (2024-12-01)
=====================
A few baseline diffs for order FaceElementSubRegion::m_toFacesRelation map. Not sure why this was changed by this PR, but the previous order seems incorrect for a couple of cases.

PR #2957 (2024-11-27)
=====================
Added ExternalDataRepository.

PR #3448 (2024-11-21)
=====================
Switched the FaceElementSubRegion::m_toFacesRelation and FaceElementSubRegion::m_2dElemToElems back to array2d instead of ArrayOfArray. This results in a reordering m_toFacesRelation back to the "correct" assumed order of "original face first". This fixes a bug that failed to remove the CellStencil entry when a FaceElement splits two cells.

PR #2637 (2024-11-21)
=====================
Added numberOfTargetProcesses.

PR #3439 (2024-11-20)
=====================
EDFM bugfixes: derivatives sign, frac/cell element volume, fix apertures inconsistency in test cases.

PR ##3440 (2024-11-18)
=====================
Added Lagrange multiplier with bubble functions stabilization (sli only) and possibility to specify a slip.

PR #3339 (2024-11-14)
=====================
Hypre improvements, rebaseline is due to field value change (amgNumFunctions).

PR #3434 (2024-11-09)
=====================
Bugfix: Fixed output of ArrayOfArray objects to restart files.

PR #3374 (2024-11-09)
====================
Bugfix for gravity treatment in flux for thermal.
Expand Down
38 changes: 0 additions & 38 deletions host-configs/apple/darwin-clang.cmake

This file was deleted.

2 changes: 1 addition & 1 deletion host-configs/apple/macOS_base.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ set(ENABLE_DOXYGEN ON CACHE BOOL "" FORCE)
set(ENABLE_SPHINX ON CACHE BOOL "" FORCE)
set(ENABLE_MATHPRESSO ON CACHE BOOL "" FORCE )

set(GEOS_BUILD_SHARED_LIBS ON CACHE BOOL "" FORCE)
set(GEOS_BUILD_SHARED_LIBS OFF CACHE BOOL "" FORCE)



Expand Down
167 changes: 167 additions & 0 deletions inputFiles/inducedSeismicity/SpringSliderExplicit_base.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,167 @@
<?xml version="1.0" ?>
<Problem>
<Solvers>
<QuasiDynamicEQRK32
name="SpringSlider"
targetRegions="{ Fault }"
shearImpedance="4.41"
initialDt="1e-5"
logLevel="1"
discretization="FE1">
</QuasiDynamicEQRK32>

<SurfaceGenerator
name="SurfaceGen"
targetRegions="{ Domain }"
rockToughness="1.0"
mpiCommOrder="1"
fractureRegion="Fault"/>
</Solvers>

<NumericalMethods>
<FiniteElements>
<FiniteElementSpace
name="FE1"
order="1"/>
</FiniteElements>
</NumericalMethods>

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

<Geometry>
<ThickPlane
name="faultPlane"
normal="{ 0, 1, 0 }"
origin="{ 0, 1, 0 }"
thickness="0.1"/>
</Geometry>

<ElementRegions>
<CellElementRegion
name="Domain"
cellBlocks="{ cb1 }"
materialList="{}"/>

<SurfaceElementRegion
name="Fault"
materialList="{frictionLaw}"
defaultAperture="1e-3"/>
</ElementRegions>

<Constitutive>
<RateAndStateFriction
name="frictionLaw"
defaultA="0.01"
defaultB="0.015"
defaultDc="1.0e-5"
defaultReferenceVelocity="1.0e-6"
defaultReferenceFrictionCoefficient="0.6"/>
</Constitutive>

<FieldSpecifications>
<FieldSpecification
name="fault"
fieldName="ruptureState"
initialCondition="1"
objectPath="faceManager"
scale="1"
setNames="{ faultPlane }"/>

<FieldSpecification
name="normalTraction"
fieldName="traction"
initialCondition="1"
objectPath="ElementRegions/Fault/FractureSubRegion"
component="0"
scale="50"
setNames="{all}"/>

<FieldSpecification
name="shearTraction1"
fieldName="traction"
initialCondition="1"
objectPath="ElementRegions/Fault/FractureSubRegion"
component="1"
scale="21.2132034356"
setNames="{all}"/>
<FieldSpecification
name="shearTraction2"
fieldName="traction"
initialCondition="1"
objectPath="ElementRegions/Fault/FractureSubRegion"
component="2"
scale="21.2132034356"
setNames="{all}"/>
<FieldSpecification
name="stateVariable"
fieldName="stateVariable"
initialCondition="1"
objectPath="ElementRegions/Fault/FractureSubRegion"
scale="0.6"
setNames="{all}"/>
<FieldSpecification
name="slipRate"
fieldName="slipRate"
initialCondition="1"
objectPath="ElementRegions/Fault/FractureSubRegion"
scale="1.0e-6"
setNames="{all}"/>
<FieldSpecification
name="slipVelocity1"
fieldName="slipVelocity"
initialCondition="1"
objectPath="ElementRegions/Fault/FractureSubRegion"
component="0"
scale="0.70710678118e-6"
setNames="{all}"/>
<FieldSpecification
name="slipVelocity2"
fieldName="slipVelocity"
initialCondition="1"
objectPath="ElementRegions/Fault/FractureSubRegion"
component="1"
scale="0.70710678118e-6"
setNames="{all}"/>
</FieldSpecifications>

<Outputs>
<VTK
name="vtkOutput"
plotFileRoot="springSliderExplicit"/>
<Restart
name="restart"/>

<TimeHistory
name="timeHistoryOutput"
sources="{/Tasks/slipCollection,/Tasks/slipRateCollection,/Tasks/stateVariableCollection}"
filename="springSliderExplicit"/>
</Outputs>

<Tasks>
<PackCollection
name="slipCollection"
objectPath="ElementRegions/Fault/FractureSubRegion"
fieldName="displacementJump"/>

<PackCollection
name="slipRateCollection"
objectPath="ElementRegions/Fault/FractureSubRegion"
fieldName="slipRate"/>

<PackCollection
name="stateVariableCollection"
objectPath="ElementRegions/Fault/FractureSubRegion"
fieldName="stateVariable"/>
</Tasks>
</Problem>
32 changes: 32 additions & 0 deletions inputFiles/inducedSeismicity/SpringSliderExplicit_smoke.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
<?xml version="1.0" ?>
<Problem>
<Included>
<File
name="./SpringSliderExplicit_base.xml"/>
</Included>

<Events
maxTime="4.5e4">

<SoloEvent
name="generateFault"
target="/Solvers/SurfaceGen"/>

<PeriodicEvent
name="vtkOutput"
cycleFrequency="1"
targetExactTimestep="0"
target="/Outputs/vtkOutput"/>

<PeriodicEvent
name="solverApplications"
maxEventDt="1e4"
target="/Solvers/SpringSlider"/>

<PeriodicEvent
name="resarts"
timeFrequency="2e4"
targetExactTimestep="0"
target="/Outputs/restart"/>
</Events>
</Problem>
4 changes: 2 additions & 2 deletions inputFiles/inducedSeismicity/SpringSlider_base.xml
Original file line number Diff line number Diff line change
Expand Up @@ -123,15 +123,15 @@
initialCondition="1"
objectPath="ElementRegions/Fault/FractureSubRegion"
component="0"
scale="0."
scale="0.70710678118e-6"
setNames="{all}"/>
<FieldSpecification
name="slipVelocity2"
fieldName="slipVelocity"
initialCondition="1"
objectPath="ElementRegions/Fault/FractureSubRegion"
component="1"
scale="0."
scale="0.70710678118e-6"
setNames="{all}"/>
</FieldSpecifications>

Expand Down
9 changes: 8 additions & 1 deletion inputFiles/inducedSeismicity/inducedSeismicity.ats
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,13 @@ decks = [
partitions=((1, 1, 1), ),
restart_step=0,
check_step=3262,
restartcheck_params=RestartcheckParameters(atol=1e-4, rtol=1e-3))
restartcheck_params=RestartcheckParameters(atol=1e-4, rtol=1e-3)),
TestDeck(
name="SpringSliderExplicit_smoke",
description="Spring slider 0D system",
partitions=((1, 1, 1), ),
restart_step=0,
check_step=532,
restartcheck_params=RestartcheckParameters(atol=1e-4, rtol=1e-3))
]
generate_geos_tests(decks)
Loading

0 comments on commit a579f4c

Please sign in to comment.