From 98c1c885a0ebf2913c19f76b8394cc3d3ee5ae3b Mon Sep 17 00:00:00 2001 From: Christoph Lehmann <christoph.lehmann@ufz.de> Date: Wed, 1 Jun 2016 20:32:24 +0200 Subject: [PATCH] [App] set per-test tolerances; TES check multiple properties --- Applications/CLI/Tests.cmake | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/Applications/CLI/Tests.cmake b/Applications/CLI/Tests.cmake index 6e570cd72f8..813d4b46ec0 100644 --- a/Applications/CLI/Tests.cmake +++ b/Applications/CLI/Tests.cmake @@ -12,6 +12,7 @@ if(NOT OGS_USE_MPI) EXECUTABLE_ARGS cube_${mesh_size}.prj WRAPPER time TESTER vtkdiff + ABSTOL 1e-16 RELTOL 1e-16 DIFF_DATA cube_${mesh_size}_pcs_0_ts_1_t_1.000000.vtu Linear_1_to_minus1 pressure DATA cube_${mesh_size}.prj cube_1x1x1_hex_${mesh_size}.vtu cube_1x1x1.gml ) @@ -23,6 +24,7 @@ if(NOT OGS_USE_MPI) EXECUTABLE_ARGS cube_${mesh_size}_neumann.prj WRAPPER time TESTER vtkdiff + ABSTOL 1e-16 RELTOL 1e-16 DIFF_DATA cube_${mesh_size}_neumann_pcs_0_ts_1_t_1.000000.vtu D1_left_front_N1_right pressure DATA cube_${mesh_size}_neumann.prj cube_1x1x1_hex_${mesh_size}.vtu cube_1x1x1.gml ) @@ -36,6 +38,7 @@ if(NOT OGS_USE_MPI) EXECUTABLE_ARGS cube_${mesh_size}.prj WRAPPER time TESTER vtkdiff + ABSTOL 1e-16 RELTOL 1e-16 DIFF_DATA cube_${mesh_size}_pcs_0_ts_1_t_1.000000.vtu Linear_1_to_minus1 pressure DATA cube_${mesh_size}.prj cube_1x1x1_hex_${mesh_size}.vtu cube_1x1x1.gml ) @@ -47,6 +50,7 @@ if(NOT OGS_USE_MPI) EXECUTABLE_ARGS cube_${mesh_size}_neumann.prj WRAPPER time TESTER vtkdiff + ABSTOL 1e-16 RELTOL 1e-16 DIFF_DATA cube_${mesh_size}_neumann_pcs_0_ts_1_t_1.000000.vtu D1_left_front_N1_right pressure DATA cube_${mesh_size}_neumann.prj cube_1x1x1_hex_${mesh_size}.vtu cube_1x1x1.gml ) @@ -61,6 +65,7 @@ if(NOT OGS_USE_MPI) EXECUTABLE_ARGS square_${mesh_size}.prj WRAPPER time TESTER vtkdiff + ABSTOL 1e-16 RELTOL 1e-16 DIFF_DATA square_${mesh_size}_pcs_0_ts_1_t_1.000000.vtu Linear_1_to_minus1 pressure DATA square_${mesh_size}.prj square_1x1_quad_${mesh_size}.vtu square_1x1.gml ) @@ -72,6 +77,7 @@ if(NOT OGS_USE_MPI) EXECUTABLE_ARGS square_${mesh_size}_neumann.prj WRAPPER time TESTER vtkdiff + ABSTOL 1e-16 RELTOL 1e-16 DIFF_DATA square_${mesh_size}_neumann_pcs_0_ts_1_t_1.000000.vtu D1_left_bottom_N1_right pressure DATA square_${mesh_size}_neumann.prj square_1x1_quad_${mesh_size}.vtu square_1x1.gml ) @@ -85,6 +91,7 @@ if(NOT OGS_USE_MPI) EXECUTABLE_ARGS square_${mesh_size}.prj WRAPPER time TESTER vtkdiff + ABSTOL 1e-16 RELTOL 1e-16 DIFF_DATA square_${mesh_size}_pcs_0_ts_1_t_1.000000.vtu Linear_1_to_minus1 pressure DATA square_${mesh_size}.prj square_1x1_quad_${mesh_size}.vtu square_1x1.gml ) @@ -96,6 +103,7 @@ if(NOT OGS_USE_MPI) EXECUTABLE_ARGS square_${mesh_size}_neumann.prj WRAPPER time TESTER vtkdiff + ABSTOL 1e-16 RELTOL 1e-16 DIFF_DATA square_${mesh_size}_neumann_pcs_0_ts_1_t_1.000000.vtu D1_left_bottom_N1_right pressure DATA square_${mesh_size}_neumann.prj square_1x1_quad_${mesh_size}.vtu square_1x1.gml ) @@ -110,6 +118,7 @@ if(NOT OGS_USE_MPI) EXECUTABLE_ARGS line_${mesh_size}.prj WRAPPER time TESTER vtkdiff + ABSTOL 1e-16 RELTOL 1e-16 DIFF_DATA line_${mesh_size}_pcs_0_ts_1_t_1.000000.vtu Linear_1_to_minus1 pressure DATA line_${mesh_size}.prj line_1_line_${mesh_size}.vtu line_1.gml ) @@ -121,6 +130,7 @@ if(NOT OGS_USE_MPI) EXECUTABLE_ARGS line_${mesh_size}_neumann.prj WRAPPER time TESTER vtkdiff + ABSTOL 1e-16 RELTOL 1e-16 DIFF_DATA line_${mesh_size}_neumann_pcs_0_ts_1_t_1.000000.vtu D1_left_N1_right pressure DATA line_${mesh_size}_neumann.prj line_1_line_${mesh_size}.vtu line_1.gml ) @@ -134,7 +144,12 @@ if(NOT OGS_USE_MPI) EXECUTABLE_ARGS tes-1D-zeolite-discharge-small.prj WRAPPER time TESTER vtkdiff - DIFF_DATA tes_zeolite_discharge_small_pcs_0_ts_19_t_0.100000.vtu pressure pressure + ABSTOL 1e-16 RELTOL 1e-16 + DIFF_DATA + tes_zeolite_discharge_small_pcs_0_ts_19_t_0.100000.vtu pressure pressure + tes_zeolite_discharge_small_pcs_0_ts_19_t_0.100000.vtu temperature temperature + tes_zeolite_discharge_small_pcs_0_ts_19_t_0.100000.vtu v_mass_frac v_mass_frac + tes_zeolite_discharge_small_pcs_0_ts_19_t_0.100000.vtu solid_density solid_density DATA line_0.1.gml line_0.1_37.msh tes-1D-zeolite-discharge.prj ) @@ -145,7 +160,12 @@ if(NOT OGS_USE_MPI) EXECUTABLE_ARGS tes-1D-zeolite-discharge-large.prj WRAPPER time TESTER vtkdiff - DIFF_DATA tes_zeolite_discharge_large_pcs_0_ts_28_t_1.000000.vtu pressure pressure + ABSTOL 1e-16 RELTOL 1e-16 + DIFF_DATA + 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 temperature temperature + tes_zeolite_discharge_large_pcs_0_ts_28_t_1.000000.vtu v_mass_frac v_mass_frac + tes_zeolite_discharge_large_pcs_0_ts_28_t_1.000000.vtu solid_density solid_density DATA line_0.1.gml line_0.1_100.msh tes-1D-zeolite-discharge.prj ) -- GitLab