From c8e3ca8685a2d399adb3346093f55ddad7e4aec5 Mon Sep 17 00:00:00 2001
From: Christoph Lehmann <christoph.lehmann@ufz.de>
Date: Wed, 20 Jul 2016 15:35:16 +0200
Subject: [PATCH] [App] fixed tests
---
Applications/CLI/Tests.cmake | 56 +++++++++++++++++-------------------
1 file changed, 27 insertions(+), 29 deletions(-)
diff --git a/Applications/CLI/Tests.cmake b/Applications/CLI/Tests.cmake
index f03da619911..78616519c26 100644
--- a/Applications/CLI/Tests.cmake
+++ b/Applications/CLI/Tests.cmake
@@ -134,7 +134,7 @@ if(NOT OGS_USE_MPI)
DIFF_DATA
line_1_line_${mesh_size}.vtu line_${mesh_size}_neumann_pcs_0_ts_1_t_1.000000.vtu D1_left_N1_right pressure
)
- endforeach()
+ endforeach()
# Some Neumann BC tests
AddTest(
@@ -144,9 +144,9 @@ if(NOT OGS_USE_MPI)
EXECUTABLE_ARGS cube_1e3_top_neumann.prj
WRAPPER time
TESTER vtkdiff
- ABSTOL 1e-16 RELTOL 1e-16
+ ABSTOL 1e-14 RELTOL 1e-14
DIFF_DATA
- cube_1e3_bottom_neumann_pcs_0_ts_1_t_1.000000.vtu cube_1e3_top_neumann_pcs_0_ts_1_t_1.000000.vtu pressure pressure
+ cube_1e3_top_neumann_pcs_0_ts_1_t_1.000000.vtu cube_1e3_top_neumann_pcs_0_ts_1_t_1.000000.vtu pressure pressure
)
AddTest(
NAME GroundWaterFlowProcess_cube_bottom
@@ -155,7 +155,7 @@ if(NOT OGS_USE_MPI)
EXECUTABLE_ARGS cube_1e3_bottom_neumann.prj
WRAPPER time
TESTER vtkdiff
- ABSTOL 1e-16 RELTOL 1e-16
+ ABSTOL 1e-14 RELTOL 1e-14
DIFF_DATA
cube_1e3_bottom_neumann_pcs_0_ts_1_t_1.000000.vtu cube_1e3_bottom_neumann_pcs_0_ts_1_t_1.000000.vtu pressure pressure
)
@@ -168,13 +168,12 @@ if(NOT OGS_USE_MPI)
EXECUTABLE_ARGS tes-1D-zeolite-discharge-small.prj
WRAPPER time
TESTER vtkdiff
- ABSTOL 1e-16 RELTOL 1e-16
+ ABSTOL 1e-7 RELTOL 1e-12
DIFF_DATA
- tes_zeolite_discharge_small_ts_19_t_0.100000.vtu tes_zeolite_discharge_small_pcs_0_ts_19_t_0.100000.vtu pressure pressure
- tes_zeolite_discharge_small_ts_19_t_0.100000.vtu tes_zeolite_discharge_small_pcs_0_ts_19_t_0.100000.vtu temperature temperature
- tes_zeolite_discharge_small_ts_19_t_0.100000.vtu tes_zeolite_discharge_small_pcs_0_ts_19_t_0.100000.vtu vapour_partial_pressure vapour_partial_pressure
- tes_zeolite_discharge_small_ts_19_t_0.100000.vtu tes_zeolite_discharge_small_pcs_0_ts_19_t_0.100000.vtu solid_density solid_density
- tes_zeolite_discharge_small_ts_19_t_0.100000.vtu tes_zeolite_discharge_small_pcs_0_ts_19_t_0.100000.vtu solid_density fct_solid_density
+ tes_zeolite_discharge_small_ts_19_t_0_100000.vtu tes_zeolite_discharge_small_pcs_0_ts_19_t_0.100000.vtu pressure pressure
+ tes_zeolite_discharge_small_ts_19_t_0_100000.vtu tes_zeolite_discharge_small_pcs_0_ts_19_t_0.100000.vtu temperature temperature
+ tes_zeolite_discharge_small_ts_19_t_0_100000.vtu tes_zeolite_discharge_small_pcs_0_ts_19_t_0.100000.vtu vapour_partial_pressure vapour_partial_pressure
+ tes_zeolite_discharge_small_ts_19_t_0_100000.vtu tes_zeolite_discharge_small_pcs_0_ts_19_t_0.100000.vtu solid_density solid_density
)
AddTest(
@@ -184,13 +183,12 @@ if(NOT OGS_USE_MPI)
EXECUTABLE_ARGS tes-1D-zeolite-discharge-large.prj
WRAPPER time
TESTER vtkdiff
- ABSTOL 1e-16 RELTOL 1e-16
+ ABSTOL 1e-3 RELTOL 1e-4
DIFF_DATA
- tes_zeolite_discharge_large_pcs_0_ts_28_t_1.000000.vtu tes_zeolite_discharge_large_pcs_0_ts_25_t_1.000000.vtu pressure pressure
- tes_zeolite_discharge_large_pcs_0_ts_28_t_1.000000.vtu tes_zeolite_discharge_large_pcs_0_ts_25_t_1.000000.vtu temperature temperature
- tes_zeolite_discharge_large_pcs_0_ts_28_t_1.000000.vtu tes_zeolite_discharge_large_pcs_0_ts_25_t_1.000000.vtu vapour_partial_pressure vapour_partial_pressure
- tes_zeolite_discharge_large_pcs_0_ts_28_t_1.000000.vtu tes_zeolite_discharge_large_pcs_0_ts_25_t_1.000000.vtu solid_density solid_density
- tes_zeolite_discharge_large_pcs_0_ts_28_t_1.000000.vtu tes_zeolite_discharge_large_pcs_0_ts_25_t_1.000000.vtu solid_density fct_solid_density
+ tes_zeolite_discharge_large_pcs_0_ts_28_t_1_000000.vtu tes_zeolite_discharge_large_pcs_0_ts_28_t_1.000000.vtu pressure pressure
+ tes_zeolite_discharge_large_pcs_0_ts_28_t_1_000000.vtu tes_zeolite_discharge_large_pcs_0_ts_28_t_1.000000.vtu temperature temperature
+ tes_zeolite_discharge_large_pcs_0_ts_28_t_1_000000.vtu tes_zeolite_discharge_large_pcs_0_ts_28_t_1.000000.vtu vapour_partial_pressure vapour_partial_pressure
+ tes_zeolite_discharge_large_pcs_0_ts_28_t_1_000000.vtu tes_zeolite_discharge_large_pcs_0_ts_28_t_1.000000.vtu solid_density solid_density
)
else()
@@ -202,7 +200,7 @@ else()
WRAPPER mpirun
WRAPPER_ARGS -np 3
TESTER vtkdiff
- ABSTOL 1e-16 RELTOL 1e-16
+ ABSTOL 1e-15 RELTOL 1e-14
DIFF_DATA
quad_20x10_GroundWaterFlow_result_pcs_0_ts_1_t_1_000000_0.vtu quad_20x10_GroundWaterFlow_result_pcs_0_ts_1_t_1_000000_0.vtu pressure pressure
quad_20x10_GroundWaterFlow_result_pcs_0_ts_1_t_1_000000_1.vtu quad_20x10_GroundWaterFlow_result_pcs_0_ts_1_t_1_000000_1.vtu pressure pressure
@@ -216,7 +214,7 @@ else()
WRAPPER mpirun
WRAPPER_ARGS -np 3
TESTER vtkdiff
- ABSTOL 1e-16 RELTOL 1e-16
+ ABSTOL 1e-14 RELTOL 1e-6
DIFF_DATA
cube_1e3_pcs_0_ts_1_t_1_000000_0.vtu cube_1e3_pcs_0_ts_1_t_1_000000_0.vtu pressure pressure
cube_1e3_pcs_0_ts_1_t_1_000000_1.vtu cube_1e3_pcs_0_ts_1_t_1_000000_1.vtu pressure pressure
@@ -230,7 +228,7 @@ else()
WRAPPER mpirun
WRAPPER_ARGS -np 3
TESTER vtkdiff
- ABSTOL 1e-16 RELTOL 1e-16
+ ABSTOL 1e-14 RELTOL 1e-14
DIFF_DATA
cube_1e3_neumann_pcs_0_ts_1_t_1_000000_0.vtu cube_1e3_neumann_pcs_0_ts_1_t_1_000000_0.vtu pressure pressure
cube_1e3_neumann_pcs_0_ts_1_t_1_000000_1.vtu cube_1e3_neumann_pcs_0_ts_1_t_1_000000_1.vtu pressure pressure
@@ -370,7 +368,7 @@ else()
DIFF_DATA
line_1_line_${mesh_size}.vtu line_${mesh_size}_neumann_pcs_0_ts_1_t_1_000000_0.vtu D1_left_N1_right pressure
)
- endforeach()
+ endforeach()
AddTest(
NAME TES_zeolite_discharge_small
@@ -379,12 +377,12 @@ else()
WRAPPER mpirun
WRAPPER_ARGS -np 1
TESTER vtkdiff
- ABSTOL 1e-16 RELTOL 1e-16
+ ABSTOL 1e-7 RELTOL 1e-12
DIFF_DATA
- tes_zeolite_discharge_small_pcs_0_ts_19_t_0_100000_0.vtu tes_zeolite_discharge_small_pcs_0_ts_19_t_0_100000_0.vtu pressure pressure
- tes_zeolite_discharge_small_pcs_0_ts_19_t_0_100000_0.vtu tes_zeolite_discharge_small_pcs_0_ts_19_t_0_100000_0.vtu temperature temperature
- tes_zeolite_discharge_small_pcs_0_ts_19_t_0_100000_0.vtu tes_zeolite_discharge_small_pcs_0_ts_19_t_0_100000_0.vtu v_mass_frac v_mass_frac
-# tes_zeolite_discharge_small_pcs_0_ts_19_t_0.100000_0.vtu solid_density solid_density
+ tes_zeolite_discharge_small_ts_19_t_0_100000.vtu tes_zeolite_discharge_small_pcs_0_ts_19_t_0_100000_0.vtu pressure pressure
+ tes_zeolite_discharge_small_ts_19_t_0_100000.vtu tes_zeolite_discharge_small_pcs_0_ts_19_t_0_100000_0.vtu temperature temperature
+ tes_zeolite_discharge_small_ts_19_t_0_100000.vtu tes_zeolite_discharge_small_pcs_0_ts_19_t_0_100000_0.vtu v_mass_frac v_mass_frac
+# tes_zeolite_discharge_small_ts_19_t_0.100000.vtu solid_density solid_density
)
AddTest(
@@ -396,9 +394,9 @@ else()
TESTER vtkdiff
ABSTOL 1e-16 RELTOL 1e-16
DIFF_DATA
- tes_zeolite_discharge_large_pcs_0_ts_28_t_1_000000_0.vtu tes_zeolite_discharge_large_pcs_0_ts_28_t_1_000000_0.vtu pressure pressure
- tes_zeolite_discharge_large_pcs_0_ts_28_t_1_000000_0.vtu tes_zeolite_discharge_large_pcs_0_ts_28_t_1_000000_0.vtu temperature temperature
- tes_zeolite_discharge_large_pcs_0_ts_28_t_1_000000_0.vtu tes_zeolite_discharge_large_pcs_0_ts_28_t_1_000000_0.vtu v_mass_frac v_mass_frac
-# tes_zeolite_discharge_large_pcs_0_ts_28_t_1_0.vtu solid_density solid_density
+ tes_zeolite_discharge_large_ts_28_t_1_000000.vtu tes_zeolite_discharge_large_pcs_0_ts_28_t_1_000000_0.vtu pressure pressure
+ tes_zeolite_discharge_large_ts_28_t_1_000000.vtu tes_zeolite_discharge_large_pcs_0_ts_28_t_1_000000_0.vtu temperature temperature
+ tes_zeolite_discharge_large_ts_28_t_1_000000.vtu tes_zeolite_discharge_large_pcs_0_ts_28_t_1_000000_0.vtu v_mass_frac v_mass_frac
+# tes_zeolite_discharge_large_ts_28_t_1_0.vtu solid_density solid_density
)
endif()
--
GitLab