From c2ee183163660e0e4945f6d0ba5b445efe7bf189 Mon Sep 17 00:00:00 2001
From: Christian Silbermann <christian.silbermann@ifgt.tu-freiberg.de>
Date: Fri, 5 Apr 2024 16:05:28 +0200
Subject: [PATCH] [T/THM] Folder for MultiMaterial tests re-structured

---
 ProcessLib/ThermoHydroMechanics/Tests.cmake               | 8 ++++----
 .../DP_Ehlers}/M/square_1e1_2_matIDs.prj                  | 0
 .../DP_Ehlers}/M/square_1e1_2_matIDs.pvd                  | 0
 .../DP_Ehlers}/M/square_1e1_2_matIDs_restart.pvd          | 0
 .../DP_Ehlers}/M/square_1e1_2_matIDs_restart.xml          | 0
 .../DP_Ehlers}/M/square_1e1_2_matIDs_restart_t_0.7000.vtu | 0
 .../DP_Ehlers}/M/square_1e1_2_matIDs_restart_t_0.8000.vtu | 0
 .../DP_Ehlers}/M/square_1e1_2_matIDs_restart_t_0.9000.vtu | 0
 .../DP_Ehlers}/M/square_1e1_2_matIDs_restart_t_1.0000.vtu | 0
 .../DP_Ehlers}/M/square_1e1_2_matIDs_t_0.0000.vtu         | 0
 .../DP_Ehlers}/M/square_1e1_2_matIDs_t_0.1000.vtu         | 0
 .../DP_Ehlers}/M/square_1e1_2_matIDs_t_0.2000.vtu         | 0
 .../DP_Ehlers}/M/square_1e1_2_matIDs_t_0.3000.vtu         | 0
 .../DP_Ehlers}/M/square_1e1_2_matIDs_t_0.4000.vtu         | 0
 .../DP_Ehlers}/M/square_1e1_2_matIDs_t_0.5000.vtu         | 0
 .../DP_Ehlers}/M/square_1e1_2_matIDs_t_0.5700.vtu         | 0
 .../DP_Ehlers}/M/square_1e1_2_matIDs_t_0.6000.vtu         | 0
 .../DP_Ehlers}/M/square_1e1_2_matIDs_t_0.7000.vtu         | 0
 .../DP_Ehlers}/M/square_1e1_2_matIDs_t_0.8000.vtu         | 0
 .../DP_Ehlers}/M/square_1e1_2_matIDs_t_0.9000.vtu         | 0
 .../DP_Ehlers}/M/square_1e1_2_matIDs_t_1.0000.vtu         | 0
 .../MultiMaterial/DP_Ehlers/M/square_1x1.gml              | 1 +
 .../DP_Ehlers/M/square_1x1_quad_1e1_2_matIDs.vtu          | 1 +
 .../DP_Ehlers}/TM/square_1e1_2_matIDs.prj                 | 0
 .../DP_Ehlers}/TM/square_1e1_2_matIDs.pvd                 | 0
 .../DP_Ehlers}/TM/square_1e1_2_matIDs_restart.pvd         | 0
 .../DP_Ehlers}/TM/square_1e1_2_matIDs_restart.xml         | 0
 .../TM/square_1e1_2_matIDs_restart_t_0.7000.vtu           | 0
 .../TM/square_1e1_2_matIDs_restart_t_0.8000.vtu           | 0
 .../TM/square_1e1_2_matIDs_restart_t_0.9000.vtu           | 0
 .../TM/square_1e1_2_matIDs_restart_t_1.0000.vtu           | 0
 .../DP_Ehlers}/TM/square_1e1_2_matIDs_t_0.0000.vtu        | 0
 .../DP_Ehlers}/TM/square_1e1_2_matIDs_t_0.1000.vtu        | 0
 .../DP_Ehlers}/TM/square_1e1_2_matIDs_t_0.2000.vtu        | 0
 .../DP_Ehlers}/TM/square_1e1_2_matIDs_t_0.3000.vtu        | 0
 .../DP_Ehlers}/TM/square_1e1_2_matIDs_t_0.4000.vtu        | 0
 .../DP_Ehlers}/TM/square_1e1_2_matIDs_t_0.5000.vtu        | 0
 .../DP_Ehlers}/TM/square_1e1_2_matIDs_t_0.6000.vtu        | 0
 .../DP_Ehlers}/TM/square_1e1_2_matIDs_t_0.7000.vtu        | 0
 .../DP_Ehlers}/TM/square_1e1_2_matIDs_t_0.8000.vtu        | 0
 .../DP_Ehlers}/TM/square_1e1_2_matIDs_t_0.9000.vtu        | 0
 .../DP_Ehlers}/TM/square_1e1_2_matIDs_t_1.0000.vtu        | 0
 .../MultiMaterial/DP_Ehlers/TM/square_1x1.gml             | 1 +
 .../DP_Ehlers/TM/square_1x1_quad_1e1_2_matIDs.vtu         | 1 +
 .../{MultiMaterialEhlers => MultiMaterial}/square_1x1.gml | 0
 .../square_1x1_quad_1e1_2_matIDs.vtu                      | 0
 .../MultiMaterialEhlers/M/square_1x1.gml                  | 1 -
 .../M/square_1x1_quad_1e1_2_matIDs.vtu                    | 1 -
 .../MultiMaterialEhlers/TM/square_1x1.gml                 | 1 -
 .../TM/square_1x1_quad_1e1_2_matIDs.vtu                   | 1 -
 50 files changed, 8 insertions(+), 8 deletions(-)
 rename Tests/Data/ThermoHydroMechanics/{MultiMaterialEhlers => MultiMaterial/DP_Ehlers}/M/square_1e1_2_matIDs.prj (100%)
 rename Tests/Data/ThermoHydroMechanics/{MultiMaterialEhlers => MultiMaterial/DP_Ehlers}/M/square_1e1_2_matIDs.pvd (100%)
 rename Tests/Data/ThermoHydroMechanics/{MultiMaterialEhlers => MultiMaterial/DP_Ehlers}/M/square_1e1_2_matIDs_restart.pvd (100%)
 rename Tests/Data/ThermoHydroMechanics/{MultiMaterialEhlers => MultiMaterial/DP_Ehlers}/M/square_1e1_2_matIDs_restart.xml (100%)
 rename Tests/Data/ThermoHydroMechanics/{MultiMaterialEhlers => MultiMaterial/DP_Ehlers}/M/square_1e1_2_matIDs_restart_t_0.7000.vtu (100%)
 rename Tests/Data/ThermoHydroMechanics/{MultiMaterialEhlers => MultiMaterial/DP_Ehlers}/M/square_1e1_2_matIDs_restart_t_0.8000.vtu (100%)
 rename Tests/Data/ThermoHydroMechanics/{MultiMaterialEhlers => MultiMaterial/DP_Ehlers}/M/square_1e1_2_matIDs_restart_t_0.9000.vtu (100%)
 rename Tests/Data/ThermoHydroMechanics/{MultiMaterialEhlers => MultiMaterial/DP_Ehlers}/M/square_1e1_2_matIDs_restart_t_1.0000.vtu (100%)
 rename Tests/Data/ThermoHydroMechanics/{MultiMaterialEhlers => MultiMaterial/DP_Ehlers}/M/square_1e1_2_matIDs_t_0.0000.vtu (100%)
 rename Tests/Data/ThermoHydroMechanics/{MultiMaterialEhlers => MultiMaterial/DP_Ehlers}/M/square_1e1_2_matIDs_t_0.1000.vtu (100%)
 rename Tests/Data/ThermoHydroMechanics/{MultiMaterialEhlers => MultiMaterial/DP_Ehlers}/M/square_1e1_2_matIDs_t_0.2000.vtu (100%)
 rename Tests/Data/ThermoHydroMechanics/{MultiMaterialEhlers => MultiMaterial/DP_Ehlers}/M/square_1e1_2_matIDs_t_0.3000.vtu (100%)
 rename Tests/Data/ThermoHydroMechanics/{MultiMaterialEhlers => MultiMaterial/DP_Ehlers}/M/square_1e1_2_matIDs_t_0.4000.vtu (100%)
 rename Tests/Data/ThermoHydroMechanics/{MultiMaterialEhlers => MultiMaterial/DP_Ehlers}/M/square_1e1_2_matIDs_t_0.5000.vtu (100%)
 rename Tests/Data/ThermoHydroMechanics/{MultiMaterialEhlers => MultiMaterial/DP_Ehlers}/M/square_1e1_2_matIDs_t_0.5700.vtu (100%)
 rename Tests/Data/ThermoHydroMechanics/{MultiMaterialEhlers => MultiMaterial/DP_Ehlers}/M/square_1e1_2_matIDs_t_0.6000.vtu (100%)
 rename Tests/Data/ThermoHydroMechanics/{MultiMaterialEhlers => MultiMaterial/DP_Ehlers}/M/square_1e1_2_matIDs_t_0.7000.vtu (100%)
 rename Tests/Data/ThermoHydroMechanics/{MultiMaterialEhlers => MultiMaterial/DP_Ehlers}/M/square_1e1_2_matIDs_t_0.8000.vtu (100%)
 rename Tests/Data/ThermoHydroMechanics/{MultiMaterialEhlers => MultiMaterial/DP_Ehlers}/M/square_1e1_2_matIDs_t_0.9000.vtu (100%)
 rename Tests/Data/ThermoHydroMechanics/{MultiMaterialEhlers => MultiMaterial/DP_Ehlers}/M/square_1e1_2_matIDs_t_1.0000.vtu (100%)
 create mode 120000 Tests/Data/ThermoHydroMechanics/MultiMaterial/DP_Ehlers/M/square_1x1.gml
 create mode 120000 Tests/Data/ThermoHydroMechanics/MultiMaterial/DP_Ehlers/M/square_1x1_quad_1e1_2_matIDs.vtu
 rename Tests/Data/ThermoHydroMechanics/{MultiMaterialEhlers => MultiMaterial/DP_Ehlers}/TM/square_1e1_2_matIDs.prj (100%)
 rename Tests/Data/ThermoHydroMechanics/{MultiMaterialEhlers => MultiMaterial/DP_Ehlers}/TM/square_1e1_2_matIDs.pvd (100%)
 rename Tests/Data/ThermoHydroMechanics/{MultiMaterialEhlers => MultiMaterial/DP_Ehlers}/TM/square_1e1_2_matIDs_restart.pvd (100%)
 rename Tests/Data/ThermoHydroMechanics/{MultiMaterialEhlers => MultiMaterial/DP_Ehlers}/TM/square_1e1_2_matIDs_restart.xml (100%)
 rename Tests/Data/ThermoHydroMechanics/{MultiMaterialEhlers => MultiMaterial/DP_Ehlers}/TM/square_1e1_2_matIDs_restart_t_0.7000.vtu (100%)
 rename Tests/Data/ThermoHydroMechanics/{MultiMaterialEhlers => MultiMaterial/DP_Ehlers}/TM/square_1e1_2_matIDs_restart_t_0.8000.vtu (100%)
 rename Tests/Data/ThermoHydroMechanics/{MultiMaterialEhlers => MultiMaterial/DP_Ehlers}/TM/square_1e1_2_matIDs_restart_t_0.9000.vtu (100%)
 rename Tests/Data/ThermoHydroMechanics/{MultiMaterialEhlers => MultiMaterial/DP_Ehlers}/TM/square_1e1_2_matIDs_restart_t_1.0000.vtu (100%)
 rename Tests/Data/ThermoHydroMechanics/{MultiMaterialEhlers => MultiMaterial/DP_Ehlers}/TM/square_1e1_2_matIDs_t_0.0000.vtu (100%)
 rename Tests/Data/ThermoHydroMechanics/{MultiMaterialEhlers => MultiMaterial/DP_Ehlers}/TM/square_1e1_2_matIDs_t_0.1000.vtu (100%)
 rename Tests/Data/ThermoHydroMechanics/{MultiMaterialEhlers => MultiMaterial/DP_Ehlers}/TM/square_1e1_2_matIDs_t_0.2000.vtu (100%)
 rename Tests/Data/ThermoHydroMechanics/{MultiMaterialEhlers => MultiMaterial/DP_Ehlers}/TM/square_1e1_2_matIDs_t_0.3000.vtu (100%)
 rename Tests/Data/ThermoHydroMechanics/{MultiMaterialEhlers => MultiMaterial/DP_Ehlers}/TM/square_1e1_2_matIDs_t_0.4000.vtu (100%)
 rename Tests/Data/ThermoHydroMechanics/{MultiMaterialEhlers => MultiMaterial/DP_Ehlers}/TM/square_1e1_2_matIDs_t_0.5000.vtu (100%)
 rename Tests/Data/ThermoHydroMechanics/{MultiMaterialEhlers => MultiMaterial/DP_Ehlers}/TM/square_1e1_2_matIDs_t_0.6000.vtu (100%)
 rename Tests/Data/ThermoHydroMechanics/{MultiMaterialEhlers => MultiMaterial/DP_Ehlers}/TM/square_1e1_2_matIDs_t_0.7000.vtu (100%)
 rename Tests/Data/ThermoHydroMechanics/{MultiMaterialEhlers => MultiMaterial/DP_Ehlers}/TM/square_1e1_2_matIDs_t_0.8000.vtu (100%)
 rename Tests/Data/ThermoHydroMechanics/{MultiMaterialEhlers => MultiMaterial/DP_Ehlers}/TM/square_1e1_2_matIDs_t_0.9000.vtu (100%)
 rename Tests/Data/ThermoHydroMechanics/{MultiMaterialEhlers => MultiMaterial/DP_Ehlers}/TM/square_1e1_2_matIDs_t_1.0000.vtu (100%)
 create mode 120000 Tests/Data/ThermoHydroMechanics/MultiMaterial/DP_Ehlers/TM/square_1x1.gml
 create mode 120000 Tests/Data/ThermoHydroMechanics/MultiMaterial/DP_Ehlers/TM/square_1x1_quad_1e1_2_matIDs.vtu
 rename Tests/Data/ThermoHydroMechanics/{MultiMaterialEhlers => MultiMaterial}/square_1x1.gml (100%)
 rename Tests/Data/ThermoHydroMechanics/{MultiMaterialEhlers => MultiMaterial}/square_1x1_quad_1e1_2_matIDs.vtu (100%)
 delete mode 120000 Tests/Data/ThermoHydroMechanics/MultiMaterialEhlers/M/square_1x1.gml
 delete mode 120000 Tests/Data/ThermoHydroMechanics/MultiMaterialEhlers/M/square_1x1_quad_1e1_2_matIDs.vtu
 delete mode 120000 Tests/Data/ThermoHydroMechanics/MultiMaterialEhlers/TM/square_1x1.gml
 delete mode 120000 Tests/Data/ThermoHydroMechanics/MultiMaterialEhlers/TM/square_1x1_quad_1e1_2_matIDs.vtu

