Skip to content

Commit 6589846

Browse files
author
Dmitri Naumov
committed
Merge branch 'anchors_benchmark_fix' into 'master'
Anchor Slope Stability benchmark fix See merge request ogs/ogs!5393
2 parents 63dbb86 + 504bb91 commit 6589846

11 files changed

+109
-111
lines changed

ProcessLib/SmallDeformation/Tests.cmake

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,11 @@
11
if (NOT OGS_USE_MPI)
2-
OgsTest(PROJECTFILE Mechanics/SlopeStabilityAnchors/fault_slip_SD_noniterWP_reference.prj RUNTIME 200)
3-
OgsTest(PROJECTFILE Mechanics/SlopeStabilityAnchors/fault_slip_SD_noniterWP_anchors.xml RUNTIME 200)
4-
OgsTest(PROJECTFILE Mechanics/SlopeStabilityAnchors/fault_slip_SD_noniterWP_anchors_prestress.xml RUNTIME 200)
2+
if (OGS_USE_MFRONT)
3+
if(OGS_USE_MKL)
4+
OgsTest(PROJECTFILE Mechanics/SlopeStabilityAnchors/fault_slip_SD_noniterWP_reference.prj RUNTIME 30)
5+
OgsTest(PROJECTFILE Mechanics/SlopeStabilityAnchors/fault_slip_SD_noniterWP_anchors.xml RUNTIME 30)
6+
OgsTest(PROJECTFILE Mechanics/SlopeStabilityAnchors/fault_slip_SD_noniterWP_anchors_prestress.xml RUNTIME 30)
7+
endif()
8+
endif()
59
OgsTest(PROJECTFILE Mechanics/Linear/square_1e0.prj)
610
OgsTest(PROJECTFILE Mechanics/Linear/square_1e2.prj)
711
OgsTest(PROJECTFILE Mechanics/Linear/EmbeddedAnchorSourceTerm/beam_two_material.prj)

Tests/Data/Mechanics/SlopeStabilityAnchors/fault_slip_SD_noniterWP_anchors.xml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,10 @@
99
<source_term>
1010
<mesh>four_anchors</mesh>
1111
<type>EmbeddedAnchor</type>
12-
<external_anchor_head_load>force0</external_anchor_head_load>
1312
</source_term>
1413
</source_terms>
1514
</add>
16-
<replace sel="/*/test_definition/vtkdiff[1]/regex/text()">fault_slip_nonIter_WP_anchors_t_45.000000.vtu</replace>
17-
<replace sel="/*/test_definition/vtkdiff[2]/regex/text()">fault_slip_nonIter_WP_anchors_t_45.000000.vtu</replace>
18-
<replace sel="/*/test_definition/vtkdiff[3]/regex/text()">fault_slip_nonIter_WP_anchors_t_45.000000.vtu</replace>
15+
<replace sel="/*/test_definition/vtkdiff[1]/regex/text()">fault_slip_nonIter_WP_anchors_t_6.000000.vtu</replace>
16+
<replace sel="/*/test_definition/vtkdiff[2]/regex/text()">fault_slip_nonIter_WP_anchors_t_6.000000.vtu</replace>
1917
</OpenGeoSysProjectDiff>
2018

Tests/Data/Mechanics/SlopeStabilityAnchors/fault_slip_SD_noniterWP_anchors_prestress.xml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,9 @@
99
<source_term>
1010
<mesh>four_anchors_prestress</mesh>
1111
<type>EmbeddedAnchor</type>
12-
<external_anchor_head_load>force0</external_anchor_head_load>
1312
</source_term>
1413
</source_terms>
1514
</add>
16-
<replace sel="/*/test_definition/vtkdiff[1]/regex/text()">fault_slip_nonIter_WP_anchors_prestress_t_45.000000.vtu</replace>
17-
<replace sel="/*/test_definition/vtkdiff[2]/regex/text()">fault_slip_nonIter_WP_anchors_prestress_t_45.000000.vtu</replace>
18-
<replace sel="/*/test_definition/vtkdiff[3]/regex/text()">fault_slip_nonIter_WP_anchors_prestress_t_45.000000.vtu</replace>
15+
<replace sel="/*/test_definition/vtkdiff[1]/regex/text()">fault_slip_nonIter_WP_anchors_prestress_t_6.000000.vtu</replace>
16+
<replace sel="/*/test_definition/vtkdiff[2]/regex/text()">fault_slip_nonIter_WP_anchors_prestress_t_6.000000.vtu</replace>
1917
</OpenGeoSysProjectDiff>

