Commit 47cb0b6e authored by Dennis Gläser's avatar Dennis Gläser
Browse files

[2p] use new dune_add_tests semantics

parent 78c63fe0
......@@ -33,6 +33,5 @@ set(CMAKE_BUILD_TYPE Release)
install(FILES
problem.hh
spatialparams.hh
test_2p_fracture_box.cc
test_2p_fracture_cc.cc
test_2p_fracture_fv.cc
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/test/implicit/2p/fracture)
......@@ -4,31 +4,31 @@ dune_symlink_to_source_files(FILES "test_2p.input")
dune_add_test(NAME test_2p_incompressible_tpfa
SOURCES test_2p_fv.cc
COMPILE_DEFINITIONS TYPETAG=TwoPIncompressibleTpfa
COMMAND python ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
--script fuzzy
--files ${CMAKE_SOURCE_DIR}/test/references/lenscc-reference.vtu
${CMAKE_CURRENT_BINARY_DIR}/2p_tpfa-00008.vtu
--command "${CMAKE_CURRENT_BINARY_DIR}/test_2p_incompressible_tpfa test_2p.input -Problem.Name 2p_tpfa")
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMD_ARGS --script fuzzy
--files ${CMAKE_SOURCE_DIR}/test/references/lenscc-reference.vtu
${CMAKE_CURRENT_BINARY_DIR}/2p_tpfa-00008.vtu
--command "${CMAKE_CURRENT_BINARY_DIR}/test_2p_incompressible_tpfa test_2p.input -Problem.Name 2p_tpfa")
# using box
dune_add_test(NAME test_2p_incompressible_box
SOURCES test_2p_fv.cc
COMPILE_DEFINITIONS TYPETAG=TwoPIncompressibleBox
COMMAND python ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
--script fuzzy
--files ${CMAKE_SOURCE_DIR}/test/references/lensbox-reference.vtu
${CMAKE_CURRENT_BINARY_DIR}/2p_box-00007.vtu
--command "${CMAKE_CURRENT_BINARY_DIR}/test_2p_incompressible_box test_2p.input -Problem.Name 2p_box")
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMD_ARGS --script fuzzy
--files ${CMAKE_SOURCE_DIR}/test/references/lensbox-reference.vtu
${CMAKE_CURRENT_BINARY_DIR}/2p_box-00007.vtu
--command "${CMAKE_CURRENT_BINARY_DIR}/test_2p_incompressible_box test_2p.input -Problem.Name 2p_box")
# using mpfa
dune_add_test(NAME test_2p_incompressible_mpfa
SOURCES test_2p_fv.cc
COMPILE_DEFINITIONS TYPETAG=TwoPIncompressibleMpfa
COMMAND python ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
--script fuzzy
--files ${CMAKE_SOURCE_DIR}/test/references/lenscc-reference.vtu
${CMAKE_CURRENT_BINARY_DIR}/2p_mpfa-00008.vtu
--command "${CMAKE_CURRENT_BINARY_DIR}/test_2p_incompressible_mpfa test_2p.input -Problem.Name 2p_mpfa")
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMD_ARGS --script fuzzy
--files ${CMAKE_SOURCE_DIR}/test/references/lenscc-reference.vtu
${CMAKE_CURRENT_BINARY_DIR}/2p_mpfa-00008.vtu
--command "${CMAKE_CURRENT_BINARY_DIR}/test_2p_incompressible_mpfa test_2p.input -Problem.Name 2p_mpfa")
set(CMAKE_BUILD_TYPE Release)
......@@ -36,6 +36,5 @@ set(CMAKE_BUILD_TYPE Release)
install(FILES
problem.hh
spatialparams.hh
test_2p_box.cc
test_2p_cc.cc
test_2p_fv.cc
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/test/implicit/2p/incompressible)
......@@ -5,42 +5,42 @@ dune_add_test(SOURCES test_2pni_fv.cc
CMAKE_GUARD dune-uggrid_FOUND
COMPILE_DEFINITIONS GRIDTYPE=Dune::UGGrid<2>
COMPILE_DEFINITIONS TYPETAG=InjectionBoxProblem2PNI
COMMAND python ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
--script fuzzy
--files ${CMAKE_SOURCE_DIR}/test/references/injection2pnibox-simplex-reference.vtu
${CMAKE_CURRENT_BINARY_DIR}/test_2pni_box_simplex-00007.vtu
--command "${CMAKE_CURRENT_BINARY_DIR}/test_2pni_box_simplex test_2pni.input -Problem.Name test_2pni_box_simplex -Grid.CellType Simplex")
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMD_ARGS --script fuzzy
--files ${CMAKE_SOURCE_DIR}/test/references/injection2pnibox-simplex-reference.vtu
${CMAKE_CURRENT_BINARY_DIR}/test_2pni_box_simplex-00007.vtu
--command "${CMAKE_CURRENT_BINARY_DIR}/test_2pni_box_simplex test_2pni.input -Problem.Name test_2pni_box_simplex -Grid.CellType Simplex")
dune_add_test(SOURCES test_2pni_fv.cc
NAME test_2pni_box_cube
COMPILE_DEFINITIONS GRIDTYPE=Dune::YaspGrid<2>
COMPILE_DEFINITIONS TYPETAG=InjectionBoxProblem2PNI
COMMAND python ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
--script fuzzy
--files ${CMAKE_SOURCE_DIR}/test/references/injection2pnibox-cube-reference.vtu
${CMAKE_CURRENT_BINARY_DIR}/test_2pni_box_cube-00007.vtu
--command "${CMAKE_CURRENT_BINARY_DIR}/test_2pni_box_cube test_2pni.input -Problem.Name test_2pni_box_cube")
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMD_ARGS --script fuzzy
--files ${CMAKE_SOURCE_DIR}/test/references/injection2pnibox-cube-reference.vtu
${CMAKE_CURRENT_BINARY_DIR}/test_2pni_box_cube-00007.vtu
--command "${CMAKE_CURRENT_BINARY_DIR}/test_2pni_box_cube test_2pni.input -Problem.Name test_2pni_box_cube")
dune_add_test(SOURCES test_2pni_fv.cc
NAME test_2pni_tpfa_simplex
CMAKE_GUARD dune-uggrid_FOUND
COMPILE_DEFINITIONS GRIDTYPE=Dune::UGGrid<2>
COMPILE_DEFINITIONS TYPETAG=InjectionCCProblem2PNI
COMMAND python ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
--script fuzzy
--files ${CMAKE_SOURCE_DIR}/test/references/injection2pnicc-simplex-reference.vtu
${CMAKE_CURRENT_BINARY_DIR}/test_2pni_tpfa_simplex-00008.vtu
--command "${CMAKE_CURRENT_BINARY_DIR}/test_2pni_tpfa_simplex test_2pni.input -Problem.Name test_2pni_tpfa_simplex -Grid.CellType Simplex")
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMD_ARGS --script fuzzy
--files ${CMAKE_SOURCE_DIR}/test/references/injection2pnicc-simplex-reference.vtu
${CMAKE_CURRENT_BINARY_DIR}/test_2pni_tpfa_simplex-00008.vtu
--command "${CMAKE_CURRENT_BINARY_DIR}/test_2pni_tpfa_simplex test_2pni.input -Problem.Name test_2pni_tpfa_simplex -Grid.CellType Simplex")
dune_add_test(SOURCES test_2pni_fv.cc
NAME test_2pni_tpfa_cube
COMPILE_DEFINITIONS GRIDTYPE=Dune::YaspGrid<2>
COMPILE_DEFINITIONS TYPETAG=InjectionCCProblem2PNI
COMMAND python ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
--script fuzzy
--files ${CMAKE_SOURCE_DIR}/test/references/injection2pnicc-cube-reference.vtu
${CMAKE_CURRENT_BINARY_DIR}/test_2pni_tpfa_cube-00008.vtu
--command "${CMAKE_CURRENT_BINARY_DIR}/test_2pni_tpfa_cube test_2pni.input -Problem.Name test_2pni_tpfa_cube")
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMD_ARGS --script fuzzy
--files ${CMAKE_SOURCE_DIR}/test/references/injection2pnicc-cube-reference.vtu
${CMAKE_CURRENT_BINARY_DIR}/test_2pni_tpfa_cube-00008.vtu
--command "${CMAKE_CURRENT_BINARY_DIR}/test_2pni_tpfa_cube test_2pni.input -Problem.Name test_2pni_tpfa_cube")
set(CMAKE_BUILD_TYPE Release)
......@@ -49,6 +49,5 @@ set(CMAKE_BUILD_TYPE Release)
install(FILES
problem.hh
spatialparams.hh
test_2pni_box.cc
test_2pni_cc.cc
test_2pni_fv.cc
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/test/implicit/2p/nonisothermal)
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