refactor: separate friction and hydraulic aperture - stress relation. (…

…#3197)
GEOS-DEV · Aug 7, 2024 · 7cce9a0 · 7cce9a0
1 parent c914283
commit 7cce9a0
Show file tree

Hide file tree

Showing 136 changed files with 2,088 additions and 1,557 deletions.
diff --git a/.integrated_tests.yaml b/.integrated_tests.yaml
@@ -1,6 +1,6 @@
 baselines:
   bucket: geosx
-  baseline: integratedTests/baseline_integratedTests-pr3202-6636-2821c93
+  baseline: integratedTests/baseline_integratedTests-pr3197-6679-a003f43
 
 allow_fail:
   all: ''

diff --git a/BASELINE_NOTES.md b/BASELINE_NOTES.md
@@ -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 3197 (2024-08-07)
+====================
+Separation of contact and friction laws.
+
 PR #3202 (2024-08-03)
 ======================
 Acoustic VTI tests needed rebaselining after update in source and receiver location algorithm.

diff --git a/examples/pygeosxExamples/modifyBoundaryCondition/pkn_example.xml b/examples/pygeosxExamples/modifyBoundaryCondition/pkn_example.xml
@@ -22,7 +22,6 @@
       name="hydrofracture"
       solidSolverName="lagsolve"
       logLevel="1"
-      contactRelationName="fractureContact"
       flowSolverName="SinglePhaseFlow"
       surfaceGeneratorName="SurfaceGen"      
       targetRegions="{ Domain, Fracture }">
@@ -39,8 +38,8 @@
       timeIntegrationOption="QuasiStatic"
       discretization="FE1"
       name="lagsolve"
-      contactRelationName="fractureContact"
-      targetRegions="{ Domain, Fracture }">
+      targetRegions="{ Domain, Fracture }"
+      contactPenaltyStiffness="1.0e0">
       <NonlinearSolverParameters
         newtonTol="1.0e-6"/>
       <LinearSolverParameters
@@ -77,7 +76,7 @@
     <SurfaceElementRegion
       name="Fracture"
       defaultAperture="0.02e-3"
-      materialList="{ water, rock, fractureFilling, fracturePorosity, fracturePerm, nullSolid }"/>
+      materialList="{ water, rock, fractureFilling, fracturePorosity, fracturePerm, nullSolid, hApertureTable }"/>
   </ElementRegions>
 
   <Constitutive>
@@ -112,9 +111,11 @@
       compressibility="0.0"/>
 
     <FrictionlessContact
-      name="fractureContact"
-      penaltyStiffness="1.0e0"
-      apertureTableName="apertureTable"/>
+      name="fractureContact"/>
+
+    <HydraulicApertureTable
+      name="hApertureTable"
+      apertureTableName="apertureTable"/>  
 
     <ParallelPlatesPermeability
       name="fracturePerm"/>

diff --git a/host-configs/apple/macOS_customized.cmake b/host-configs/apple/macOS_customized.cmake
diff --git a/inputFiles/almContactMechanics/ALM_stickFault_base.xml b/inputFiles/almContactMechanics/ALM_stickFault_base.xml
@@ -92,8 +92,11 @@
     <Coulomb
       name="fractureMaterial"
       cohesion="0.0"
-      frictionCoefficient="0.1"
-      apertureTableName="apertureTable"/>
+      frictionCoefficient="0.1"/>
+
+    <HydraulicApertureTable
+      name="hApertureModel"
+      apertureTableName="apertureTable"/>  
   </Constitutive>
 
   <Functions>

diff --git a/inputFiles/efemFractureMechanics/EmbFrac_Compression_CoulombFriction_base.xml b/inputFiles/efemFractureMechanics/EmbFrac_Compression_CoulombFriction_base.xml
@@ -9,7 +9,8 @@
       initialDt="10"
       discretization="FE1"
       timeIntegrationOption="QuasiStatic"
-      logLevel="1">
+      logLevel="1"
+      contactPenaltyStiffness="1.0e12">
       <NonlinearSolverParameters
         newtonTol="1.0e-6"
         newtonMaxIter="2"
@@ -48,7 +49,7 @@
       name="Fracture"
       faceBlock="embeddedSurfaceSubRegion"
       subRegionType="embeddedElement"
-      materialList="{ fractureContact }"
+      materialList="{ frictionLaw }"
       defaultAperture="1e-3"/>
   </ElementRegions>
 
@@ -60,12 +61,10 @@
       defaultShearModulus="1.0e10"/>
 
     <Coulomb
-      name="fractureContact"
-      penaltyStiffness="1.0e12"
+      name="frictionLaw"
       shearStiffness="1.0e8"
       cohesion ="0.0"
-      frictionCoefficient = "0.8"
-      apertureTableName="apertureTable"/>
+      frictionCoefficient = "0.8"/>
   </Constitutive>
 
   <Functions>
@@ -116,13 +115,6 @@
       scale="0.0"
       setNames="{ zneg, zpos }"/>   
   </FieldSpecifications>
-
-  <Functions>
-    <TableFunction
-      name="apertureTable"
-      coordinates="{ -1.0e-3, 0.0 }"
-      values="{ 1.0e-6, 1.0e-4 }"/>
-  </Functions>
 
   <Tasks>
     <PackCollection

diff --git a/inputFiles/efemFractureMechanics/EmbFrac_Compression_Frictionless_base.xml b/inputFiles/efemFractureMechanics/EmbFrac_Compression_Frictionless_base.xml
@@ -9,7 +9,8 @@
       initialDt="10"
       timeIntegrationOption="QuasiStatic"
       discretization="FE1"
-      logLevel="1">
+      logLevel="1"
+      contactPenaltyStiffness="1.0e8">
       <NonlinearSolverParameters
         newtonTol="1.0e-6"
         newtonMaxIter="2"
@@ -48,7 +49,7 @@
       name="Fracture"
       faceBlock="embeddedSurfaceSubRegion"
       subRegionType="embeddedElement"
-      materialList="{ fractureContact }"
+      materialList="{ frictionLaw }"
       defaultAperture="1e-3"/>
   </ElementRegions>
 
@@ -60,18 +61,9 @@
       defaultShearModulus="1.0e10"/>
 
     <FrictionlessContact
-      name="fractureContact"
-      penaltyStiffness="1.0e8"
-      apertureTableName="apertureTable"/>
+      name="frictionLaw"/>
   </Constitutive>
 
-  <Functions>
-    <TableFunction
-      name="apertureTable"
-      coordinates="{ -1.0e-3, 0.0 }"
-      values="{ 0.002e-3, 0.02e-3 }"/>
-  </Functions>
-
   <FieldSpecifications>
     <Traction
       name="xload1"

diff --git a/inputFiles/efemFractureMechanics/SneddonRotated_benchmark.xml b/inputFiles/efemFractureMechanics/SneddonRotated_benchmark.xml
@@ -16,7 +16,8 @@
       timeIntegrationOption="QuasiStatic"
       discretization="FE1"
       logLevel="1"
-      useStaticCondensation="1">
+      useStaticCondensation="1"
+      contactPenaltyStiffness="0.0e8">
       <NonlinearSolverParameters
         newtonTol="1.0e-6"
         newtonMaxIter="2"

diff --git a/inputFiles/efemFractureMechanics/SneddonRotated_benchmark2.xml b/inputFiles/efemFractureMechanics/SneddonRotated_benchmark2.xml
@@ -16,7 +16,8 @@
       timeIntegrationOption="QuasiStatic"
       logLevel="1"
       discretization="FE1"
-      useStaticCondensation="1">
+      useStaticCondensation="1"
+      contactPenaltyStiffness="0.0e8">
       <NonlinearSolverParameters
         newtonTol="1.0e-6"
         newtonMaxIter="2"

diff --git a/inputFiles/efemFractureMechanics/SneddonRotated_smoke.xml b/inputFiles/efemFractureMechanics/SneddonRotated_smoke.xml
@@ -16,7 +16,8 @@
       timeIntegrationOption="QuasiStatic"
       discretization="FE1"
       logLevel="1"
-      useStaticCondensation="1">
+      useStaticCondensation="1"
+      contactPenaltyStiffness="0.0e8">
       <NonlinearSolverParameters
         newtonTol="1.0e-6"
         newtonMaxIter="2"

diff --git a/inputFiles/efemFractureMechanics/Sneddon_embeddedFracShapes_base.xml b/inputFiles/efemFractureMechanics/Sneddon_embeddedFracShapes_base.xml
@@ -10,7 +10,8 @@
       initialDt="10"
       timeIntegrationOption="QuasiStatic"
       discretization="FE1"
-      logLevel="1">
+      logLevel="1"
+      contactPenaltyStiffness="0.0e8">
       <NonlinearSolverParameters
         newtonTol="1.0e-6"
         newtonMaxIter="2"
@@ -70,7 +71,7 @@
       name="Fracture"
       faceBlock="embeddedSurfaceSubRegion"
       subRegionType="embeddedElement"
-      materialList="{ fractureContact }"
+      materialList="{ frictionLaw }"
       defaultAperture="1e-3"/>
   </ElementRegions>
   <!-- SPHINX_SNEDDON_REGIONS_END -->
@@ -85,19 +86,10 @@
       defaultShearModulus="1.0e10"/>
 
     <FrictionlessContact
-      name="fractureContact"
-      penaltyStiffness="0.0e8"
-      apertureTableName="apertureTable"/>
+      name="frictionLaw"/>
   </Constitutive>
   <!-- SPHINX_SNEDDON_MATERIAL_END-->
 
-  <Functions>
-    <TableFunction
-      name="apertureTable"
-      coordinates="{ -1.0e-3, 0.0 }"
-      values="{ 0.002e-3, 0.02e-3 }"/>
-  </Functions>
-
   <!-- SPHINX_SNEDDON_BC -->
   <FieldSpecifications>
     <FieldSpecification

diff --git a/inputFiles/efemFractureMechanics/Sneddon_embeddedFrac_base.xml b/inputFiles/efemFractureMechanics/Sneddon_embeddedFrac_base.xml
@@ -20,7 +20,7 @@
       name="Fracture"
       faceBlock="embeddedSurfaceSubRegion"
       subRegionType="embeddedElement"
-      materialList="{ fractureContact }"
+      materialList="{ frictionLaw }"
       defaultAperture="1e-3"/>
   </ElementRegions>
   <!-- SPHINX_SNEDDON_REGIONS_END -->
@@ -35,19 +35,10 @@
       defaultShearModulus="1.0e10"/>
 
     <FrictionlessContact
-      name="fractureContact"
-      penaltyStiffness="0.0e8"
-      apertureTableName="apertureTable"/>
+      name="frictionLaw"/>
   </Constitutive>
   <!-- SPHINX_SNEDDON_MATERIAL_END-->
 
-  <Functions>
-    <TableFunction
-      name="apertureTable"
-      coordinates="{ -1.0e-3, 0.0 }"
-      values="{ 0.002e-3, 0.02e-3 }"/>
-  </Functions>
-
   <!-- SPHINX_SNEDDON_BC -->
   <FieldSpecifications>
     <FieldSpecification

diff --git a/inputFiles/efemFractureMechanics/Sneddon_embeddedFrac_benchmark.xml b/inputFiles/efemFractureMechanics/Sneddon_embeddedFrac_benchmark.xml
@@ -15,7 +15,8 @@
       initialDt="10"
       timeIntegrationOption="QuasiStatic"
       discretization="FE1"
-      logLevel="1">
+      logLevel="1"
+      contactPenaltyStiffness="0.0e8">
       <NonlinearSolverParameters
         newtonTol="1.0e-3"
         newtonMaxIter="2"

diff --git a/inputFiles/efemFractureMechanics/Sneddon_embeddedFrac_smoke.xml b/inputFiles/efemFractureMechanics/Sneddon_embeddedFrac_smoke.xml
@@ -15,7 +15,8 @@
       initialDt="10"
       timeIntegrationOption="QuasiStatic"
       discretization="FE1"
-      logLevel="1">
+      logLevel="1"
+      contactPenaltyStiffness="0.0e8">
       <NonlinearSolverParameters
         newtonTol="1.0e-6"
         newtonMaxIter="2"

diff --git a/inputFiles/efemFractureMechanics/Sneddon_embeddedFrac_staticCondensation_benchmark.xml b/inputFiles/efemFractureMechanics/Sneddon_embeddedFrac_staticCondensation_benchmark.xml
@@ -16,7 +16,8 @@
       timeIntegrationOption="QuasiStatic"
       logLevel="1"
       discretization="FE1"
-      useStaticCondensation="1">
+      useStaticCondensation="1"
+      contactPenaltyStiffness="0.0e8">
       <NonlinearSolverParameters
         newtonTol="1.0e-3"
         newtonMaxIter="2"

diff --git a/inputFiles/efemFractureMechanics/Sneddon_embeddedFrac_staticCondensation_smoke.xml b/inputFiles/efemFractureMechanics/Sneddon_embeddedFrac_staticCondensation_smoke.xml
@@ -16,7 +16,8 @@
       timeIntegrationOption="QuasiStatic"
       discretization="FE1"
       logLevel="1"
-      useStaticCondensation="1">
+      useStaticCondensation="1"
+      contactPenaltyStiffness="0.0e8">
       <NonlinearSolverParameters
         newtonTol="1.0e-5"
         newtonMaxIter="2"

diff --git a/inputFiles/efemFractureMechanics/Sneddon_embeddedFrac_verification.xml b/inputFiles/efemFractureMechanics/Sneddon_embeddedFrac_verification.xml
@@ -15,7 +15,8 @@
       initialDt="10"
       timeIntegrationOption="QuasiStatic"
       discretization="FE1"
-      logLevel="1">
+      logLevel="1"
+      contactPenaltyStiffness="0.0e8">
       <NonlinearSolverParameters
         newtonTol="1.0e-6"
         newtonMaxIter="2"

diff --git a/inputFiles/hydraulicFracturing/Sneddon_hydroFrac_base.xml b/inputFiles/hydraulicFracturing/Sneddon_hydroFrac_base.xml
@@ -11,7 +11,6 @@
       surfaceGeneratorName="SurfaceGen"
       logLevel="1"
       targetRegions="{ Fracture }"
-      contactRelationName="fractureContact"
       maxNumResolves="2">
       <NonlinearSolverParameters
         newtonTol="1.0e-5"
@@ -26,7 +25,8 @@
       timeIntegrationOption="QuasiStatic"
       discretization="FE1"
       targetRegions="{ Domain, Fracture }"
-      contactRelationName="fractureContact"/>
+      contactRelationName="fractureContact"
+      contactPenaltyStiffness="1.0e0"/>
 
     <SinglePhaseFVM
       name="SinglePhaseFlow"
@@ -86,7 +86,7 @@
       name="Fracture"
       faceBlock="faceElementSubRegion"
       defaultAperture="0.02e-3"
-      materialList="{ water, fractureFilling, fractureContact }"/>
+      materialList="{ water, fractureFilling, fractureContact, hApertureModel }"/>
   </ElementRegions>
   <!-- SPHINX_SNEDDON_REGIONS_END -->
 
@@ -126,9 +126,11 @@
       name="fracturePerm"/>
 
     <FrictionlessContact
-      name="fractureContact"
-      penaltyStiffness="1.0e0"
-      apertureTableName="apertureTable" />
+      name="fractureContact"/>
+
+    <HydraulicApertureTable
+      name="hApertureModel"
+      apertureTableName="apertureTable"/>    
   </Constitutive>
   <!-- SPHINX_SNEDDON_MATERIAL_END-->