Commit f1a8c705 authored by Timo Koch's avatar Timo Koch
Browse files

Merge branch 'fix/add_cmake_guards_pnm' into 'master'

[test] Add CMAKE_GUARDs for PNM tests

See merge request !2508
parents e3b47865 01851e53
...@@ -305,6 +305,7 @@ add_executable(test_pnm_gridmanager EXCLUDE_FROM_ALL test_pnm_gridmanager.cc) ...@@ -305,6 +305,7 @@ add_executable(test_pnm_gridmanager EXCLUDE_FROM_ALL test_pnm_gridmanager.cc)
dumux_add_test(NAME test_pnm_gridmanager_constant_params dumux_add_test(NAME test_pnm_gridmanager_constant_params
LABELS unit io porenetwork LABELS unit io porenetwork
TARGET test_pnm_gridmanager TARGET test_pnm_gridmanager
CMAKE_GUARD dune-foamgrid_FOUND
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMD_ARGS --script fuzzy CMD_ARGS --script fuzzy
--files ${CMAKE_SOURCE_DIR}/test/references/pnm_gridmanager-3d-constant.vtp --files ${CMAKE_SOURCE_DIR}/test/references/pnm_gridmanager-3d-constant.vtp
...@@ -383,4 +384,6 @@ dumux_add_test(NAME test_pnm_gridmanager_remove_throats_on_boundary_all ...@@ -383,4 +384,6 @@ dumux_add_test(NAME test_pnm_gridmanager_remove_throats_on_boundary_all
COMMAND ${CMAKE_CURRENT_BINARY_DIR}/test_pnm_gridmanager COMMAND ${CMAKE_CURRENT_BINARY_DIR}/test_pnm_gridmanager
CMD_ARGS test_remove-troats-on-boundary.input -Grid.RemoveThroatsOnBoundary "0 1 2 3") CMD_ARGS test_remove-troats-on-boundary.input -Grid.RemoveThroatsOnBoundary "0 1 2 3")
dumux_add_test(SOURCES test_pnm_subgriddata.cc LABELS unit io porenetwork) dumux_add_test(SOURCES test_pnm_subgriddata.cc
LABELS unit io porenetwork
CMAKE_GUARD dune-foamgrid_FOUND)
...@@ -8,6 +8,7 @@ dumux_add_test(NAME test_pnm_1p ...@@ -8,6 +8,7 @@ dumux_add_test(NAME test_pnm_1p
LABELS porenetwork LABELS porenetwork
COMPILE_DEFINITIONS ISOTHERMAL=1 COMPILE_DEFINITIONS ISOTHERMAL=1
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMAKE_GUARD "( dune-foamgrid_FOUND AND HAVE_UMFPACK )"
CMD_ARGS --script fuzzy CMD_ARGS --script fuzzy
--files ${CMAKE_SOURCE_DIR}/test/references/test_pnm_1p-reference.vtp --files ${CMAKE_SOURCE_DIR}/test/references/test_pnm_1p-reference.vtp
${CMAKE_CURRENT_BINARY_DIR}/test_pnm_1p-00000.vtp ${CMAKE_CURRENT_BINARY_DIR}/test_pnm_1p-00000.vtp
...@@ -18,6 +19,7 @@ dumux_add_test(NAME test_pnm_1p_gravity ...@@ -18,6 +19,7 @@ dumux_add_test(NAME test_pnm_1p_gravity
LABELS porenetwork LABELS porenetwork
COMPILE_DEFINITIONS ISOTHERMAL=1 COMPILE_DEFINITIONS ISOTHERMAL=1
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMAKE_GUARD "( dune-foamgrid_FOUND AND HAVE_UMFPACK )"
CMD_ARGS --script fuzzy --zeroThreshold {"velocity_liq \(m/s\)":1e-15,"volumeFlux":1e-25} CMD_ARGS --script fuzzy --zeroThreshold {"velocity_liq \(m/s\)":1e-15,"volumeFlux":1e-25}
--files ${CMAKE_SOURCE_DIR}/test/references/test_pnm_1p_gravity-reference.vtp --files ${CMAKE_SOURCE_DIR}/test/references/test_pnm_1p_gravity-reference.vtp
${CMAKE_CURRENT_BINARY_DIR}/test_pnm_1p_gravity-00000.vtp ${CMAKE_CURRENT_BINARY_DIR}/test_pnm_1p_gravity-00000.vtp
......
...@@ -5,6 +5,7 @@ dumux_add_test(NAME test_pnm_1pni ...@@ -5,6 +5,7 @@ dumux_add_test(NAME test_pnm_1pni
LABELS porenetwork LABELS porenetwork
COMPILE_DEFINITIONS ISOTHERMAL=0 COMPILE_DEFINITIONS ISOTHERMAL=0
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMAKE_GUARD "( dune-foamgrid_FOUND AND HAVE_UMFPACK )"
CMD_ARGS --script fuzzy CMD_ARGS --script fuzzy
--files ${CMAKE_SOURCE_DIR}/test/references/test_pnm_1pni-reference.vtp --files ${CMAKE_SOURCE_DIR}/test/references/test_pnm_1pni-reference.vtp
${CMAKE_CURRENT_BINARY_DIR}/test_pnm_1pni-00014.vtp ${CMAKE_CURRENT_BINARY_DIR}/test_pnm_1pni-00014.vtp
......
...@@ -7,6 +7,7 @@ dumux_add_test(NAME test_pnm_1p2c_advection ...@@ -7,6 +7,7 @@ dumux_add_test(NAME test_pnm_1p2c_advection
TARGET test_pnm_1p2c TARGET test_pnm_1p2c
LABELS porenetwork LABELS porenetwork
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMAKE_GUARD "( dune-foamgrid_FOUND AND HAVE_UMFPACK )"
CMD_ARGS --script fuzzy CMD_ARGS --script fuzzy
--files ${CMAKE_SOURCE_DIR}/test/references/test_pnm_1p2c-reference.vtp --files ${CMAKE_SOURCE_DIR}/test/references/test_pnm_1p2c-reference.vtp
${CMAKE_CURRENT_BINARY_DIR}/test_pnm_1p2c-00055.vtp ${CMAKE_CURRENT_BINARY_DIR}/test_pnm_1p2c-00055.vtp
...@@ -16,6 +17,7 @@ dumux_add_test(NAME test_pnm_1p2c_diffusion ...@@ -16,6 +17,7 @@ dumux_add_test(NAME test_pnm_1p2c_diffusion
TARGET test_pnm_1p2c TARGET test_pnm_1p2c
LABELS porenetwork LABELS porenetwork
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMAKE_GUARD "( dune-foamgrid_FOUND AND HAVE_UMFPACK )"
CMD_ARGS --script fuzzy CMD_ARGS --script fuzzy
--files ${CMAKE_SOURCE_DIR}/test/references/test_pnm_1p2c_diffusion-reference.vtp --files ${CMAKE_SOURCE_DIR}/test/references/test_pnm_1p2c_diffusion-reference.vtp
${CMAKE_CURRENT_BINARY_DIR}/test_pnm_1p2c_diffusion-00054.vtp ${CMAKE_CURRENT_BINARY_DIR}/test_pnm_1p2c_diffusion-00054.vtp
...@@ -26,6 +28,7 @@ dumux_add_test(NAME test_pnm_1p2cni ...@@ -26,6 +28,7 @@ dumux_add_test(NAME test_pnm_1p2cni
LABELS porenetwork LABELS porenetwork
COMPILE_DEFINITIONS ISOTHERMAL=0 COMPILE_DEFINITIONS ISOTHERMAL=0
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMAKE_GUARD "( dune-foamgrid_FOUND AND HAVE_UMFPACK )"
CMD_ARGS --script fuzzy CMD_ARGS --script fuzzy
--files ${CMAKE_SOURCE_DIR}/test/references/test_pnm_1p2cni-reference.vtp --files ${CMAKE_SOURCE_DIR}/test/references/test_pnm_1p2cni-reference.vtp
${CMAKE_CURRENT_BINARY_DIR}/test_pnm_1p2cni-00056.vtp ${CMAKE_CURRENT_BINARY_DIR}/test_pnm_1p2cni-00056.vtp
......
...@@ -7,6 +7,7 @@ dumux_add_test(NAME test_pnm_2p ...@@ -7,6 +7,7 @@ dumux_add_test(NAME test_pnm_2p
LABELS porenetwork LABELS porenetwork
COMPILE_DEFINITIONS ISOTHERMAL=1 COMPILE_DEFINITIONS ISOTHERMAL=1
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMAKE_GUARD "( dune-foamgrid_FOUND AND HAVE_UMFPACK )"
CMD_ARGS --script fuzzy CMD_ARGS --script fuzzy
--files ${CMAKE_SOURCE_DIR}/test/references/test_pnm_2p-reference.vtp --files ${CMAKE_SOURCE_DIR}/test/references/test_pnm_2p-reference.vtp
${CMAKE_CURRENT_BINARY_DIR}/test_pnm_2p-00107.vtp ${CMAKE_CURRENT_BINARY_DIR}/test_pnm_2p-00107.vtp
...@@ -17,6 +18,7 @@ dumux_add_test(NAME test_pnm_2pni ...@@ -17,6 +18,7 @@ dumux_add_test(NAME test_pnm_2pni
LABELS porenetwork LABELS porenetwork
COMPILE_DEFINITIONS ISOTHERMAL=0 COMPILE_DEFINITIONS ISOTHERMAL=0
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMAKE_GUARD "( dune-foamgrid_FOUND AND HAVE_UMFPACK )"
CMD_ARGS --script fuzzy CMD_ARGS --script fuzzy
--files ${CMAKE_SOURCE_DIR}/test/references/test_pnm_2pni-reference.vtp --files ${CMAKE_SOURCE_DIR}/test/references/test_pnm_2pni-reference.vtp
${CMAKE_CURRENT_BINARY_DIR}/test_pnm_2pni-00133.vtp ${CMAKE_CURRENT_BINARY_DIR}/test_pnm_2pni-00133.vtp
......
...@@ -4,6 +4,7 @@ dumux_add_test(NAME test_pnm_2p_static ...@@ -4,6 +4,7 @@ dumux_add_test(NAME test_pnm_2p_static
SOURCES main.cc SOURCES main.cc
LABELS porenetwork LABELS porenetwork
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMAKE_GUARD "( dune-foamgrid_FOUND AND HAVE_UMFPACK )"
CMD_ARGS --script fuzzyData CMD_ARGS --script fuzzyData
--files ${CMAKE_SOURCE_DIR}/test/references/test_pnm_2p_static-reference.txt --files ${CMAKE_SOURCE_DIR}/test/references/test_pnm_2p_static-reference.txt
${CMAKE_CURRENT_BINARY_DIR}/test_pnm_2p_static_pc-s-curve.txt ${CMAKE_CURRENT_BINARY_DIR}/test_pnm_2p_static_pc-s-curve.txt
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment