From 3a91a72aaaae7e85cb55de83f65de858278f377b Mon Sep 17 00:00:00 2001
From: Thomas Fischer <thomas.fischer@ufz.de>
Date: Thu, 14 May 2020 11:31:40 +0200
Subject: [PATCH] [T/ComponentTransport] Fix EquilibriumPhase Calcite.
---
ProcessLib/ComponentTransport/Tests.cmake | 50 +++++++++----------
.../EquilibriumPhase/calcite.prj | 4 +-
2 files changed, 27 insertions(+), 27 deletions(-)
diff --git a/ProcessLib/ComponentTransport/Tests.cmake b/ProcessLib/ComponentTransport/Tests.cmake
index 3ef057cc57e..6d5de1dd86a 100644
--- a/ProcessLib/ComponentTransport/Tests.cmake
+++ b/ProcessLib/ComponentTransport/Tests.cmake
@@ -1011,31 +1011,31 @@ AddTest(
TESTER vtkdiff
REQUIREMENTS NOT OGS_USE_MPI
DIFF_DATA
- calcite_pcs_5_ts_42_t_4200.000000_expected.vtu calcite_pcs_5_ts_42_t_4200.000000.vtu pressure pressure 1e-6 1e-10
- calcite_pcs_5_ts_84_t_8400.000000_expected.vtu calcite_pcs_5_ts_84_t_8400.000000.vtu pressure pressure 1e-6 1e-10
- calcite_pcs_5_ts_126_t_12600.000000_expected.vtu calcite_pcs_5_ts_126_t_12600.000000.vtu pressure pressure 1e-6 1e-10
- calcite_pcs_5_ts_168_t_16800.000000_expected.vtu calcite_pcs_5_ts_168_t_16800.000000.vtu pressure pressure 1e-6 1e-10
- calcite_pcs_5_ts_210_t_21000.000000_expected.vtu calcite_pcs_5_ts_210_t_21000.000000.vtu pressure pressure 1e-6 1e-10
- calcite_pcs_5_ts_42_t_4200.000000_expected.vtu calcite_pcs_5_ts_42_t_4200.000000.vtu Ca Ca 1e-10 1e-16
- calcite_pcs_5_ts_84_t_8400.000000_expected.vtu calcite_pcs_5_ts_84_t_8400.000000.vtu Ca Ca 1e-10 1e-16
- calcite_pcs_5_ts_126_t_12600.000000_expected.vtu calcite_pcs_5_ts_126_t_12600.000000.vtu Ca Ca 1e-10 1e-16
- calcite_pcs_5_ts_168_t_16800.000000_expected.vtu calcite_pcs_5_ts_168_t_16800.000000.vtu Ca Ca 1e-10 1e-16
- calcite_pcs_5_ts_210_t_21000.000000_expected.vtu calcite_pcs_5_ts_210_t_21000.000000.vtu Ca Ca 1e-10 1e-16
- calcite_pcs_5_ts_42_t_4200.000000_expected.vtu calcite_pcs_5_ts_42_t_4200.000000.vtu Cl Cl 1e-10 1e-16
- calcite_pcs_5_ts_84_t_8400.000000_expected.vtu calcite_pcs_5_ts_84_t_8400.000000.vtu Cl Cl 1e-10 1e-16
- calcite_pcs_5_ts_126_t_12600.000000_expected.vtu calcite_pcs_5_ts_126_t_12600.000000.vtu Cl Cl 1e-10 1e-16
- calcite_pcs_5_ts_168_t_16800.000000_expected.vtu calcite_pcs_5_ts_168_t_16800.000000.vtu Cl Cl 1e-10 1e-16
- calcite_pcs_5_ts_210_t_21000.000000_expected.vtu calcite_pcs_5_ts_210_t_21000.000000.vtu Cl Cl 1e-10 1e-16
- calcite_pcs_5_ts_42_t_4200.000000_expected.vtu calcite_pcs_5_ts_42_t_4200.000000.vtu H H 1e-10 1e-16
- calcite_pcs_5_ts_84_t_8400.000000_expected.vtu calcite_pcs_5_ts_84_t_8400.000000.vtu H H 1e-10 1e-16
- calcite_pcs_5_ts_126_t_12600.000000_expected.vtu calcite_pcs_5_ts_126_t_12600.000000.vtu H H 1e-10 1e-16
- calcite_pcs_5_ts_168_t_16800.000000_expected.vtu calcite_pcs_5_ts_168_t_16800.000000.vtu H H 1e-10 1e-16
- calcite_pcs_5_ts_210_t_21000.000000_expected.vtu calcite_pcs_5_ts_210_t_21000.000000.vtu H H 1e-10 1e-16
- calcite_pcs_5_ts_42_t_4200.000000_expected.vtu calcite_pcs_5_ts_42_t_4200.000000.vtu Mg Mg 1e-10 1e-16
- calcite_pcs_5_ts_84_t_8400.000000_expected.vtu calcite_pcs_5_ts_84_t_8400.000000.vtu Mg Mg 1e-10 1e-16
- calcite_pcs_5_ts_126_t_12600.000000_expected.vtu calcite_pcs_5_ts_126_t_12600.000000.vtu Mg Mg 1e-10 1e-16
- calcite_pcs_5_ts_168_t_16800.000000_expected.vtu calcite_pcs_5_ts_168_t_16800.000000.vtu Mg Mg 1e-10 1e-16
- calcite_pcs_5_ts_210_t_21000.000000_expected.vtu calcite_pcs_5_ts_210_t_21000.000000.vtu Mg Mg 1e-10 1e-16
+ calcite_pcs_5_ts_42_t_4200.000000_expected.vtu calcite_ts_42_t_4200.000000.vtu pressure pressure 1e-6 1e-10
+ calcite_pcs_5_ts_84_t_8400.000000_expected.vtu calcite_ts_84_t_8400.000000.vtu pressure pressure 1e-6 1e-10
+ calcite_pcs_5_ts_126_t_12600.000000_expected.vtu calcite_ts_126_t_12600.000000.vtu pressure pressure 1e-6 1e-10
+ calcite_pcs_5_ts_168_t_16800.000000_expected.vtu calcite_ts_168_t_16800.000000.vtu pressure pressure 1e-6 1e-10
+ calcite_pcs_5_ts_210_t_21000.000000_expected.vtu calcite_ts_210_t_21000.000000.vtu pressure pressure 1e-6 1e-10
+ calcite_pcs_5_ts_42_t_4200.000000_expected.vtu calcite_ts_42_t_4200.000000.vtu Ca Ca 1e-10 1e-16
+ calcite_pcs_5_ts_84_t_8400.000000_expected.vtu calcite_ts_84_t_8400.000000.vtu Ca Ca 1e-10 1e-16
+ calcite_pcs_5_ts_126_t_12600.000000_expected.vtu calcite_ts_126_t_12600.000000.vtu Ca Ca 1e-10 1e-16
+ calcite_pcs_5_ts_168_t_16800.000000_expected.vtu calcite_ts_168_t_16800.000000.vtu Ca Ca 1e-10 1e-16
+ calcite_pcs_5_ts_210_t_21000.000000_expected.vtu calcite_ts_210_t_21000.000000.vtu Ca Ca 1e-10 1e-16
+ calcite_pcs_5_ts_42_t_4200.000000_expected.vtu calcite_ts_42_t_4200.000000.vtu Cl Cl 1e-10 1e-16
+ calcite_pcs_5_ts_84_t_8400.000000_expected.vtu calcite_ts_84_t_8400.000000.vtu Cl Cl 1e-10 1e-16
+ calcite_pcs_5_ts_126_t_12600.000000_expected.vtu calcite_ts_126_t_12600.000000.vtu Cl Cl 1e-10 1e-16
+ calcite_pcs_5_ts_168_t_16800.000000_expected.vtu calcite_ts_168_t_16800.000000.vtu Cl Cl 1e-10 1e-16
+ calcite_pcs_5_ts_210_t_21000.000000_expected.vtu calcite_ts_210_t_21000.000000.vtu Cl Cl 1e-10 1e-16
+ calcite_pcs_5_ts_42_t_4200.000000_expected.vtu calcite_ts_42_t_4200.000000.vtu H H 1e-10 1e-16
+ calcite_pcs_5_ts_84_t_8400.000000_expected.vtu calcite_ts_84_t_8400.000000.vtu H H 1e-10 1e-16
+ calcite_pcs_5_ts_126_t_12600.000000_expected.vtu calcite_ts_126_t_12600.000000.vtu H H 1e-10 1e-16
+ calcite_pcs_5_ts_168_t_16800.000000_expected.vtu calcite_ts_168_t_16800.000000.vtu H H 1e-10 1e-16
+ calcite_pcs_5_ts_210_t_21000.000000_expected.vtu calcite_ts_210_t_21000.000000.vtu H H 1e-10 1e-16
+ calcite_pcs_5_ts_42_t_4200.000000_expected.vtu calcite_ts_42_t_4200.000000.vtu Mg Mg 1e-10 1e-16
+ calcite_pcs_5_ts_84_t_8400.000000_expected.vtu calcite_ts_84_t_8400.000000.vtu Mg Mg 1e-10 1e-16
+ calcite_pcs_5_ts_126_t_12600.000000_expected.vtu calcite_ts_126_t_12600.000000.vtu Mg Mg 1e-10 1e-16
+ calcite_pcs_5_ts_168_t_16800.000000_expected.vtu calcite_ts_168_t_16800.000000.vtu Mg Mg 1e-10 1e-16
+ calcite_pcs_5_ts_210_t_21000.000000_expected.vtu calcite_ts_210_t_21000.000000.vtu Mg Mg 1e-10 1e-16
RUNTIME 25
)
diff --git a/Tests/Data/Parabolic/ComponentTransport/ReactiveTransport/EquilibriumPhase/calcite.prj b/Tests/Data/Parabolic/ComponentTransport/ReactiveTransport/EquilibriumPhase/calcite.prj
index d795a59ede1..4b2b6882bbc 100644
--- a/Tests/Data/Parabolic/ComponentTransport/ReactiveTransport/EquilibriumPhase/calcite.prj
+++ b/Tests/Data/Parabolic/ComponentTransport/ReactiveTransport/EquilibriumPhase/calcite.prj
@@ -355,7 +355,8 @@
</processes>
<output>
<type>VTK</type>
- <prefix>calcite_pcs_{:process_id}</prefix>
+ <prefix>calcite</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="Phreeqc">
--
GitLab