Skip to content
Snippets Groups Projects
Commit c6242ffc authored by Lars Bilke's avatar Lars Bilke
Browse files

Merge branch 'fix-frontend' into 'master'

[ci] Fix frontend job

See merge request ogs/ogs!4581
parents 3a8f9e39 e95de628
No related branches found
No related tags found
No related merge requests found
......@@ -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>
......
......@@ -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})
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment