From c4672466342e270fa02b9aea88fed7318eb84f70 Mon Sep 17 00:00:00 2001
From: Thomas Fischer <thomas.fischer@ufz.de>
Date: Thu, 14 May 2020 11:32:31 +0200
Subject: [PATCH] [T/ComponentTransport] Fix EquilibriumPhase Phreeqc Calcite.

---
 ProcessLib/ComponentTransport/Tests.cmake     | 50 +++++++++----------
 .../calcite_phreeqckernel.prj                 |  4 +-
 2 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/ProcessLib/ComponentTransport/Tests.cmake b/ProcessLib/ComponentTransport/Tests.cmake
index 6d5de1dd86a..79515169228 100644
--- a/ProcessLib/ComponentTransport/Tests.cmake
+++ b/ProcessLib/ComponentTransport/Tests.cmake
@@ -1048,31 +1048,31 @@ AddTest(
     TESTER vtkdiff
     REQUIREMENTS NOT OGS_USE_MPI
     DIFF_DATA
-    calcite_phreeqckernel_pcs_5_ts_42_t_4200.000000_expected.vtu calcite_phreeqckernel_pcs_5_ts_42_t_4200.000000.vtu pressure pressure 1e-6 1e-10
-    calcite_phreeqckernel_pcs_5_ts_84_t_8400.000000_expected.vtu calcite_phreeqckernel_pcs_5_ts_84_t_8400.000000.vtu pressure pressure 1e-6 1e-10
-    calcite_phreeqckernel_pcs_5_ts_126_t_12600.000000_expected.vtu calcite_phreeqckernel_pcs_5_ts_126_t_12600.000000.vtu pressure pressure 1e-6 1e-10
-    calcite_phreeqckernel_pcs_5_ts_168_t_16800.000000_expected.vtu calcite_phreeqckernel_pcs_5_ts_168_t_16800.000000.vtu pressure pressure 1e-6 1e-10
-    calcite_phreeqckernel_pcs_5_ts_210_t_21000.000000_expected.vtu calcite_phreeqckernel_pcs_5_ts_210_t_21000.000000.vtu pressure pressure 1e-6 1e-10
-    calcite_phreeqckernel_pcs_5_ts_42_t_4200.000000_expected.vtu calcite_phreeqckernel_pcs_5_ts_42_t_4200.000000.vtu Ca Ca 1e-10 1e-16
-    calcite_phreeqckernel_pcs_5_ts_84_t_8400.000000_expected.vtu calcite_phreeqckernel_pcs_5_ts_84_t_8400.000000.vtu Ca Ca 1e-10 1e-16
-    calcite_phreeqckernel_pcs_5_ts_126_t_12600.000000_expected.vtu calcite_phreeqckernel_pcs_5_ts_126_t_12600.000000.vtu Ca Ca 1e-10 1e-16
-    calcite_phreeqckernel_pcs_5_ts_168_t_16800.000000_expected.vtu calcite_phreeqckernel_pcs_5_ts_168_t_16800.000000.vtu Ca Ca 1e-10 1e-16
-    calcite_phreeqckernel_pcs_5_ts_210_t_21000.000000_expected.vtu calcite_phreeqckernel_pcs_5_ts_210_t_21000.000000.vtu Ca Ca 1e-10 1e-16
-    calcite_phreeqckernel_pcs_5_ts_42_t_4200.000000_expected.vtu calcite_phreeqckernel_pcs_5_ts_42_t_4200.000000.vtu Cl Cl 1e-10 1e-16
-    calcite_phreeqckernel_pcs_5_ts_84_t_8400.000000_expected.vtu calcite_phreeqckernel_pcs_5_ts_84_t_8400.000000.vtu Cl Cl 1e-10 1e-16
-    calcite_phreeqckernel_pcs_5_ts_126_t_12600.000000_expected.vtu calcite_phreeqckernel_pcs_5_ts_126_t_12600.000000.vtu Cl Cl 1e-10 1e-16
-    calcite_phreeqckernel_pcs_5_ts_168_t_16800.000000_expected.vtu calcite_phreeqckernel_pcs_5_ts_168_t_16800.000000.vtu Cl Cl 1e-10 1e-16
-    calcite_phreeqckernel_pcs_5_ts_210_t_21000.000000_expected.vtu calcite_phreeqckernel_pcs_5_ts_210_t_21000.000000.vtu Cl Cl 1e-10 1e-16
-    calcite_phreeqckernel_pcs_5_ts_42_t_4200.000000_expected.vtu calcite_phreeqckernel_pcs_5_ts_42_t_4200.000000.vtu H H 1e-10 1e-16
-    calcite_phreeqckernel_pcs_5_ts_84_t_8400.000000_expected.vtu calcite_phreeqckernel_pcs_5_ts_84_t_8400.000000.vtu H H 1e-10 1e-16
-    calcite_phreeqckernel_pcs_5_ts_126_t_12600.000000_expected.vtu calcite_phreeqckernel_pcs_5_ts_126_t_12600.000000.vtu H H 1e-10 1e-16
-    calcite_phreeqckernel_pcs_5_ts_168_t_16800.000000_expected.vtu calcite_phreeqckernel_pcs_5_ts_168_t_16800.000000.vtu H H 1e-10 1e-16
-    calcite_phreeqckernel_pcs_5_ts_210_t_21000.000000_expected.vtu calcite_phreeqckernel_pcs_5_ts_210_t_21000.000000.vtu H H 1e-10 1e-16
-    calcite_phreeqckernel_pcs_5_ts_42_t_4200.000000_expected.vtu calcite_phreeqckernel_pcs_5_ts_42_t_4200.000000.vtu Mg Mg 1e-10 1e-16
-    calcite_phreeqckernel_pcs_5_ts_84_t_8400.000000_expected.vtu calcite_phreeqckernel_pcs_5_ts_84_t_8400.000000.vtu Mg Mg 1e-10 1e-16
-    calcite_phreeqckernel_pcs_5_ts_126_t_12600.000000_expected.vtu calcite_phreeqckernel_pcs_5_ts_126_t_12600.000000.vtu Mg Mg 1e-10 1e-16
-    calcite_phreeqckernel_pcs_5_ts_168_t_16800.000000_expected.vtu calcite_phreeqckernel_pcs_5_ts_168_t_16800.000000.vtu Mg Mg 1e-10 1e-16
-    calcite_phreeqckernel_pcs_5_ts_210_t_21000.000000_expected.vtu calcite_phreeqckernel_pcs_5_ts_210_t_21000.000000.vtu Mg Mg 1e-10 1e-16
+    calcite_phreeqckernel_pcs_5_ts_42_t_4200.000000_expected.vtu calcite_phreeqckernel_ts_42_t_4200.000000.vtu pressure pressure 1e-6 1e-10
+    calcite_phreeqckernel_pcs_5_ts_84_t_8400.000000_expected.vtu calcite_phreeqckernel_ts_84_t_8400.000000.vtu pressure pressure 1e-6 1e-10
+    calcite_phreeqckernel_pcs_5_ts_126_t_12600.000000_expected.vtu calcite_phreeqckernel_ts_126_t_12600.000000.vtu pressure pressure 1e-6 1e-10
+    calcite_phreeqckernel_pcs_5_ts_168_t_16800.000000_expected.vtu calcite_phreeqckernel_ts_168_t_16800.000000.vtu pressure pressure 1e-6 1e-10
+    calcite_phreeqckernel_pcs_5_ts_210_t_21000.000000_expected.vtu calcite_phreeqckernel_ts_210_t_21000.000000.vtu pressure pressure 1e-6 1e-10
+    calcite_phreeqckernel_pcs_5_ts_42_t_4200.000000_expected.vtu calcite_phreeqckernel_ts_42_t_4200.000000.vtu Ca Ca 1e-10 1e-16
+    calcite_phreeqckernel_pcs_5_ts_84_t_8400.000000_expected.vtu calcite_phreeqckernel_ts_84_t_8400.000000.vtu Ca Ca 1e-10 1e-16
+    calcite_phreeqckernel_pcs_5_ts_126_t_12600.000000_expected.vtu calcite_phreeqckernel_ts_126_t_12600.000000.vtu Ca Ca 1e-10 1e-16
+    calcite_phreeqckernel_pcs_5_ts_168_t_16800.000000_expected.vtu calcite_phreeqckernel_ts_168_t_16800.000000.vtu Ca Ca 1e-10 1e-16
+    calcite_phreeqckernel_pcs_5_ts_210_t_21000.000000_expected.vtu calcite_phreeqckernel_ts_210_t_21000.000000.vtu Ca Ca 1e-10 1e-16
+    calcite_phreeqckernel_pcs_5_ts_42_t_4200.000000_expected.vtu calcite_phreeqckernel_ts_42_t_4200.000000.vtu Cl Cl 1e-10 1e-16
+    calcite_phreeqckernel_pcs_5_ts_84_t_8400.000000_expected.vtu calcite_phreeqckernel_ts_84_t_8400.000000.vtu Cl Cl 1e-10 1e-16
+    calcite_phreeqckernel_pcs_5_ts_126_t_12600.000000_expected.vtu calcite_phreeqckernel_ts_126_t_12600.000000.vtu Cl Cl 1e-10 1e-16
+    calcite_phreeqckernel_pcs_5_ts_168_t_16800.000000_expected.vtu calcite_phreeqckernel_ts_168_t_16800.000000.vtu Cl Cl 1e-10 1e-16
+    calcite_phreeqckernel_pcs_5_ts_210_t_21000.000000_expected.vtu calcite_phreeqckernel_ts_210_t_21000.000000.vtu Cl Cl 1e-10 1e-16
+    calcite_phreeqckernel_pcs_5_ts_42_t_4200.000000_expected.vtu calcite_phreeqckernel_ts_42_t_4200.000000.vtu H H 1e-10 1e-16
+    calcite_phreeqckernel_pcs_5_ts_84_t_8400.000000_expected.vtu calcite_phreeqckernel_ts_84_t_8400.000000.vtu H H 1e-10 1e-16
+    calcite_phreeqckernel_pcs_5_ts_126_t_12600.000000_expected.vtu calcite_phreeqckernel_ts_126_t_12600.000000.vtu H H 1e-10 1e-16
+    calcite_phreeqckernel_pcs_5_ts_168_t_16800.000000_expected.vtu calcite_phreeqckernel_ts_168_t_16800.000000.vtu H H 1e-10 1e-16
+    calcite_phreeqckernel_pcs_5_ts_210_t_21000.000000_expected.vtu calcite_phreeqckernel_ts_210_t_21000.000000.vtu H H 1e-10 1e-16
+    calcite_phreeqckernel_pcs_5_ts_42_t_4200.000000_expected.vtu calcite_phreeqckernel_ts_42_t_4200.000000.vtu Mg Mg 1e-10 1e-16
+    calcite_phreeqckernel_pcs_5_ts_84_t_8400.000000_expected.vtu calcite_phreeqckernel_ts_84_t_8400.000000.vtu Mg Mg 1e-10 1e-16
+    calcite_phreeqckernel_pcs_5_ts_126_t_12600.000000_expected.vtu calcite_phreeqckernel_ts_126_t_12600.000000.vtu Mg Mg 1e-10 1e-16
+    calcite_phreeqckernel_pcs_5_ts_168_t_16800.000000_expected.vtu calcite_phreeqckernel_ts_168_t_16800.000000.vtu Mg Mg 1e-10 1e-16
+    calcite_phreeqckernel_pcs_5_ts_210_t_21000.000000_expected.vtu calcite_phreeqckernel_ts_210_t_21000.000000.vtu Mg Mg 1e-10 1e-16
     RUNTIME 10
 )
 
