Skip to content

Commit

Permalink
Merge branch 'develop' into pt/hu-2phase
Browse files Browse the repository at this point in the history
  • Loading branch information
paveltomin authored Nov 21, 2024
2 parents 49cd55a + 9257440 commit b0cd8ff
Show file tree
Hide file tree
Showing 96 changed files with 34,374 additions and 588 deletions.
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-pr3339-8707-7c55c70
baseline: integratedTests/baseline_integratedTests-pr3439-8919-b09db43
allow_fail:
all: ''
streak: ''
7 changes: 7 additions & 0 deletions BASELINE_NOTES.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,13 @@ 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 #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)
=====================
Expand Down
38 changes: 0 additions & 38 deletions host-configs/apple/darwin-clang.cmake

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,132 @@
<?xml version="1.0" ?>
<Problem>
<NumericalMethods>
<FiniteElements>
<FiniteElementSpace
name="FE1"
order="1"/>
</FiniteElements>
</NumericalMethods>


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

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

<ElasticIsotropic
name="rock"
defaultDensity="2700"
defaultBulkModulus="1.66667"
defaultShearModulus="1.0"/>

<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="xconstraint"
objectPath="nodeManager"
fieldName="totalDisplacement"
component="0"
scale="0.0"
setNames="{ xneg, xpos }"/>

<FieldSpecification
name="yconstraint"
objectPath="nodeManager"
fieldName="totalDisplacement"
component="1"
scale="0.0"
setNames="{ xpos, xneg, yneg, ypos}"/>

<FieldSpecification
name="zconstraint"
objectPath="nodeManager"
fieldName="totalDisplacement"
component="2"
scale="0.0"
setNames="{ zpos, zneg }"/>

<FieldSpecification
name="dispJump_normal"
fieldName="targetIncrementalJump"
initialCondition="1"
objectPath="ElementRegions/Fault/FractureSubRegion"
scale="0.0"
component="0"
functionName="dispJumpFunction"
setNames="{all}"/>

<FieldSpecification
name="dispJump_t1"
fieldName="targetIncrementalJump"
initialCondition="1"
objectPath="ElementRegions/Fault/FractureSubRegion"
scale="1.0"
component="1"
functionName="dispJumpFunction"
setNames="{all}"/>

<FieldSpecification
name="dispJump_t2"
fieldName="targetIncrementalJump"
initialCondition="1"
objectPath="ElementRegions/Fault/FractureSubRegion"
scale="0.0"
component="2"
setNames="{all}"/>
</FieldSpecifications>

<Functions>
<TableFunction
name="dispJumpFunction"
inputVarNames="{elementCenter}"
coordinateFiles="{dataTables/x.csv, dataTables/y.csv, dataTables/z.csv}"
voxelFile="dataTables/singularCrackSlip.csv"/>
</Functions>

<Tasks>
<PackCollection
name="tractionCollection"
objectPath="ElementRegions/Fault/FractureSubRegion"
fieldName="traction"
setNames="{all}"/>
</Tasks>

<Outputs>
<VTK
name="vtkOutput"
plotFileRoot="fixedSlip"/>

<TimeHistory
name="timeHistoryOutput"
sources="{/Tasks/tractionCollection}"
filename="traction" />

<Restart
name="restart"/>
</Outputs>
</Problem>
Original file line number Diff line number Diff line change
@@ -0,0 +1,94 @@
<?xml version="1.0" ?>
<Problem>
<Included>
<File
name="./LagrangeContactBubbleStab_FixedSlip_base.xml"/>
</Included>

<Solvers>
<SolidMechanicsLagrangeContactBubbleStab
name="stressSolver"
timeIntegrationOption="QuasiStatic"
logLevel="2"
writeLinearSystem="0"
discretization="FE1"
targetRegions="{ Domain, Fault }">
<NonlinearSolverParameters
newtonTol="1.0e-8"
logLevel="2"
newtonMaxIter="10"
maxNumConfigurationAttempts="1"
lineSearchAction="Require"
lineSearchMaxCuts="2"
maxTimeStepCuts="1"/>
<LinearSolverParameters
solverType="direct"
directParallel="0"
logLevel="0"/>
</SolidMechanicsLagrangeContactBubbleStab>

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

<Mesh>
<InternalMesh
name="mesh1"
elementTypes="{ C3D8 }"
xCoords="{ -20, 20 }"
yCoords="{ -5, 5 }"
zCoords="{ -0.05, 0.05 }"
nx="{ 400 }"
ny="{ 100}"
nz="{ 1 }"
cellBlockNames="{ cb1 }"/>
</Mesh>

<Geometry>
<Box
name="faultPlane"
xMin="{ -19.01, -0.01, -1.01 }"
xMax="{ 19.01, 0.01, 1.01 }"/>
</Geometry>


<Events
maxTime="1.0"
maxCycle="1">

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

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

<PeriodicEvent
name="solverApplications"
maxEventDt="1.0"
target="/Solvers/stressSolver"/>

<PeriodicEvent
name="tractionHistoryCollect"
maxEventDt="1.0"
target="/Tasks/tractionCollection"/>

<PeriodicEvent
name="tractionHistoryOutput"
maxEventDt="1.0"
target="/Outputs/timeHistoryOutput"/>

<PeriodicEvent
name="resarts"
timeFrequency="1.0"
targetExactTimestep="0"
target="/Outputs/restart"/>
</Events>
</Problem>
Loading

0 comments on commit b0cd8ff

Please sign in to comment.