Merge branch 'develop' into dkachuma/fluid-kernel-specs

Author: dkachuma

.integrated_tests.yaml

@@ -1,6 +1,6 @@
 baselines:
   bucket: geosx
-  baseline: integratedTests/baseline_integratedTests-pr4068-16828-c74157c
+  baseline: integratedTests/baseline_integratedTests-pr4067-16928-3038f6b
 
 allow_fail:
   all: ''

BASELINE_NOTES.md

@@ -5,7 +5,12 @@ 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 #4068 (2026-05-28) <https://storage.googleapis.com/geosx/integratedTests/baseline_integratedTests-pr4068-16828-c74157c.tar.gz>
+
+PR #4067 (2026-06-10) <https://storage.googleapis.com/geosx/integratedTests/baseline_integratedTests-pr4067-16928-3038f6b.tar.gz>
+=====================
+Add Coulomb friction/cohesion input from vtk mesh
+
+PR #4068 (2026-06-09) <https://storage.googleapis.com/geosx/integratedTests/baseline_integratedTests-pr4068-16828-c74157c.tar.gz>
 =====================
 Add MPI runs for smoke tests with surfaceGenerator
 

inputFiles/efemFractureMechanics/EmbFrac_Compression_CoulombFriction_base.xml

@@ -62,8 +62,8 @@
     <Coulomb
       name="frictionLaw"
       shearStiffness="1.0e8"
-      cohesion ="0.0"
-      frictionCoefficient = "0.8"/>
+      defaultCohesion="0.0"
+      defaultFrictionCoefficient="0.8"/>
   </Constitutive>
 
   <Functions>

inputFiles/lagrangianContactMechanics/ContactMechanics_PEBICrack_base.xml

@@ -26,7 +26,7 @@
 
     <Constitutive>
         <ElasticIsotropic name="rock" defaultDensity="2700" defaultBulkModulus="3333e6" defaultShearModulus="2000e6"/>
-        <Coulomb name="fractureMaterial" cohesion="0" frictionCoefficient="0.1"/>
+        <Coulomb name="fractureMaterial" defaultCohesion="0" defaultFrictionCoefficient="0.1"/>
     </Constitutive>
 
     <Functions>

inputFiles/lagrangianContactMechanics/LagrangeContactBubbleStab_singleFracCompression_base.xml

@@ -63,8 +63,8 @@
 
     <Coulomb
       name="fractureMaterial"
-      cohesion="0.0"
-      frictionCoefficient="0.577350269e9"/>
+      defaultCohesion="0.0"
+      defaultFrictionCoefficient="0.577350269e9"/>
   </Constitutive>
 
   <Functions>

inputFiles/lagrangianContactMechanics/PassingCrack_base.xml

@@ -40,8 +40,8 @@
 
     <Coulomb
       name="frictionLaw"
-      cohesion="0.0"
-      frictionCoefficient="0.577350269189626"/>
+      defaultCohesion="0.0"
+      defaultFrictionCoefficient="0.577350269189626"/>
   </Constitutive>
 
   <FieldSpecifications>

inputFiles/lagrangianContactMechanics/SimpleCubes_base.xml

@@ -39,8 +39,8 @@
 
     <Coulomb
       name="frictionLaw"
-      cohesion="0.0"
-      frictionCoefficient="0.577350269"/>
+      defaultCohesion="0.0"
+      defaultFrictionCoefficient="0.577350269"/>
   </Constitutive>
 
   <FieldSpecifications>

inputFiles/lagrangianContactMechanics/SingleFracCompression_base.xml

@@ -45,8 +45,8 @@
 
     <Coulomb
       name="frictionLaw"
-      cohesion="0.0"
-      frictionCoefficient="0.577350269"/>
+      defaultCohesion="0.0"
+      defaultFrictionCoefficient="0.577350269"/>
   </Constitutive>
 <!-- SPHINX_MATERIAL_END -->
 

inputFiles/lagrangianContactMechanics/SlippingFault_base.xml

@@ -44,8 +44,8 @@
 
     <Coulomb
       name="frictionLaw"
-      cohesion="0.0"
-      frictionCoefficient="0.1"/>
+      defaultCohesion="0.0"
+      defaultFrictionCoefficient="0.1"/>
   </Constitutive>
 
   <Functions>

inputFiles/lagrangianContactMechanics/Sneddon_base.xml

@@ -54,8 +54,8 @@
 
     <Coulomb
       name="frictionLaw"
-      cohesion="0.0"
-      frictionCoefficient="0.577350269"/>
+      defaultCohesion="0.0"
+      defaultFrictionCoefficient="0.577350269"/>
   </Constitutive>
   <!-- SPHINX_SNEDDON_MATERIAL_END-->