diff --git a/Tests/Data/Parabolic/ComponentTransport/ReactiveTransport/EquilibriumPhase/calcite_phreeqckernel.prj b/Tests/Data/Parabolic/ComponentTransport/ReactiveTransport/EquilibriumPhase/calcite_phreeqckernel.prj
index 21917db7221..87da983290a 100644
--- a/Tests/Data/Parabolic/ComponentTransport/ReactiveTransport/EquilibriumPhase/calcite_phreeqckernel.prj
+++ b/Tests/Data/Parabolic/ComponentTransport/ReactiveTransport/EquilibriumPhase/calcite_phreeqckernel.prj
@@ -355,7 +355,8 @@
         </processes>
         <output>
             <type>VTK</type>
-            <prefix>calcite_phreeqckernel_pcs_{:process_id}</prefix>
+            <prefix>calcite_phreeqckernel</prefix>
+            <suffix>_ts_{:timestep}_t_{:time}</suffix>
             <timesteps>
                 <pair>
                     <repeat>5</repeat>
@@ -371,7 +372,6 @@
                 <variable>pressure</variable>
                 <variable>darcy_velocity</variable>
             </variables>
-            <suffix>_ts_{:timestep}_t_{:time}</suffix>
         </output>
     </time_loop>
     <chemical_system chemical_solver="PhreeqcKernel">
-- 
GitLab