Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
fb800e3
Add cohesion/frictionCoeff per cell + load from mesh + output
npillardou Feb 9, 2026
6f6d73a
Update XSD schema
npillardou Feb 9, 2026
836e631
resolve conflict
npillardou Mar 6, 2026
1a6c732
Correct compilation error
npillardou Mar 6, 2026
eae740a
Merge branch 'develop' into feature/npillardou/CoulombFriction-per-ce…
npillardou Mar 24, 2026
7143471
Merge branch 'develop' into feature/npillardou/CoulombFriction-per-ce…
npillardou Apr 3, 2026
dd04fb8
Merge branch 'develop' into feature/npillardou/CoulombFriction-per-ce…
npillardou Apr 14, 2026
86becd3
Merge branch 'develop' into feature/npillardou/CoulombFriction-per-ce…
npillardou Apr 17, 2026
080b38d
Merge branch 'develop' into feature/npillardou/CoulombFriction-per-ce…
npillardou Apr 22, 2026
f892ef3
Merge branch 'develop' into feature/npillardou/CoulombFriction-per-ce…
npillardou May 27, 2026
9fe931b
Merge branch 'develop' into feature/npillardou/CoulombFriction-per-ce…
npillardou May 27, 2026
b32c0a5
Update latest smoke tests
npillardou May 27, 2026
2c4baa1
Add smoke test
npillardou May 28, 2026
e83b9e5
enforce checks for friction properties
jhuang2601 May 28, 2026
aba050f
Merge branch 'develop' into feature/npillardou/CoulombFriction-per-ce…
jhuang2601 May 28, 2026
875a267
fix the issue for unit tests
jhuang2601 May 28, 2026
51aee70
fix unit test for scalar cast
jhuang2601 May 29, 2026
02eed02
revert change
jhuang2601 May 29, 2026
2be0818
Update registerFields and size of default parameters
npillardou May 29, 2026
1197417
fix uncrustify
npillardou May 29, 2026
17127c0
add parallel smoke test to ats
npillardou May 29, 2026
73e907b
update python scripts to fix build doc failure
jhuang2601 May 29, 2026
a88b1e0
remove per-cell resizing
jhuang2601 May 29, 2026
9061bbd
Update baseline files
npillardou Jun 1, 2026
0196113
Merge branch 'develop' into feature/npillardou/CoulombFriction-per-ce…
npillardou Jun 4, 2026
a692994
add improvements
npillardou Jun 5, 2026
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-pr4062-16784-6d8782e
baseline: integratedTests/baseline_integratedTests-pr4067-16830-a88b1e0

allow_fail:
all: ''
Expand Down
3 changes: 3 additions & 0 deletions BASELINE_NOTES.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@ 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 #4067 (2026-06-01) <https://storage.googleapis.com/geosx/integratedTests/baseline_integratedTests-pr4067-16830-a88b1e0.tar.gz>
Add Friction/Cohesion per cell input/output

PR #4062 (2026-05-26) <https://storage.googleapis.com/geosx/integratedTests/baseline_integratedTests-pr4062-16784-6d8782e.tar.gz>
Add Porous Solid other than PorousElasticity for ALM solver

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,8 @@
<Coulomb
name="frictionLaw"
shearStiffness="1.0e8"
cohesion ="0.0"
frictionCoefficient = "0.8"/>
defaultCohesion="0.0"
defaultFrictionCoefficient="0.8"/>
</Constitutive>

<Functions>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,8 @@

<Coulomb
name="fractureMaterial"
cohesion="0.0"
frictionCoefficient="0.577350269e9"/>
defaultCohesion="0.0"
defaultFrictionCoefficient="0.577350269e9"/>
</Constitutive>

<Functions>
Expand Down
4 changes: 2 additions & 2 deletions inputFiles/lagrangianContactMechanics/PassingCrack_base.xml
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@

<Coulomb
name="frictionLaw"
cohesion="0.0"
frictionCoefficient="0.577350269189626"/>
defaultCohesion="0.0"
defaultFrictionCoefficient="0.577350269189626"/>
</Constitutive>

<FieldSpecifications>
Expand Down
4 changes: 2 additions & 2 deletions inputFiles/lagrangianContactMechanics/SimpleCubes_base.xml
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@

<Coulomb
name="frictionLaw"
cohesion="0.0"
frictionCoefficient="0.577350269"/>
defaultCohesion="0.0"
defaultFrictionCoefficient="0.577350269"/>
</Constitutive>

<FieldSpecifications>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,8 @@

<Coulomb
name="frictionLaw"
cohesion="0.0"
frictionCoefficient="0.577350269"/>
defaultCohesion="0.0"
defaultFrictionCoefficient="0.577350269"/>
</Constitutive>
<!-- SPHINX_MATERIAL_END -->

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,8 @@

<Coulomb
name="frictionLaw"
cohesion="0.0"
frictionCoefficient="0.1"/>
defaultCohesion="0.0"
defaultFrictionCoefficient="0.1"/>
</Constitutive>

<Functions>
Expand Down
4 changes: 2 additions & 2 deletions inputFiles/lagrangianContactMechanics/Sneddon_base.xml
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,8 @@

<Coulomb
name="frictionLaw"
cohesion="0.0"
frictionCoefficient="0.577350269"/>
defaultCohesion="0.0"
defaultFrictionCoefficient="0.577350269"/>
</Constitutive>
<!-- SPHINX_SNEDDON_MATERIAL_END-->

Expand Down
4 changes: 2 additions & 2 deletions inputFiles/lagrangianContactMechanics/TFrac_base.xml
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,8 @@

<Coulomb
name="frictionLaw"
cohesion="0.0"
frictionCoefficient="0.577350269"/>
defaultCohesion="0.0"
defaultFrictionCoefficient="0.577350269"/>
</Constitutive>
<!-- SPHINX_MATERIAL_END -->

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@

<Coulomb
name="frictionLaw"
cohesion="0.0"
frictionCoefficient="0.577350269"/>
defaultCohesion="0.0"
defaultFrictionCoefficient="0.577350269"/>
</Constitutive>

<FieldSpecifications>
Expand Down
Loading
Loading