Tests/Data/Mechanics/SlopeStabilityAnchors/fault_slip_SD_noniterWP_reference.prj

Lines changed: 12 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,8 @@
6262
<time_stepping>
6363
<type>IterationNumberBasedTimeStepping</type>
6464
<t_initial>0.0</t_initial>
65-
<t_end>45.0</t_end>
65+
<!-- original (web docu) t_end: 45 shortened for a faster ctest -->
66+
<t_end>6.0</t_end>
6667
<initial_dt>0.05</initial_dt>
6768
<minimum_dt>1e-7</minimum_dt>
6869
<maximum_dt>10</maximum_dt>
@@ -207,8 +208,10 @@
207208
<curves>
208209
<curve>
209210
<name>pressure_cycle</name>
210-
<coords>0.0 1000</coords>
211-
<values>7e6 1e8</values>
211+
<!-- original (web docu) coords: 0.0 100, changed for a faster ctest -->
212+
<coords>0 1.0 5</coords>
213+
<!-- original (web docu) values: 7e6 1e8, changed for a faster ctest -->
214+
<values>7e6 8860000. 9325000.</values>
212215
</curve>
213216
</curves>
214217
<process_variables>
@@ -279,22 +282,16 @@
279282
</linear_solvers>
280283
<test_definition>
281284
<vtkdiff>
282-
<regex>fault_slip_nonIter_WP_ref_t_45.000000.vtu</regex>
285+
<regex>fault_slip_nonIter_WP_ref_t_6.000000.vtu</regex>
283286
<field>displacement</field>
284-
<absolute_tolerance>1e-15</absolute_tolerance>
285-
<relative_tolerance>1e-15</relative_tolerance>
287+
<absolute_tolerance>1e-5</absolute_tolerance>
288+
<relative_tolerance>1e-3</relative_tolerance>
286289
</vtkdiff>
287290
<vtkdiff>
288-
<regex>fault_slip_nonIter_WP_ref_t_45.000000.vtu</regex>
291+
<regex>fault_slip_nonIter_WP_ref_t_6.000000.vtu</regex>
289292
<field>sigma</field>
290-
<absolute_tolerance>5e-8</absolute_tolerance>
291-
<relative_tolerance>1e-15</relative_tolerance>
292-
</vtkdiff>
293-
<vtkdiff>
294-
<regex>fault_slip_nonIter_WP_ref_t_45.000000.vtu</regex>
295-
<field>EquivalentPlasticStrainWP</field>
296-
<absolute_tolerance>5e-8</absolute_tolerance>
297-
<relative_tolerance>1e-15</relative_tolerance>
293+
<absolute_tolerance>5000</absolute_tolerance>
294+
<relative_tolerance>1e-3</relative_tolerance>
298295
</vtkdiff>
299296
</test_definition>
300297
</OpenGeoSysProject>

Tests/Data/Mechanics/SlopeStabilityAnchors/fault_slip_nonIter_WP_anchors_prestress_t_45.000000.vtu

Lines changed: 0 additions & 28 deletions
This file was deleted.

Tests/Data/Mechanics/SlopeStabilityAnchors/fault_slip_nonIter_WP_anchors_prestress_t_6.000000.vtu

Lines changed: 28 additions & 0 deletions
Large diffs are not rendered by default.

Tests/Data/Mechanics/SlopeStabilityAnchors/fault_slip_nonIter_WP_anchors_t_45.000000.vtu

Lines changed: 0 additions & 28 deletions
This file was deleted.

Tests/Data/Mechanics/SlopeStabilityAnchors/fault_slip_nonIter_WP_anchors_t_6.000000.vtu

Lines changed: 28 additions & 0 deletions
Large diffs are not rendered by default.

Tests/Data/Mechanics/SlopeStabilityAnchors/fault_slip_nonIter_WP_ref_t_45.000000.vtu

Lines changed: 0 additions & 28 deletions
This file was deleted.

Tests/Data/Mechanics/SlopeStabilityAnchors/fault_slip_nonIter_WP_ref_t_6.000000.vtu

Lines changed: 28 additions & 0 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)