diff --git a/ProcessLib/ThermoHydroMechanics/Tests.cmake b/ProcessLib/ThermoHydroMechanics/Tests.cmake
index cdbec5ae5d3..feec2efc880 100644
--- a/ProcessLib/ThermoHydroMechanics/Tests.cmake
+++ b/ProcessLib/ThermoHydroMechanics/Tests.cmake
@@ -10,10 +10,10 @@ if (NOT OGS_USE_MPI)
     OgsTest(PROJECTFILE ThermoHydroMechanics/Linear/HeatTransportInStationaryFlow/WithFreezingPhase.prj RUNTIME 1)
 
     if (OGS_USE_MFRONT)
-        OgsTest(PROJECTFILE ThermoHydroMechanics/MultiMaterialEhlers/M/square_1e1_2_matIDs.prj RUNTIME 1)
-        OgsTest(PROJECTFILE ThermoHydroMechanics/MultiMaterialEhlers/M/square_1e1_2_matIDs_restart.xml RUNTIME 1)
-        OgsTest(PROJECTFILE ThermoHydroMechanics/MultiMaterialEhlers/TM/square_1e1_2_matIDs.prj RUNTIME 1)
-        OgsTest(PROJECTFILE ThermoHydroMechanics/MultiMaterialEhlers/TM/square_1e1_2_matIDs_restart.xml RUNTIME 1)
+        OgsTest(PROJECTFILE ThermoHydroMechanics/MultiMaterial/DP_Ehlers/M/square_1e1_2_matIDs.prj RUNTIME 1)
+        OgsTest(PROJECTFILE ThermoHydroMechanics/MultiMaterial/DP_Ehlers/M/square_1e1_2_matIDs_restart.xml RUNTIME 1)
+        OgsTest(PROJECTFILE ThermoHydroMechanics/MultiMaterial/DP_Ehlers/TM/square_1e1_2_matIDs.prj RUNTIME 1)
+        OgsTest(PROJECTFILE ThermoHydroMechanics/MultiMaterial/DP_Ehlers/TM/square_1e1_2_matIDs_restart.xml RUNTIME 1)
         OgsTest(PROJECTFILE ThermoHydroMechanics/RestartMCC/mfront_restart_part1.prj RUNTIME 1)
         OgsTest(PROJECTFILE ThermoHydroMechanics/RestartMCC/mfront_restart_part2.xml RUNTIME 1)
     endif()
