diff --git a/Tests/Data/TH2M/submesh_residuum_assembly/p_G.xml b/Tests/Data/TH2M/submesh_residuum_assembly/p_G.xml index cd8022ca8472db6fc8d5b7571523998ac5bc019e..f5c5a970129014c7c42ff3468c2466217287bd0a 100644 --- a/Tests/Data/TH2M/submesh_residuum_assembly/p_G.xml +++ b/Tests/Data/TH2M/submesh_residuum_assembly/p_G.xml @@ -80,7 +80,7 @@ <add sel="/*/time_loop/submesh_residuum_output"> <prefix>p_G_{:meshname}</prefix> </add> - + <add sel="/*/time_loop/output/variables"> <variable>HeatFlowRate</variable> <variable>GasMassFlowRate</variable> @@ -125,7 +125,7 @@ <vtkdiff> <regex>p_G.*_ts_[0-9]*_.*\.vtu</regex> <field>capillary_pressure_interpolated</field> - <absolute_tolerance>5.3e-10</absolute_tolerance> + <absolute_tolerance>6e-10</absolute_tolerance> <relative_tolerance>0</relative_tolerance> </vtkdiff> <vtkdiff> diff --git a/scripts/cmake/test/AddTest.cmake b/scripts/cmake/test/AddTest.cmake index b006b4ac41050e8ed86fce846354c62c5963d414..b5267b419b50cc2ce759bd057cd4bd225fc1fdf0 100644 --- a/scripts/cmake/test/AddTest.cmake +++ b/scripts/cmake/test/AddTest.cmake @@ -258,15 +258,6 @@ function(AddTest) list(APPEND labels large) endif() - _add_test(${TEST_NAME}) - - # OpenMP tests for specific processes only. TODO (CL) Once all processes can - # be assembled OpenMP parallel, the condition should be removed. - if("${labels}" MATCHES "TH2M|ThermoRichards") - _add_test(${TEST_NAME}-omp) - _set_omp_test_properties() - endif() - if(AddTest_PYTHON_PACKAGES) list(APPEND labels python_modules) if(OGS_USE_PIP) @@ -287,6 +278,15 @@ function(AddTest) endif() endif() + _add_test(${TEST_NAME}) + + # OpenMP tests for specific processes only. TODO (CL) Once all processes can + # be assembled OpenMP parallel, the condition should be removed. + if("${labels}" MATCHES "TH2M|ThermoRichards") + _add_test(${TEST_NAME}-omp) + _set_omp_test_properties() + endif() + add_dependencies(ctest ${AddTest_EXECUTABLE}) add_dependencies(ctest-large ${AddTest_EXECUTABLE})