From 4712e90306bfceab927c6d716290048c04e399c5 Mon Sep 17 00:00:00 2001
From: Dmitri Naumov <github@naumov.de>
Date: Mon, 1 Mar 2021 13:20:03 +0100
Subject: [PATCH] [T/RM] Move Liakopoulos diff config into project.

---
 ProcessLib/RichardsMechanics/Tests.cmake      | 22 +-------
 .../LiakopoulosHM/liakopoulos.prj             | 56 +++++++++++++++++++
 2 files changed, 57 insertions(+), 21 deletions(-)

diff --git a/ProcessLib/RichardsMechanics/Tests.cmake b/ProcessLib/RichardsMechanics/Tests.cmake
index e47f44b8684..62f212eb23a 100644
--- a/ProcessLib/RichardsMechanics/Tests.cmake
+++ b/ProcessLib/RichardsMechanics/Tests.cmake
@@ -19,6 +19,7 @@ if (NOT OGS_USE_MPI)
     OgsTest(PROJECTFILE RichardsMechanics/bishops_effective_stress_saturation_cutoff.prj)
     OgsTest(PROJECTFILE RichardsMechanics/alternative_mass_balance_anzInterval_10.prj)
     OgsTest(PROJECTFILE RichardsMechanics/rotated_consolidation.prj)
+    OgsTest(PROJECTFILE RichardsMechanics/LiakopoulosHM/liakopoulos.prj RUNTIME 17)
 endif()
 
 
@@ -60,24 +61,3 @@ if(TEST ogs-RichardsMechanics_square_1e2_confined_compression_restart-time)
     set_tests_properties(ogs-RichardsMechanics_square_1e2_confined_compression_restart-time PROPERTIES
         DEPENDS ogs-RichardsMechanics_square_1e2_confined_compression-time-vtkdiff)
 endif()
-
-AddTest(
-    NAME RichardsMechanics_liakopoulosHM
-    PATH RichardsMechanics/LiakopoulosHM
-    EXECUTABLE ogs
-    EXECUTABLE_ARGS liakopoulos.prj
-    WRAPPER time
-    TESTER vtkdiff
-    REQUIREMENTS NOT (OGS_USE_LIS OR OGS_USE_MPI)
-    RUNTIME 17
-    DIFF_DATA
-    liakopoulos_t_300.vtu liakopoulos_t_300.vtu sigma sigma 1e-9 1e-12
-    liakopoulos_t_300.vtu liakopoulos_t_300.vtu displacement displacement 1e-10 1e-12
-    liakopoulos_t_300.vtu liakopoulos_t_300.vtu saturation saturation 1e-10 1e-12
-    liakopoulos_t_600.vtu liakopoulos_t_600.vtu sigma sigma 1e-9 1e-12
-    liakopoulos_t_600.vtu liakopoulos_t_600.vtu displacement displacement 1e-10 1e-12
-    liakopoulos_t_600.vtu liakopoulos_t_600.vtu saturation saturation 1e-10 1e-12
-    liakopoulos_t_7200.vtu liakopoulos_t_7200.vtu sigma sigma 1e-9 1e-12
-    liakopoulos_t_7200.vtu liakopoulos_t_7200.vtu displacement displacement 1e-10 1e-12
-    liakopoulos_t_7200.vtu liakopoulos_t_7200.vtu saturation saturation 1e-10 1e-12
-)
diff --git a/Tests/Data/RichardsMechanics/LiakopoulosHM/liakopoulos.prj b/Tests/Data/RichardsMechanics/LiakopoulosHM/liakopoulos.prj
index 6edb69e0527..3ab898901f7 100644
--- a/Tests/Data/RichardsMechanics/LiakopoulosHM/liakopoulos.prj
+++ b/Tests/Data/RichardsMechanics/LiakopoulosHM/liakopoulos.prj
@@ -425,4 +425,60 @@
             </eigen>
         </linear_solver>
     </linear_solvers>
+    <test_definition>
+        <vtkdiff>
+            <regex>liakopoulos_t_.*.vtu</regex>
+            <field>HydraulicFlow</field>
+            <absolute_tolerance>2e-14</absolute_tolerance>
+            <relative_tolerance>0</relative_tolerance>
+        </vtkdiff>
+        <vtkdiff>
+            <regex>liakopoulos_t_.*.vtu</regex>
+            <field>NodalForces</field>
+            <absolute_tolerance>1e-11</absolute_tolerance>
+            <relative_tolerance>0</relative_tolerance>
+        </vtkdiff>
+        <vtkdiff>
+            <regex>liakopoulos_t_.*.vtu</regex>
+            <field>displacement</field>
+            <absolute_tolerance>1e-15</absolute_tolerance>
+            <relative_tolerance>0</relative_tolerance>
+        </vtkdiff>
+        <vtkdiff>
+            <regex>liakopoulos_t_.*.vtu</regex>
+            <field>epsilon</field>
+            <absolute_tolerance>1e-15</absolute_tolerance>
+            <relative_tolerance>0</relative_tolerance>
+        </vtkdiff>
+        <vtkdiff>
+            <regex>liakopoulos_t_.*.vtu</regex>
+            <field>pressure</field>
+            <absolute_tolerance>1e-10</absolute_tolerance>
+            <relative_tolerance>0</relative_tolerance>
+        </vtkdiff>
+        <vtkdiff>
+            <regex>liakopoulos_t_.*.vtu</regex>
+            <field>pressure_interpolated</field>
+            <absolute_tolerance>1e-10</absolute_tolerance>
+            <relative_tolerance>0</relative_tolerance>
+        </vtkdiff>
+        <vtkdiff>
+            <regex>liakopoulos_t_.*.vtu</regex>
+            <field>saturation</field>
+            <absolute_tolerance>1e-14</absolute_tolerance>
+            <relative_tolerance>0</relative_tolerance>
+        </vtkdiff>
+        <vtkdiff>
+            <regex>liakopoulos_t_.*.vtu</regex>
+            <field>sigma</field>
+            <absolute_tolerance>1e-9</absolute_tolerance>
+            <relative_tolerance>0</relative_tolerance>
+        </vtkdiff>
+        <vtkdiff>
+            <regex>liakopoulos_t_.*.vtu</regex>
+            <field>velocity</field>
+            <absolute_tolerance>1e-15</absolute_tolerance>
+            <relative_tolerance>0</relative_tolerance>
+        </vtkdiff>
+    </test_definition>
 </OpenGeoSysProject>
-- 
GitLab