diff --git a/Tests/Data/ThermoHydroMechanics/MultiMaterialEhlers/M/square_1e1_2_matIDs.prj b/Tests/Data/ThermoHydroMechanics/MultiMaterial/DP_Ehlers/M/square_1e1_2_matIDs.prj
similarity index 100%
rename from Tests/Data/ThermoHydroMechanics/MultiMaterialEhlers/M/square_1e1_2_matIDs.prj
rename to Tests/Data/ThermoHydroMechanics/MultiMaterial/DP_Ehlers/M/square_1e1_2_matIDs.prj
diff --git a/Tests/Data/ThermoHydroMechanics/MultiMaterialEhlers/M/square_1e1_2_matIDs.pvd b/Tests/Data/ThermoHydroMechanics/MultiMaterial/DP_Ehlers/M/square_1e1_2_matIDs.pvd
similarity index 100%
rename from Tests/Data/ThermoHydroMechanics/MultiMaterialEhlers/M/square_1e1_2_matIDs.pvd
rename to Tests/Data/ThermoHydroMechanics/MultiMaterial/DP_Ehlers/M/square_1e1_2_matIDs.pvd
diff --git a/Tests/Data/ThermoHydroMechanics/MultiMaterialEhlers/M/square_1e1_2_matIDs_restart.pvd b/Tests/Data/ThermoHydroMechanics/MultiMaterial/DP_Ehlers/M/square_1e1_2_matIDs_restart.pvd
similarity index 100%
rename from Tests/Data/ThermoHydroMechanics/MultiMaterialEhlers/M/square_1e1_2_matIDs_restart.pvd
rename to Tests/Data/ThermoHydroMechanics/MultiMaterial/DP_Ehlers/M/square_1e1_2_matIDs_restart.pvd
diff --git a/Tests/Data/ThermoHydroMechanics/MultiMaterialEhlers/M/square_1e1_2_matIDs_restart.xml b/Tests/Data/ThermoHydroMechanics/MultiMaterial/DP_Ehlers/M/square_1e1_2_matIDs_restart.xml
similarity index 100%
rename from Tests/Data/ThermoHydroMechanics/MultiMaterialEhlers/M/square_1e1_2_matIDs_restart.xml
rename to Tests/Data/ThermoHydroMechanics/MultiMaterial/DP_Ehlers/M/square_1e1_2_matIDs_restart.xml
diff --git a/Tests/Data/ThermoHydroMechanics/MultiMaterialEhlers/M/square_1e1_2_matIDs_restart_t_0.7000.vtu b/Tests/Data/ThermoHydroMechanics/MultiMaterial/DP_Ehlers/M/square_1e1_2_matIDs_restart_t_0.7000.vtu
similarity index 100%
rename from Tests/Data/ThermoHydroMechanics/MultiMaterialEhlers/M/square_1e1_2_matIDs_restart_t_0.7000.vtu
rename to Tests/Data/ThermoHydroMechanics/MultiMaterial/DP_Ehlers/M/square_1e1_2_matIDs_restart_t_0.7000.vtu
diff --git a/Tests/Data/ThermoHydroMechanics/MultiMaterialEhlers/M/square_1e1_2_matIDs_restart_t_0.8000.vtu b/Tests/Data/ThermoHydroMechanics/MultiMaterial/DP_Ehlers/M/square_1e1_2_matIDs_restart_t_0.8000.vtu
similarity index 100%
rename from Tests/Data/ThermoHydroMechanics/MultiMaterialEhlers/M/square_1e1_2_matIDs_restart_t_0.8000.vtu
rename to Tests/Data/ThermoHydroMechanics/MultiMaterial/DP_Ehlers/M/square_1e1_2_matIDs_restart_t_0.8000.vtu
diff --git a/Tests/Data/ThermoHydroMechanics/MultiMaterialEhlers/M/square_1e1_2_matIDs_restart_t_0.9000.vtu b/Tests/Data/ThermoHydroMechanics/MultiMaterial/DP_Ehlers/M/square_1e1_2_matIDs_restart_t_0.9000.vtu
similarity index 100%
rename from Tests/Data/ThermoHydroMechanics/MultiMaterialEhlers/M/square_1e1_2_matIDs_restart_t_0.9000.vtu
rename to Tests/Data/ThermoHydroMechanics/MultiMaterial/DP_Ehlers/M/square_1e1_2_matIDs_restart_t_0.9000.vtu
diff --git a/Tests/Data/ThermoHydroMechanics/MultiMaterialEhlers/M/square_1e1_2_matIDs_restart_t_1.0000.vtu b/Tests/Data/ThermoHydroMechanics/MultiMaterial/DP_Ehlers/M/square_1e1_2_matIDs_restart_t_1.0000.vtu
similarity index 100%
rename from Tests/Data/ThermoHydroMechanics/MultiMaterialEhlers/M/square_1e1_2_matIDs_restart_t_1.0000.vtu
rename to Tests/Data/ThermoHydroMechanics/MultiMaterial/DP_Ehlers/M/square_1e1_2_matIDs_restart_t_1.0000.vtu
diff --git a/Tests/Data/ThermoHydroMechanics/MultiMaterialEhlers/M/square_1e1_2_matIDs_t_0.0000.vtu b/Tests/Data/ThermoHydroMechanics/MultiMaterial/DP_Ehlers/M/square_1e1_2_matIDs_t_0.0000.vtu
similarity index 100%
rename from Tests/Data/ThermoHydroMechanics/MultiMaterialEhlers/M/square_1e1_2_matIDs_t_0.0000.vtu
rename to Tests/Data/ThermoHydroMechanics/MultiMaterial/DP_Ehlers/M/square_1e1_2_matIDs_t_0.0000.vtu
diff --git a/Tests/Data/ThermoHydroMechanics/MultiMaterialEhlers/M/square_1e1_2_matIDs_t_0.1000.vtu b/Tests/Data/ThermoHydroMechanics/MultiMaterial/DP_Ehlers/M/square_1e1_2_matIDs_t_0.1000.vtu
similarity index 100%
rename from Tests/Data/ThermoHydroMechanics/MultiMaterialEhlers/M/square_1e1_2_matIDs_t_0.1000.vtu
rename to Tests/Data/ThermoHydroMechanics/MultiMaterial/DP_Ehlers/M/square_1e1_2_matIDs_t_0.1000.vtu
diff --git a/Tests/Data/ThermoHydroMechanics/MultiMaterialEhlers/M/square_1e1_2_matIDs_t_0.2000.vtu b/Tests/Data/ThermoHydroMechanics/MultiMaterial/DP_Ehlers/M/square_1e1_2_matIDs_t_0.2000.vtu
similarity index 100%
rename from Tests/Data/ThermoHydroMechanics/MultiMaterialEhlers/M/square_1e1_2_matIDs_t_0.2000.vtu
rename to Tests/Data/ThermoHydroMechanics/MultiMaterial/DP_Ehlers/M/square_1e1_2_matIDs_t_0.2000.vtu
diff --git a/Tests/Data/ThermoHydroMechanics/MultiMaterialEhlers/M/square_1e1_2_matIDs_t_0.3000.vtu b/Tests/Data/ThermoHydroMechanics/MultiMaterial/DP_Ehlers/M/square_1e1_2_matIDs_t_0.3000.vtu
similarity index 100%
rename from Tests/Data/ThermoHydroMechanics/MultiMaterialEhlers/M/square_1e1_2_matIDs_t_0.3000.vtu
rename to Tests/Data/ThermoHydroMechanics/MultiMaterial/DP_Ehlers/M/square_1e1_2_matIDs_t_0.3000.vtu
diff --git a/Tests/Data/ThermoHydroMechanics/MultiMaterialEhlers/M/square_1e1_2_matIDs_t_0.4000.vtu b/Tests/Data/ThermoHydroMechanics/MultiMaterial/DP_Ehlers/M/square_1e1_2_matIDs_t_0.4000.vtu
similarity index 100%
rename from Tests/Data/ThermoHydroMechanics/MultiMaterialEhlers/M/square_1e1_2_matIDs_t_0.4000.vtu
rename to Tests/Data/ThermoHydroMechanics/MultiMaterial/DP_Ehlers/M/square_1e1_2_matIDs_t_0.4000.vtu
diff --git a/Tests/Data/ThermoHydroMechanics/MultiMaterialEhlers/M/square_1e1_2_matIDs_t_0.5000.vtu b/Tests/Data/ThermoHydroMechanics/MultiMaterial/DP_Ehlers/M/square_1e1_2_matIDs_t_0.5000.vtu
similarity index 100%
rename from Tests/Data/ThermoHydroMechanics/MultiMaterialEhlers/M/square_1e1_2_matIDs_t_0.5000.vtu
rename to Tests/Data/ThermoHydroMechanics/MultiMaterial/DP_Ehlers/M/square_1e1_2_matIDs_t_0.5000.vtu
diff --git a/Tests/Data/ThermoHydroMechanics/MultiMaterialEhlers/M/square_1e1_2_matIDs_t_0.5700.vtu b/Tests/Data/ThermoHydroMechanics/MultiMaterial/DP_Ehlers/M/square_1e1_2_matIDs_t_0.5700.vtu
similarity index 100%
rename from Tests/Data/ThermoHydroMechanics/MultiMaterialEhlers/M/square_1e1_2_matIDs_t_0.5700.vtu
rename to Tests/Data/ThermoHydroMechanics/MultiMaterial/DP_Ehlers/M/square_1e1_2_matIDs_t_0.5700.vtu
diff --git a/Tests/Data/ThermoHydroMechanics/MultiMaterialEhlers/M/square_1e1_2_matIDs_t_0.6000.vtu b/Tests/Data/ThermoHydroMechanics/MultiMaterial/DP_Ehlers/M/square_1e1_2_matIDs_t_0.6000.vtu
similarity index 100%
rename from Tests/Data/ThermoHydroMechanics/MultiMaterialEhlers/M/square_1e1_2_matIDs_t_0.6000.vtu
rename to Tests/Data/ThermoHydroMechanics/MultiMaterial/DP_Ehlers/M/square_1e1_2_matIDs_t_0.6000.vtu
diff --git a/Tests/Data/ThermoHydroMechanics/MultiMaterialEhlers/M/square_1e1_2_matIDs_t_0.7000.vtu b/Tests/Data/ThermoHydroMechanics/MultiMaterial/DP_Ehlers/M/square_1e1_2_matIDs_t_0.7000.vtu
similarity index 100%
rename from Tests/Data/ThermoHydroMechanics/MultiMaterialEhlers/M/square_1e1_2_matIDs_t_0.7000.vtu
rename to Tests/Data/ThermoHydroMechanics/MultiMaterial/DP_Ehlers/M/square_1e1_2_matIDs_t_0.7000.vtu
diff --git a/Tests/Data/ThermoHydroMechanics/MultiMaterialEhlers/M/square_1e1_2_matIDs_t_0.8000.vtu b/Tests/Data/ThermoHydroMechanics/MultiMaterial/DP_Ehlers/M/square_1e1_2_matIDs_t_0.8000.vtu
similarity index 100%
rename from Tests/Data/ThermoHydroMechanics/MultiMaterialEhlers/M/square_1e1_2_matIDs_t_0.8000.vtu
rename to Tests/Data/ThermoHydroMechanics/MultiMaterial/DP_Ehlers/M/square_1e1_2_matIDs_t_0.8000.vtu
diff --git a/Tests/Data/ThermoHydroMechanics/MultiMaterialEhlers/M/square_1e1_2_matIDs_t_0.9000.vtu b/Tests/Data/ThermoHydroMechanics/MultiMaterial/DP_Ehlers/M/square_1e1_2_matIDs_t_0.9000.vtu
similarity index 100%
rename from Tests/Data/ThermoHydroMechanics/MultiMaterialEhlers/M/square_1e1_2_matIDs_t_0.9000.vtu
rename to Tests/Data/ThermoHydroMechanics/MultiMaterial/DP_Ehlers/M/square_1e1_2_matIDs_t_0.9000.vtu
diff --git a/Tests/Data/ThermoHydroMechanics/MultiMaterialEhlers/M/square_1e1_2_matIDs_t_1.0000.vtu b/Tests/Data/ThermoHydroMechanics/MultiMaterial/DP_Ehlers/M/square_1e1_2_matIDs_t_1.0000.vtu
similarity index 100%
rename from Tests/Data/ThermoHydroMechanics/MultiMaterialEhlers/M/square_1e1_2_matIDs_t_1.0000.vtu
rename to Tests/Data/ThermoHydroMechanics/MultiMaterial/DP_Ehlers/M/square_1e1_2_matIDs_t_1.0000.vtu
diff --git a/Tests/Data/ThermoHydroMechanics/MultiMaterial/DP_Ehlers/M/square_1x1.gml b/Tests/Data/ThermoHydroMechanics/MultiMaterial/DP_Ehlers/M/square_1x1.gml
new file mode 120000
index 00000000000..ab2929ddc5d
--- /dev/null
+++ b/Tests/Data/ThermoHydroMechanics/MultiMaterial/DP_Ehlers/M/square_1x1.gml
@@ -0,0 +1 @@
+../../square_1x1.gml
\ No newline at end of file
diff --git a/Tests/Data/ThermoHydroMechanics/MultiMaterial/DP_Ehlers/M/square_1x1_quad_1e1_2_matIDs.vtu b/Tests/Data/ThermoHydroMechanics/MultiMaterial/DP_Ehlers/M/square_1x1_quad_1e1_2_matIDs.vtu
new file mode 120000
index 00000000000..e378dd8b0c7
--- /dev/null
+++ b/Tests/Data/ThermoHydroMechanics/MultiMaterial/DP_Ehlers/M/square_1x1_quad_1e1_2_matIDs.vtu
@@ -0,0 +1 @@
+../../square_1x1_quad_1e1_2_matIDs.vtu
\ No newline at end of file
diff --git a/Tests/Data/ThermoHydroMechanics/MultiMaterialEhlers/TM/square_1e1_2_matIDs.prj b/Tests/Data/ThermoHydroMechanics/MultiMaterial/DP_Ehlers/TM/square_1e1_2_matIDs.prj
similarity index 100%
rename from Tests/Data/ThermoHydroMechanics/MultiMaterialEhlers/TM/square_1e1_2_matIDs.prj
rename to Tests/Data/ThermoHydroMechanics/MultiMaterial/DP_Ehlers/TM/square_1e1_2_matIDs.prj
diff --git a/Tests/Data/ThermoHydroMechanics/MultiMaterialEhlers/TM/square_1e1_2_matIDs.pvd b/Tests/Data/ThermoHydroMechanics/MultiMaterial/DP_Ehlers/TM/square_1e1_2_matIDs.pvd
similarity index 100%
rename from Tests/Data/ThermoHydroMechanics/MultiMaterialEhlers/TM/square_1e1_2_matIDs.pvd
rename to Tests/Data/ThermoHydroMechanics/MultiMaterial/DP_Ehlers/TM/square_1e1_2_matIDs.pvd
diff --git a/Tests/Data/ThermoHydroMechanics/MultiMaterialEhlers/TM/square_1e1_2_matIDs_restart.pvd b/Tests/Data/ThermoHydroMechanics/MultiMaterial/DP_Ehlers/TM/square_1e1_2_matIDs_restart.pvd
similarity index 100%
rename from Tests/Data/ThermoHydroMechanics/MultiMaterialEhlers/TM/square_1e1_2_matIDs_restart.pvd
rename to Tests/Data/ThermoHydroMechanics/MultiMaterial/DP_Ehlers/TM/square_1e1_2_matIDs_restart.pvd
diff --git a/Tests/Data/ThermoHydroMechanics/MultiMaterialEhlers/TM/square_1e1_2_matIDs_restart.xml b/Tests/Data/ThermoHydroMechanics/MultiMaterial/DP_Ehlers/TM/square_1e1_2_matIDs_restart.xml
similarity index 100%
rename from Tests/Data/ThermoHydroMechanics/MultiMaterialEhlers/TM/square_1e1_2_matIDs_restart.xml
rename to Tests/Data/ThermoHydroMechanics/MultiMaterial/DP_Ehlers/TM/square_1e1_2_matIDs_restart.xml
diff --git a/Tests/Data/ThermoHydroMechanics/MultiMaterialEhlers/TM/square_1e1_2_matIDs_restart_t_0.7000.vtu b/Tests/Data/ThermoHydroMechanics/MultiMaterial/DP_Ehlers/TM/square_1e1_2_matIDs_restart_t_0.7000.vtu
similarity index 100%
rename from Tests/Data/ThermoHydroMechanics/MultiMaterialEhlers/TM/square_1e1_2_matIDs_restart_t_0.7000.vtu
rename to Tests/Data/ThermoHydroMechanics/MultiMaterial/DP_Ehlers/TM/square_1e1_2_matIDs_restart_t_0.7000.vtu
diff --git a/Tests/Data/ThermoHydroMechanics/MultiMaterialEhlers/TM/square_1e1_2_matIDs_restart_t_0.8000.vtu b/Tests/Data/ThermoHydroMechanics/MultiMaterial/DP_Ehlers/TM/square_1e1_2_matIDs_restart_t_0.8000.vtu
similarity index 100%
rename from Tests/Data/ThermoHydroMechanics/MultiMaterialEhlers/TM/square_1e1_2_matIDs_restart_t_0.8000.vtu
rename to Tests/Data/ThermoHydroMechanics/MultiMaterial/DP_Ehlers/TM/square_1e1_2_matIDs_restart_t_0.8000.vtu
diff --git a/Tests/Data/ThermoHydroMechanics/MultiMaterialEhlers/TM/square_1e1_2_matIDs_restart_t_0.9000.vtu b/Tests/Data/ThermoHydroMechanics/MultiMaterial/DP_Ehlers/TM/square_1e1_2_matIDs_restart_t_0.9000.vtu
similarity index 100%
rename from Tests/Data/ThermoHydroMechanics/MultiMaterialEhlers/TM/square_1e1_2_matIDs_restart_t_0.9000.vtu
rename to Tests/Data/ThermoHydroMechanics/MultiMaterial/DP_Ehlers/TM/square_1e1_2_matIDs_restart_t_0.9000.vtu
diff --git a/Tests/Data/ThermoHydroMechanics/MultiMaterialEhlers/TM/square_1e1_2_matIDs_restart_t_1.0000.vtu b/Tests/Data/ThermoHydroMechanics/MultiMaterial/DP_Ehlers/TM/square_1e1_2_matIDs_restart_t_1.0000.vtu
similarity index 100%
rename from Tests/Data/ThermoHydroMechanics/MultiMaterialEhlers/TM/square_1e1_2_matIDs_restart_t_1.0000.vtu
rename to Tests/Data/ThermoHydroMechanics/MultiMaterial/DP_Ehlers/TM/square_1e1_2_matIDs_restart_t_1.0000.vtu
diff --git a/Tests/Data/ThermoHydroMechanics/MultiMaterialEhlers/TM/square_1e1_2_matIDs_t_0.0000.vtu b/Tests/Data/ThermoHydroMechanics/MultiMaterial/DP_Ehlers/TM/square_1e1_2_matIDs_t_0.0000.vtu
similarity index 100%
rename from Tests/Data/ThermoHydroMechanics/MultiMaterialEhlers/TM/square_1e1_2_matIDs_t_0.0000.vtu
rename to Tests/Data/ThermoHydroMechanics/MultiMaterial/DP_Ehlers/TM/square_1e1_2_matIDs_t_0.0000.vtu
diff --git a/Tests/Data/ThermoHydroMechanics/MultiMaterialEhlers/TM/square_1e1_2_matIDs_t_0.1000.vtu b/Tests/Data/ThermoHydroMechanics/MultiMaterial/DP_Ehlers/TM/square_1e1_2_matIDs_t_0.1000.vtu
similarity index 100%
rename from Tests/Data/ThermoHydroMechanics/MultiMaterialEhlers/TM/square_1e1_2_matIDs_t_0.1000.vtu
rename to Tests/Data/ThermoHydroMechanics/MultiMaterial/DP_Ehlers/TM/square_1e1_2_matIDs_t_0.1000.vtu
diff --git a/Tests/Data/ThermoHydroMechanics/MultiMaterialEhlers/TM/square_1e1_2_matIDs_t_0.2000.vtu b/Tests/Data/ThermoHydroMechanics/MultiMaterial/DP_Ehlers/TM/square_1e1_2_matIDs_t_0.2000.vtu
similarity index 100%
rename from Tests/Data/ThermoHydroMechanics/MultiMaterialEhlers/TM/square_1e1_2_matIDs_t_0.2000.vtu
rename to Tests/Data/ThermoHydroMechanics/MultiMaterial/DP_Ehlers/TM/square_1e1_2_matIDs_t_0.2000.vtu
diff --git a/Tests/Data/ThermoHydroMechanics/MultiMaterialEhlers/TM/square_1e1_2_matIDs_t_0.3000.vtu b/Tests/Data/ThermoHydroMechanics/MultiMaterial/DP_Ehlers/TM/square_1e1_2_matIDs_t_0.3000.vtu
similarity index 100%
rename from Tests/Data/ThermoHydroMechanics/MultiMaterialEhlers/TM/square_1e1_2_matIDs_t_0.3000.vtu
rename to Tests/Data/ThermoHydroMechanics/MultiMaterial/DP_Ehlers/TM/square_1e1_2_matIDs_t_0.3000.vtu
diff --git a/Tests/Data/ThermoHydroMechanics/MultiMaterialEhlers/TM/square_1e1_2_matIDs_t_0.4000.vtu b/Tests/Data/ThermoHydroMechanics/MultiMaterial/DP_Ehlers/TM/square_1e1_2_matIDs_t_0.4000.vtu
similarity index 100%
rename from Tests/Data/ThermoHydroMechanics/MultiMaterialEhlers/TM/square_1e1_2_matIDs_t_0.4000.vtu
rename to Tests/Data/ThermoHydroMechanics/MultiMaterial/DP_Ehlers/TM/square_1e1_2_matIDs_t_0.4000.vtu
diff --git a/Tests/Data/ThermoHydroMechanics/MultiMaterialEhlers/TM/square_1e1_2_matIDs_t_0.5000.vtu b/Tests/Data/ThermoHydroMechanics/MultiMaterial/DP_Ehlers/TM/square_1e1_2_matIDs_t_0.5000.vtu
similarity index 100%
rename from Tests/Data/ThermoHydroMechanics/MultiMaterialEhlers/TM/square_1e1_2_matIDs_t_0.5000.vtu
rename to Tests/Data/ThermoHydroMechanics/MultiMaterial/DP_Ehlers/TM/square_1e1_2_matIDs_t_0.5000.vtu
diff --git a/Tests/Data/ThermoHydroMechanics/MultiMaterialEhlers/TM/square_1e1_2_matIDs_t_0.6000.vtu b/Tests/Data/ThermoHydroMechanics/MultiMaterial/DP_Ehlers/TM/square_1e1_2_matIDs_t_0.6000.vtu
similarity index 100%
rename from Tests/Data/ThermoHydroMechanics/MultiMaterialEhlers/TM/square_1e1_2_matIDs_t_0.6000.vtu
rename to Tests/Data/ThermoHydroMechanics/MultiMaterial/DP_Ehlers/TM/square_1e1_2_matIDs_t_0.6000.vtu
diff --git a/Tests/Data/ThermoHydroMechanics/MultiMaterialEhlers/TM/square_1e1_2_matIDs_t_0.7000.vtu b/Tests/Data/ThermoHydroMechanics/MultiMaterial/DP_Ehlers/TM/square_1e1_2_matIDs_t_0.7000.vtu
similarity index 100%
rename from Tests/Data/ThermoHydroMechanics/MultiMaterialEhlers/TM/square_1e1_2_matIDs_t_0.7000.vtu
rename to Tests/Data/ThermoHydroMechanics/MultiMaterial/DP_Ehlers/TM/square_1e1_2_matIDs_t_0.7000.vtu
diff --git a/Tests/Data/ThermoHydroMechanics/MultiMaterialEhlers/TM/square_1e1_2_matIDs_t_0.8000.vtu b/Tests/Data/ThermoHydroMechanics/MultiMaterial/DP_Ehlers/TM/square_1e1_2_matIDs_t_0.8000.vtu
similarity index 100%
rename from Tests/Data/ThermoHydroMechanics/MultiMaterialEhlers/TM/square_1e1_2_matIDs_t_0.8000.vtu
rename to Tests/Data/ThermoHydroMechanics/MultiMaterial/DP_Ehlers/TM/square_1e1_2_matIDs_t_0.8000.vtu
diff --git a/Tests/Data/ThermoHydroMechanics/MultiMaterialEhlers/TM/square_1e1_2_matIDs_t_0.9000.vtu b/Tests/Data/ThermoHydroMechanics/MultiMaterial/DP_Ehlers/TM/square_1e1_2_matIDs_t_0.9000.vtu
similarity index 100%
rename from Tests/Data/ThermoHydroMechanics/MultiMaterialEhlers/TM/square_1e1_2_matIDs_t_0.9000.vtu
rename to Tests/Data/ThermoHydroMechanics/MultiMaterial/DP_Ehlers/TM/square_1e1_2_matIDs_t_0.9000.vtu
diff --git a/Tests/Data/ThermoHydroMechanics/MultiMaterialEhlers/TM/square_1e1_2_matIDs_t_1.0000.vtu b/Tests/Data/ThermoHydroMechanics/MultiMaterial/DP_Ehlers/TM/square_1e1_2_matIDs_t_1.0000.vtu
similarity index 100%
rename from Tests/Data/ThermoHydroMechanics/MultiMaterialEhlers/TM/square_1e1_2_matIDs_t_1.0000.vtu
rename to Tests/Data/ThermoHydroMechanics/MultiMaterial/DP_Ehlers/TM/square_1e1_2_matIDs_t_1.0000.vtu
diff --git a/Tests/Data/ThermoHydroMechanics/MultiMaterial/DP_Ehlers/TM/square_1x1.gml b/Tests/Data/ThermoHydroMechanics/MultiMaterial/DP_Ehlers/TM/square_1x1.gml
new file mode 120000
index 00000000000..ab2929ddc5d
--- /dev/null
+++ b/Tests/Data/ThermoHydroMechanics/MultiMaterial/DP_Ehlers/TM/square_1x1.gml
@@ -0,0 +1 @@
+../../square_1x1.gml
\ No newline at end of file
diff --git a/Tests/Data/ThermoHydroMechanics/MultiMaterial/DP_Ehlers/TM/square_1x1_quad_1e1_2_matIDs.vtu b/Tests/Data/ThermoHydroMechanics/MultiMaterial/DP_Ehlers/TM/square_1x1_quad_1e1_2_matIDs.vtu
new file mode 120000
index 00000000000..e378dd8b0c7
--- /dev/null
+++ b/Tests/Data/ThermoHydroMechanics/MultiMaterial/DP_Ehlers/TM/square_1x1_quad_1e1_2_matIDs.vtu
@@ -0,0 +1 @@
+../../square_1x1_quad_1e1_2_matIDs.vtu
\ No newline at end of file
diff --git a/Tests/Data/ThermoHydroMechanics/MultiMaterialEhlers/square_1x1.gml b/Tests/Data/ThermoHydroMechanics/MultiMaterial/square_1x1.gml
similarity index 100%
rename from Tests/Data/ThermoHydroMechanics/MultiMaterialEhlers/square_1x1.gml
rename to Tests/Data/ThermoHydroMechanics/MultiMaterial/square_1x1.gml
diff --git a/Tests/Data/ThermoHydroMechanics/MultiMaterialEhlers/square_1x1_quad_1e1_2_matIDs.vtu b/Tests/Data/ThermoHydroMechanics/MultiMaterial/square_1x1_quad_1e1_2_matIDs.vtu
similarity index 100%
rename from Tests/Data/ThermoHydroMechanics/MultiMaterialEhlers/square_1x1_quad_1e1_2_matIDs.vtu
rename to Tests/Data/ThermoHydroMechanics/MultiMaterial/square_1x1_quad_1e1_2_matIDs.vtu
diff --git a/Tests/Data/ThermoHydroMechanics/MultiMaterialEhlers/M/square_1x1.gml b/Tests/Data/ThermoHydroMechanics/MultiMaterialEhlers/M/square_1x1.gml
deleted file mode 120000
index bed822be912..00000000000
--- a/Tests/Data/ThermoHydroMechanics/MultiMaterialEhlers/M/square_1x1.gml
+++ /dev/null
@@ -1 +0,0 @@
-../square_1x1.gml
\ No newline at end of file
diff --git a/Tests/Data/ThermoHydroMechanics/MultiMaterialEhlers/M/square_1x1_quad_1e1_2_matIDs.vtu b/Tests/Data/ThermoHydroMechanics/MultiMaterialEhlers/M/square_1x1_quad_1e1_2_matIDs.vtu
deleted file mode 120000
index d8472c4198e..00000000000
--- a/Tests/Data/ThermoHydroMechanics/MultiMaterialEhlers/M/square_1x1_quad_1e1_2_matIDs.vtu
+++ /dev/null
@@ -1 +0,0 @@
-../square_1x1_quad_1e1_2_matIDs.vtu
\ No newline at end of file
diff --git a/Tests/Data/ThermoHydroMechanics/MultiMaterialEhlers/TM/square_1x1.gml b/Tests/Data/ThermoHydroMechanics/MultiMaterialEhlers/TM/square_1x1.gml
deleted file mode 120000
index bed822be912..00000000000
--- a/Tests/Data/ThermoHydroMechanics/MultiMaterialEhlers/TM/square_1x1.gml
+++ /dev/null
@@ -1 +0,0 @@
-../square_1x1.gml
\ No newline at end of file
diff --git a/Tests/Data/ThermoHydroMechanics/MultiMaterialEhlers/TM/square_1x1_quad_1e1_2_matIDs.vtu b/Tests/Data/ThermoHydroMechanics/MultiMaterialEhlers/TM/square_1x1_quad_1e1_2_matIDs.vtu
deleted file mode 120000
index d8472c4198e..00000000000
--- a/Tests/Data/ThermoHydroMechanics/MultiMaterialEhlers/TM/square_1x1_quad_1e1_2_matIDs.vtu
+++ /dev/null
@@ -1 +0,0 @@
-../square_1x1_quad_1e1_2_matIDs.vtu
\ No newline at end of file
-- 
GitLab