Skip to content

Commit 1dc1423

Browse files
authored
Merge branch 'develop' into feature/cusini/addMpiWrapperForArrays
2 parents c18b631 + 79c0422 commit 1dc1423

File tree

138 files changed

+5058
-1535
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

138 files changed

+5058
-1535
lines changed

.integrated_tests.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
baselines:
22
bucket: geosx
3-
baseline: integratedTests/baseline_integratedTests-pr3228-9676-61994fe
3+
baseline: integratedTests/baseline_integratedTests-pr3395-9832-31f145e
4+
45
allow_fail:
56
all: ''
67
streak: ''

BASELINE_NOTES.md

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,18 @@ This file is designed to track changes to the integrated test baselines.
66
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.
77
These notes should be in reverse-chronological order, and use the following time format: (YYYY-MM-DD).
88

9+
PR #3395 (2024-01-22)
10+
=====================
11+
Add new fields and change the default input for some tests.
12+
13+
PR #3416 (2024-01-21)
14+
=====================
15+
Refactoring of induced seismicity EQ solvers to add coupling.
16+
17+
PR #3310 (2024-01-21)
18+
======================
19+
Scalable rock toughness required new field.
20+
921
PR #3228 (2024-01-15)
1022
=====================
1123
deltaVolume added in multiphase.

examples/pygeosxExamples/modifyBoundaryCondition/pkn_example.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@
6262
<SurfaceGenerator
6363
name="SurfaceGen"
6464
targetRegions="{ Domain }"
65-
rockToughness="1e6"
65+
initialRockToughness="1e6"
6666
nodeBasedSIF="1"
6767
mpiCommOrder="1"/>
6868
</Solvers>

inputFiles/hydraulicFracturing/Sneddon_hydroFrac_base.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
name="SurfaceGen"
3838
targetRegions="{ Domain }"
3939
nodeBasedSIF="1"
40-
rockToughness="10.0e6"
40+
initialRockToughness="10.0e6"
4141
mpiCommOrder="1"/>
4242
<!-- SPHINX_SNEDDON_SOLVER_END -->
4343
</Solvers>

inputFiles/hydraulicFracturing/heterogeneousInSitu_base.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
<SurfaceGenerator
5454
name="SurfaceGen"
5555
targetRegions="{ Domain }"
56-
rockToughness="$K_upscaled$"
56+
initialRockToughness="$K_upscaled$"
5757
nodeBasedSIF="1"
5858
mpiCommOrder="1"/>
5959
</Solvers>

inputFiles/hydraulicFracturing/heterogeneousInSitu_smoke.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@
7171
<SurfaceGenerator
7272
name="SurfaceGen"
7373
targetRegions="{ Domain }"
74-
rockToughness="2.236068e6"
74+
initialRockToughness="2.236068e6"
7575
nodeBasedSIF="1"
7676
mpiCommOrder="1"/>
7777
</Solvers>

inputFiles/hydraulicFracturing/hydrofractureSinglePhase2d.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
<SurfaceGenerator
3535
name="SurfaceGen"
3636
targetRegions="{ Domain }"
37-
rockToughness="1.0e6"/>
37+
initialRockToughness="1.0e6"/>
3838
</Solvers>
3939

4040
<Mesh>

inputFiles/hydraulicFracturing/kgdEdgeBased_C3D6_base.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
<SurfaceGenerator
5050
name="SurfaceGen"
5151
targetRegions="{ Domain }"
52-
rockToughness="0.707e7"
52+
initialRockToughness="0.707e7"
5353
mpiCommOrder="1"/>
5454
</Solvers>
5555
</Problem>

inputFiles/hydraulicFracturing/kgdNodeBased_C3D6_base.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
<SurfaceGenerator
4040
name="SurfaceGen"
4141
targetRegions="{ Domain }"
42-
rockToughness="0.707e7"
42+
initialRockToughness="0.707e7"
4343
nodeBasedSIF="1"
4444
mpiCommOrder="1"/>
4545
</Solvers>

inputFiles/hydraulicFracturing/kgdToughnessDominated_base.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
name="SurfaceGen"
4646
targetRegions="{ Domain }"
4747
nodeBasedSIF="1"
48-
rockToughness="1e6"
48+
initialRockToughness="1e6"
4949
mpiCommOrder="1"/>
5050
<!-- Sphinx_Solvers_SurfaceGenerator_End -->
5151
</Solvers>

0 commit comments

Comments
 (0)