Merge branch 'MacIssueInBeamPF' into 'master'

Addressing the issue of beam benchmarks in the phase field process on macOS See merge request ogs/ogs!5039
ufz · Jul 5, 2024 · d8b4cfc · d8b4cfc
2 parents 5537d62 + baba643
commit d8b4cfc
Show file tree

Hide file tree

Showing 37 changed files with 157 additions and 344 deletions.
diff --git a/ProcessLib/PhaseField/Tests.cmake b/ProcessLib/PhaseField/Tests.cmake
@@ -9,8 +9,8 @@ AddTest(
     REQUIREMENTS OGS_USE_MPI
     RUNTIME 18
     DIFF_DATA
-        expected_AT1_iso_tension_ts_10_t_1_000000_0.vtu AT1_iso_tension_ts_10_t_1.000000.vtu displacement displacement 1e-5 0
-        expected_AT1_iso_tension_ts_10_t_1_000000_0.vtu AT1_iso_tension_ts_10_t_1.000000.vtu phasefield phasefield 1e-6 0
+        expected_AT1_iso_tension_ts_10_t_1.000000.vtu AT1_iso_tension_ts_10_t_1.000000.vtu displacement displacement 1e-5 0
+        expected_AT1_iso_tension_ts_10_t_1.000000.vtu AT1_iso_tension_ts_10_t_1.000000.vtu phasefield phasefield 1e-6 0
 )
 
 AddTest(
@@ -24,8 +24,8 @@ AddTest(
     REQUIREMENTS OGS_USE_MPI
     RUNTIME 260
     DIFF_DATA
-        expected_AT2_iso_tension_ts_10_t_1_000000_0.vtu AT2_iso_tension_ts_10_t_1.000000.vtu displacement displacement 1e-5 0
-        expected_AT2_iso_tension_ts_10_t_1_000000_0.vtu AT2_iso_tension_ts_10_t_1.000000.vtu phasefield phasefield 1e-6 0
+        expected_AT2_iso_tension_ts_10_t_1.000000.vtu AT2_iso_tension_ts_10_t_1.000000.vtu displacement displacement 1e-5 0
+        expected_AT2_iso_tension_ts_10_t_1.000000.vtu AT2_iso_tension_ts_10_t_1.000000.vtu phasefield phasefield 1e-6 0
 )
 
 AddTest(
@@ -39,8 +39,8 @@ AddTest(
     REQUIREMENTS OGS_USE_MPI
     RUNTIME 18
     DIFF_DATA
-        expected_AT1_vd_tension_ts_10_t_1_000000_0.vtu AT1_vd_tension_ts_10_t_1.000000.vtu displacement displacement 1e-5 0
-        expected_AT1_vd_tension_ts_10_t_1_000000_0.vtu AT1_vd_tension_ts_10_t_1.000000.vtu phasefield phasefield 1e-6 0
+        expected_AT1_vd_tension_ts_10_t_1.000000.vtu AT1_vd_tension_ts_10_t_1.000000.vtu displacement displacement 1e-5 0
+        expected_AT1_vd_tension_ts_10_t_1.000000.vtu AT1_vd_tension_ts_10_t_1.000000.vtu phasefield phasefield 1e-6 0
 )
 
 AddTest(

diff --git a/Tests/Data/PhaseField/beam/bar.vtu b/Tests/Data/PhaseField/beam/bar.vtu
diff --git a/Tests/Data/PhaseField/beam/bar_COHESIVE_linear.prj b/Tests/Data/PhaseField/beam/bar_COHESIVE_linear.prj
@@ -2,9 +2,9 @@
 <OpenGeoSysProject>
     <!-- element size == 0.01 -->
     <meshes>
-        <mesh>bar_cohesive_linear.vtu</mesh>
-        <mesh>bar_cohesive_linear_left.vtu</mesh>
-        <mesh>bar_cohesive_linear_right.vtu</mesh>
+        <mesh>bar.vtu</mesh>
+        <mesh>bar_left.vtu</mesh>
+        <mesh>bar_right.vtu</mesh>
     </meshes>
     <processes>
         <process>
@@ -113,7 +113,7 @@
                 <variable>epsilon</variable>
             </variables>
             <type>VTK</type>
-            <prefix>bar_COHESIVE_linear</prefix>
+            <prefix>bar_cohesive_linear</prefix>
             <timesteps>
                 <pair>
                     <repeat>1</repeat>
@@ -205,14 +205,14 @@
             <initial_condition>phasefield_ic</initial_condition>
             <boundary_conditions>
                 <boundary_condition>
-                    <geometrical_set>bar_cohesive_linear</geometrical_set>
+                    <geometrical_set>bar</geometrical_set>
                     <geometry>left</geometry>
                     <type>Dirichlet</type>
                     <component>0</component>
                     <parameter>phasefield_bc</parameter>
                 </boundary_condition>
                 <boundary_condition>
-                    <geometrical_set>bar_cohesive_linear</geometrical_set>
+                    <geometrical_set>bar</geometrical_set>
                     <geometry>right</geometry>
                     <type>Dirichlet</type>
                     <component>0</component>
@@ -227,14 +227,14 @@
             <initial_condition>displacement0</initial_condition>
             <boundary_conditions>
                 <boundary_condition>
-                    <geometrical_set>bar_cohesive_linear</geometrical_set>
+                    <geometrical_set>bar</geometrical_set>
                     <geometry>left</geometry>
                     <type>Dirichlet</type>
                     <component>0</component>
                     <parameter>dirichlet0</parameter>
                 </boundary_condition>
                 <boundary_condition>
-                    <geometrical_set>bar_cohesive_linear</geometrical_set>
+                    <geometrical_set>bar</geometrical_set>
                     <geometry>right</geometry>
                     <type>Dirichlet</type>
                     <component>0</component>

diff --git a/Tests/Data/PhaseField/beam/bar_cohesive_linear.vtu b/Tests/Data/PhaseField/beam/bar_cohesive_linear.vtu
diff --git a/Tests/Data/PhaseField/beam/bar_cohesive_linear_left.vtu b/Tests/Data/PhaseField/beam/bar_cohesive_linear_left.vtu
diff --git a/Tests/Data/PhaseField/beam/bar_cohesive_linear_right.vtu b/Tests/Data/PhaseField/beam/bar_cohesive_linear_right.vtu