From 317dc0be109bff3a0ba6ee80b97bc21a43d2619d Mon Sep 17 00:00:00 2001 From: Timo Koch <timo.koch@iws.uni-stuttgart.de> Date: Fri, 18 Oct 2019 12:03:34 +0200 Subject: [PATCH] [cmake] Use dumux_add_test for backwards-compatibility with dune 2.6.0 --- examples/1ptracer/CMakeLists.txt | 22 +-- examples/2pinfiltration/CMakeLists.txt | 18 +- examples/shallowwaterfriction/CMakeLists.txt | 18 +- test/common/CMakeLists.txt | 2 +- test/common/boundingboxtree/CMakeLists.txt | 8 +- test/common/functions/CMakeLists.txt | 2 +- test/common/geometry/CMakeLists.txt | 16 +- test/common/math/CMakeLists.txt | 2 +- test/common/parameters/CMakeLists.txt | 2 +- test/common/propertysystem/CMakeLists.txt | 4 +- test/common/spline/CMakeLists.txt | 6 +- test/common/timeloop/CMakeLists.txt | 2 +- test/common/typetraits/CMakeLists.txt | 2 +- test/discretization/box/CMakeLists.txt | 4 +- .../cellcentered/tpfa/CMakeLists.txt | 8 +- test/discretization/projection/CMakeLists.txt | 2 +- .../rotationsymmetry/CMakeLists.txt | 4 +- test/discretization/staggered/CMakeLists.txt | 4 +- .../navierstokes/angeli/CMakeLists.txt | 2 +- .../navierstokes/channel/1d/CMakeLists.txt | 2 +- .../navierstokes/channel/2d/CMakeLists.txt | 14 +- .../navierstokes/channel/3d/CMakeLists.txt | 4 +- .../navierstokes/closedsystem/CMakeLists.txt | 6 +- .../navierstokes/donea/CMakeLists.txt | 4 +- .../navierstokes/kovasznay/CMakeLists.txt | 4 +- .../navierstokes/sincos/CMakeLists.txt | 4 +- .../navierstokesnc/channel/CMakeLists.txt | 12 +- .../densitydrivenflow/CMakeLists.txt | 2 +- .../maxwellstefan/CMakeLists.txt | 2 +- test/freeflow/rans/CMakeLists.txt | 24 +-- test/freeflow/ransnc/CMakeLists.txt | 24 +-- .../shallowwater/dambreak/CMakeLists.txt | 2 +- .../shallowwater/roughchannel/CMakeLists.txt | 2 +- test/geomechanics/elastic/CMakeLists.txt | 2 +- test/geomechanics/poroelastic/CMakeLists.txt | 2 +- test/io/container/CMakeLists.txt | 2 +- test/io/gnuplotinterface/CMakeLists.txt | 2 +- test/io/gridmanager/CMakeLists.txt | 166 +++++++++--------- test/io/rasterimagereader/CMakeLists.txt | 2 +- test/io/vtk/CMakeLists.txt | 14 +- .../binarycoefficients/CMakeLists.txt | 2 +- test/material/components/CMakeLists.txt | 42 ++--- .../compositionalflash/CMakeLists.txt | 2 +- .../fluidmatrixinteractions/2p/CMakeLists.txt | 4 +- .../fluidmatrixinteractions/CMakeLists.txt | 4 +- test/material/fluidsystems/CMakeLists.txt | 2 +- test/material/immiscibleflash/CMakeLists.txt | 2 +- test/material/ncpflash/CMakeLists.txt | 2 +- test/material/pengrobinson/CMakeLists.txt | 2 +- test/material/solidsystems/CMakeLists.txt | 2 +- test/material/tabulation/CMakeLists.txt | 2 +- .../boundary/darcydarcy/1p_1p/CMakeLists.txt | 4 +- .../boundary/darcydarcy/1p_2p/CMakeLists.txt | 2 +- .../stokesdarcy/1p2c_1p2c/CMakeLists.txt | 6 +- .../diffusionlawcomparison/CMakeLists.txt | 4 +- .../stokesdarcy/1p2c_2p2c/CMakeLists.txt | 4 +- .../stokesdarcy/1p3c_1p3c/CMakeLists.txt | 2 +- .../boundary/stokesdarcy/1p_1p/CMakeLists.txt | 4 +- .../boundary/stokesdarcy/1p_2p/CMakeLists.txt | 2 +- .../1d3d/1p2c_richards2c/CMakeLists.txt | 2 +- .../embedded/1d3d/1p_1p/CMakeLists.txt | 14 +- .../embedded/1d3d/1p_richards/CMakeLists.txt | 4 +- .../embedded/2d3d/1p_1p/CMakeLists.txt | 4 +- .../facet/1p_1p/analytical/CMakeLists.txt | 4 +- .../facet/1p_1p/gravity/CMakeLists.txt | 8 +- .../facet/1p_1p/linearprofile/CMakeLists.txt | 12 +- .../facet/1p_1p/threedomain/CMakeLists.txt | 6 +- test/multidomain/facet/CMakeLists.txt | 24 +-- .../facet/tracer_tracer/CMakeLists.txt | 6 +- .../poromechanics/el1p/CMakeLists.txt | 2 +- .../poromechanics/el2p/CMakeLists.txt | 2 +- .../compressible/instationary/CMakeLists.txt | 6 +- .../compressible/stationary/CMakeLists.txt | 6 +- .../1p/implicit/convergence/CMakeLists.txt | 8 +- .../1p/implicit/fracture2d3d/CMakeLists.txt | 6 +- .../1p/implicit/incompressible/CMakeLists.txt | 22 +-- .../implicit/internaldirichlet/CMakeLists.txt | 4 +- .../1p/implicit/isothermal/CMakeLists.txt | 10 +- .../1p/implicit/network1d3d/CMakeLists.txt | 4 +- .../1p/implicit/nonisothermal/CMakeLists.txt | 12 +- .../1p/implicit/periodicbc/CMakeLists.txt | 10 +- .../pointsources/timedependent/CMakeLists.txt | 2 +- .../timeindependent/CMakeLists.txt | 8 +- .../1p/sequential/CMakeLists.txt | 6 +- .../implicit/1p2c/isothermal/CMakeLists.txt | 6 +- .../saltwaterintrusion/CMakeLists.txt | 2 +- .../nonisothermal/conduction/CMakeLists.txt | 6 +- .../nonisothermal/convection/CMakeLists.txt | 6 +- .../nonisothermal/transientbc/CMakeLists.txt | 12 +- .../1pnc/implicit/1p3c/CMakeLists.txt | 4 +- .../implicit/nonequilibrium/CMakeLists.txt | 4 +- .../implicit/nonisothermal/CMakeLists.txt | 2 +- .../2p/implicit/adaptive/CMakeLists.txt | 8 +- .../2p/implicit/boxdfm/CMakeLists.txt | 12 +- .../2p/implicit/cornerpoint/CMakeLists.txt | 2 +- .../2p/implicit/fracture/CMakeLists.txt | 12 +- .../2p/implicit/incompressible/CMakeLists.txt | 12 +- .../2p/implicit/nonisothermal/CMakeLists.txt | 8 +- .../2p/sequential/CMakeLists.txt | 30 ++-- .../2p1c/implicit/CMakeLists.txt | 8 +- .../chemicalnonequilibrium/CMakeLists.txt | 4 +- .../2p2c/implicit/injection/CMakeLists.txt | 14 +- .../implicit/mpnccomparison/CMakeLists.txt | 4 +- .../2p2c/implicit/waterair/CMakeLists.txt | 6 +- .../2p2c/sequential/CMakeLists.txt | 8 +- .../2pnc/implicit/diffusion/CMakeLists.txt | 4 +- .../2pnc/implicit/fuelcell/CMakeLists.txt | 6 +- .../implicit/isothermal/CMakeLists.txt | 6 +- .../implicit/nonisothermal/CMakeLists.txt | 4 +- .../3p/implicit/conduction/CMakeLists.txt | 4 +- .../3p/implicit/convection/CMakeLists.txt | 4 +- .../3p/implicit/infiltration/CMakeLists.txt | 4 +- .../3p3c/implicit/columnxylol/CMakeLists.txt | 4 +- .../3p3c/implicit/infiltration/CMakeLists.txt | 4 +- .../3p3c/implicit/kuevette/CMakeLists.txt | 4 +- .../3pwateroil/implicit/CMakeLists.txt | 2 +- .../co2/implicit/CMakeLists.txt | 8 +- .../implicit/2p2ccomparison/CMakeLists.txt | 4 +- .../mpnc/implicit/kinetic/CMakeLists.txt | 2 +- .../mpnc/implicit/obstacle/CMakeLists.txt | 4 +- .../thermalnonequilibrium/CMakeLists.txt | 2 +- .../implicit/analytical/CMakeLists.txt | 2 +- .../richards/implicit/lens/CMakeLists.txt | 24 +-- .../nonisothermal/conduction/CMakeLists.txt | 4 +- .../nonisothermal/convection/CMakeLists.txt | 4 +- .../nonisothermal/evaporation/CMakeLists.txt | 4 +- .../richardsnc/implicit/CMakeLists.txt | 4 +- .../solidenergy/CMakeLists.txt | 2 +- .../tracer/1ptracer/CMakeLists.txt | 2 +- .../tracer/2ptracer/CMakeLists.txt | 2 +- .../tracer/constvel/CMakeLists.txt | 12 +- .../tracer/multicomp/CMakeLists.txt | 4 +- 132 files changed, 505 insertions(+), 505 deletions(-) diff --git a/examples/1ptracer/CMakeLists.txt b/examples/1ptracer/CMakeLists.txt index 11f0dca3d7..cba2cf6f2f 100644 --- a/examples/1ptracer/CMakeLists.txt +++ b/examples/1ptracer/CMakeLists.txt @@ -1,13 +1,13 @@ dune_symlink_to_source_files(FILES "params.input") -dune_add_test(NAME example_1ptracer - LABELS porousmediumflow tracer - SOURCES main.cc - CMAKE_GUARD HAVE_UMFPACK - COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py - CMD_ARGS --script fuzzy - --files ${CMAKE_SOURCE_DIR}/test/references/test_1ptracer_transport-reference.vtu - ${CMAKE_CURRENT_BINARY_DIR}/example_1ptracer-00010.vtu - ${CMAKE_SOURCE_DIR}/test/references/test_1ptracer_pressure-reference.vtu - ${CMAKE_CURRENT_BINARY_DIR}/1p.vtu - --command "${CMAKE_CURRENT_BINARY_DIR}/example_1ptracer params.input -Problem.Name example_1ptracer") +dumux_add_test(NAME example_1ptracer + LABELS porousmediumflow tracer + SOURCES main.cc + CMAKE_GUARD HAVE_UMFPACK + COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py + CMD_ARGS --script fuzzy + --files ${CMAKE_SOURCE_DIR}/test/references/test_1ptracer_transport-reference.vtu + ${CMAKE_CURRENT_BINARY_DIR}/example_1ptracer-00010.vtu + ${CMAKE_SOURCE_DIR}/test/references/test_1ptracer_pressure-reference.vtu + ${CMAKE_CURRENT_BINARY_DIR}/1p.vtu + --command "${CMAKE_CURRENT_BINARY_DIR}/example_1ptracer params.input -Problem.Name example_1ptracer") diff --git a/examples/2pinfiltration/CMakeLists.txt b/examples/2pinfiltration/CMakeLists.txt index e85a549796..9b31e4ca89 100644 --- a/examples/2pinfiltration/CMakeLists.txt +++ b/examples/2pinfiltration/CMakeLists.txt @@ -2,12 +2,12 @@ dune_symlink_to_source_files(FILES "params.input") dune_symlink_to_source_files(FILES "initialsolutioncc.txt") # using tpfa and point source -dune_add_test(NAME example_2p_pointsource_adaptive - LABELS porousmediumflow 2p - SOURCES main.cc - CMAKE_GUARD dune-alugrid_FOUND - COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py - CMD_ARGS --script fuzzy - --files ${CMAKE_SOURCE_DIR}/test/references/example-2padaptive-reference.vtu - ${CMAKE_CURRENT_BINARY_DIR}/example_2p_pointsource_adaptive-00007.vtu - --command "${CMAKE_CURRENT_BINARY_DIR}/example_2p_pointsource_adaptive params.input -TimeLoop.TEnd 100 -TimeLoop.DtInitial 10 -Problem.Name example_2p_pointsource_adaptive") +dumux_add_test(NAME example_2p_pointsource_adaptive + LABELS porousmediumflow 2p + SOURCES main.cc + CMAKE_GUARD dune-alugrid_FOUND + COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py + CMD_ARGS --script fuzzy + --files ${CMAKE_SOURCE_DIR}/test/references/example-2padaptive-reference.vtu + ${CMAKE_CURRENT_BINARY_DIR}/example_2p_pointsource_adaptive-00007.vtu + --command "${CMAKE_CURRENT_BINARY_DIR}/example_2p_pointsource_adaptive params.input -TimeLoop.TEnd 100 -TimeLoop.DtInitial 10 -Problem.Name example_2p_pointsource_adaptive") diff --git a/examples/shallowwaterfriction/CMakeLists.txt b/examples/shallowwaterfriction/CMakeLists.txt index dedc4d0a59..a87dbb5a99 100644 --- a/examples/shallowwaterfriction/CMakeLists.txt +++ b/examples/shallowwaterfriction/CMakeLists.txt @@ -1,11 +1,11 @@ dune_symlink_to_source_files(FILES "params.input") -dune_add_test(NAME example_shallowwaterfriction - SOURCES main.cc - COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py - CMD_ARGS --script fuzzy - --files ${CMAKE_SOURCE_DIR}/test/references/example_shallowwaterfriction-reference.vtu - ${CMAKE_CURRENT_BINARY_DIR}/example_shallowwaterfriction-00001.vtu - --zeroThreshold {"velocityY":1e-14} - --command "${CMAKE_CURRENT_BINARY_DIR}/example_shallowwaterfriction params.input - -Problem.Name example_shallowwaterfriction") +dumux_add_test(NAME example_shallowwaterfriction + SOURCES main.cc + COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py + CMD_ARGS --script fuzzy + --files ${CMAKE_SOURCE_DIR}/test/references/example_shallowwaterfriction-reference.vtu + ${CMAKE_CURRENT_BINARY_DIR}/example_shallowwaterfriction-00001.vtu + --zeroThreshold {"velocityY":1e-14} + --command "${CMAKE_CURRENT_BINARY_DIR}/example_shallowwaterfriction params.input + -Problem.Name example_shallowwaterfriction") diff --git a/test/common/CMakeLists.txt b/test/common/CMakeLists.txt index 06908ceacc..96a770ad97 100644 --- a/test/common/CMakeLists.txt +++ b/test/common/CMakeLists.txt @@ -8,4 +8,4 @@ add_subdirectory(spline) add_subdirectory(timeloop) add_subdirectory(typetraits) -dune_add_test(SOURCES test_partial.cc) +dumux_add_test(SOURCES test_partial.cc) diff --git a/test/common/boundingboxtree/CMakeLists.txt b/test/common/boundingboxtree/CMakeLists.txt index acc51925f9..45660e2e21 100644 --- a/test/common/boundingboxtree/CMakeLists.txt +++ b/test/common/boundingboxtree/CMakeLists.txt @@ -1,20 +1,20 @@ # build the tests for the bounding box tree -dune_add_test(NAME test_bboxtree_dim1 +dumux_add_test(NAME test_bboxtree_dim1 SOURCES test_bboxtree.cc COMPILE_DEFINITIONS WORLD_DIMENSION=1 LABELS unit) -dune_add_test(NAME test_bboxtree_dim2 +dumux_add_test(NAME test_bboxtree_dim2 SOURCES test_bboxtree.cc COMPILE_DEFINITIONS WORLD_DIMENSION=2 LABELS unit) -dune_add_test(NAME test_bboxtree_dim3 +dumux_add_test(NAME test_bboxtree_dim3 SOURCES test_bboxtree.cc COMPILE_DEFINITIONS WORLD_DIMENSION=3 LABELS unit) -dune_add_test(NAME test_geometry_fracture +dumux_add_test(NAME test_geometry_fracture SOURCES test_geometry_fracture.cc CMAKE_GUARD dune-foamgrid_FOUND LABELS unit) diff --git a/test/common/functions/CMakeLists.txt b/test/common/functions/CMakeLists.txt index aa9933dd1e..6903af93fd 100644 --- a/test/common/functions/CMakeLists.txt +++ b/test/common/functions/CMakeLists.txt @@ -1,3 +1,3 @@ -dune_add_test(SOURCES test_function_l2norm.cc +dumux_add_test(SOURCES test_function_l2norm.cc CMAKE_GUARD dune-functions_FOUND LABELS unit) diff --git a/test/common/geometry/CMakeLists.txt b/test/common/geometry/CMakeLists.txt index 28f60e2606..f1b5b270e8 100644 --- a/test/common/geometry/CMakeLists.txt +++ b/test/common/geometry/CMakeLists.txt @@ -1,8 +1,8 @@ -dune_add_test(SOURCES test_0d1d_intersection.cc LABELS unit) -dune_add_test(SOURCES test_1d1d_intersection.cc LABELS unit) -dune_add_test(SOURCES test_1d3d_intersection.cc LABELS unit) -dune_add_test(SOURCES test_1d2d_intersection.cc LABELS unit) -dune_add_test(SOURCES test_2d2d_intersection.cc LABELS unit) -dune_add_test(SOURCES test_2d3d_intersection.cc LABELS unit) -dune_add_test(SOURCES test_graham_convex_hull.cc LABELS unit) -dune_add_test(SOURCES test_makegeometry.cc LABELS unit) +dumux_add_test(SOURCES test_0d1d_intersection.cc LABELS unit) +dumux_add_test(SOURCES test_1d1d_intersection.cc LABELS unit) +dumux_add_test(SOURCES test_1d3d_intersection.cc LABELS unit) +dumux_add_test(SOURCES test_1d2d_intersection.cc LABELS unit) +dumux_add_test(SOURCES test_2d2d_intersection.cc LABELS unit) +dumux_add_test(SOURCES test_2d3d_intersection.cc LABELS unit) +dumux_add_test(SOURCES test_graham_convex_hull.cc LABELS unit) +dumux_add_test(SOURCES test_makegeometry.cc LABELS unit) diff --git a/test/common/math/CMakeLists.txt b/test/common/math/CMakeLists.txt index 1054e19998..dca80ec4cb 100644 --- a/test/common/math/CMakeLists.txt +++ b/test/common/math/CMakeLists.txt @@ -1,3 +1,3 @@ # build the test for the math header -dune_add_test(SOURCES test_math.cc +dumux_add_test(SOURCES test_math.cc LABELS unit) diff --git a/test/common/parameters/CMakeLists.txt b/test/common/parameters/CMakeLists.txt index 4d686f1d37..a69c776a62 100644 --- a/test/common/parameters/CMakeLists.txt +++ b/test/common/parameters/CMakeLists.txt @@ -1,3 +1,3 @@ -dune_add_test(SOURCES test_loggingparametertree.cc +dumux_add_test(SOURCES test_loggingparametertree.cc LABELS unit) dune_symlink_to_source_files(FILES "params.input") diff --git a/test/common/propertysystem/CMakeLists.txt b/test/common/propertysystem/CMakeLists.txt index 3164569102..b00536eafd 100644 --- a/test/common/propertysystem/CMakeLists.txt +++ b/test/common/propertysystem/CMakeLists.txt @@ -1,6 +1,6 @@ # build the test for the property system -dune_add_test(SOURCES test_propertysystem.cc +dumux_add_test(SOURCES test_propertysystem.cc LABELS unit) # build the test for the property system using the old macros (deprecated) -dune_add_test(SOURCES test_propertysystem_macros.cc +dumux_add_test(SOURCES test_propertysystem_macros.cc LABELS unit) diff --git a/test/common/spline/CMakeLists.txt b/test/common/spline/CMakeLists.txt index 3231fcdb25..9e2cbccfe1 100644 --- a/test/common/spline/CMakeLists.txt +++ b/test/common/spline/CMakeLists.txt @@ -1,6 +1,6 @@ -dune_add_test(SOURCES test_spline.cc +dumux_add_test(SOURCES test_spline.cc LABELS unit) -dune_add_test(SOURCES test_cubicspline.cc +dumux_add_test(SOURCES test_cubicspline.cc LABELS unit) -dune_add_test(SOURCES test_monotonecubicspline.cc +dumux_add_test(SOURCES test_monotonecubicspline.cc LABELS unit) diff --git a/test/common/timeloop/CMakeLists.txt b/test/common/timeloop/CMakeLists.txt index b22b3eeecb..f7053d872f 100644 --- a/test/common/timeloop/CMakeLists.txt +++ b/test/common/timeloop/CMakeLists.txt @@ -1,2 +1,2 @@ -dune_add_test(SOURCES test_timeloop.cc +dumux_add_test(SOURCES test_timeloop.cc LABELS unit) diff --git a/test/common/typetraits/CMakeLists.txt b/test/common/typetraits/CMakeLists.txt index 2b0fd00239..550f110457 100644 --- a/test/common/typetraits/CMakeLists.txt +++ b/test/common/typetraits/CMakeLists.txt @@ -1,2 +1,2 @@ -dune_add_test(SOURCES test_isvalid.cc +dumux_add_test(SOURCES test_isvalid.cc LABELS unit) diff --git a/test/discretization/box/CMakeLists.txt b/test/discretization/box/CMakeLists.txt index 76b49c6705..f2ad7070ff 100644 --- a/test/discretization/box/CMakeLists.txt +++ b/test/discretization/box/CMakeLists.txt @@ -1,9 +1,9 @@ -dune_add_test(NAME test_boxfvgeometry +dumux_add_test(NAME test_boxfvgeometry SOURCES test_boxfvgeometry.cc COMPILE_DEFINITIONS ENABLE_CACHING=false LABELS unit discretization) -dune_add_test(NAME test_boxfvgeometry_caching +dumux_add_test(NAME test_boxfvgeometry_caching SOURCES test_boxfvgeometry.cc COMPILE_DEFINITIONS ENABLE_CACHING=true LABELS unit discretization) diff --git a/test/discretization/cellcentered/tpfa/CMakeLists.txt b/test/discretization/cellcentered/tpfa/CMakeLists.txt index 3acfe25990..8cfd8de84b 100644 --- a/test/discretization/cellcentered/tpfa/CMakeLists.txt +++ b/test/discretization/cellcentered/tpfa/CMakeLists.txt @@ -1,20 +1,20 @@ -dune_add_test(NAME test_tpfafvgeometry +dumux_add_test(NAME test_tpfafvgeometry SOURCES test_tpfafvgeometry.cc COMPILE_DEFINITIONS ENABLE_CACHING=false LABELS unit discretization) -dune_add_test(NAME test_tpfafvgeometry_caching +dumux_add_test(NAME test_tpfafvgeometry_caching SOURCES test_tpfafvgeometry.cc COMPILE_DEFINITIONS ENABLE_CACHING=true LABELS unit discretization) -dune_add_test(NAME test_tpfafvgeometry_nonconforming +dumux_add_test(NAME test_tpfafvgeometry_nonconforming SOURCES test_tpfafvgeometry_nonconforming.cc COMPILE_DEFINITIONS ENABLE_CACHING=false CMAKE_GUARD dune-alugrid_FOUND LABELS unit discretization) -dune_add_test(NAME test_cachedtpfafvgeometry_nonconforming +dumux_add_test(NAME test_cachedtpfafvgeometry_nonconforming SOURCES test_tpfafvgeometry_nonconforming.cc COMPILE_DEFINITIONS ENABLE_CACHING=true CMAKE_GUARD dune-alugrid_FOUND diff --git a/test/discretization/projection/CMakeLists.txt b/test/discretization/projection/CMakeLists.txt index 82408a450a..6a2c731827 100644 --- a/test/discretization/projection/CMakeLists.txt +++ b/test/discretization/projection/CMakeLists.txt @@ -1,6 +1,6 @@ dune_symlink_to_source_files(FILES "params.input") -dune_add_test(NAME test_projection_2d1d +dumux_add_test(NAME test_projection_2d1d SOURCES test_projection_2d1d.cc CMAKE_GUARD "( dune-foamgrid_FOUND AND dune-functions_FOUND )" LABELS unit discretization) diff --git a/test/discretization/rotationsymmetry/CMakeLists.txt b/test/discretization/rotationsymmetry/CMakeLists.txt index a8237b6285..f5d6c7dc71 100644 --- a/test/discretization/rotationsymmetry/CMakeLists.txt +++ b/test/discretization/rotationsymmetry/CMakeLists.txt @@ -1,2 +1,2 @@ -dune_add_test(SOURCES test_rotationsymmetric_gridgeometry.cc - LABELS unit discretization) +dumux_add_test(SOURCES test_rotationsymmetric_gridgeometry.cc + LABELS unit discretization) diff --git a/test/discretization/staggered/CMakeLists.txt b/test/discretization/staggered/CMakeLists.txt index 880e2afe20..3a97bfbc52 100644 --- a/test/discretization/staggered/CMakeLists.txt +++ b/test/discretization/staggered/CMakeLists.txt @@ -1,9 +1,9 @@ dune_symlink_to_source_files(FILES "params.input") -dune_add_test(NAME test_staggeredfvgeometry +dumux_add_test(NAME test_staggeredfvgeometry SOURCES test_staggeredfvgeometry.cc LABELS unit discretization) -dune_add_test(NAME test_staggered_free_flow_geometry +dumux_add_test(NAME test_staggered_free_flow_geometry SOURCES test_staggered_free_flow_geometry.cc LABELS unit discretization) diff --git a/test/freeflow/navierstokes/angeli/CMakeLists.txt b/test/freeflow/navierstokes/angeli/CMakeLists.txt index e882aeb795..8e6f9c91a6 100644 --- a/test/freeflow/navierstokes/angeli/CMakeLists.txt +++ b/test/freeflow/navierstokes/angeli/CMakeLists.txt @@ -1,4 +1,4 @@ -dune_add_test(NAME test_ff_navierstokes_angeli +dumux_add_test(NAME test_ff_navierstokes_angeli LABELS freeflow navierstokes SOURCES main.cc CMAKE_GUARD HAVE_UMFPACK diff --git a/test/freeflow/navierstokes/channel/1d/CMakeLists.txt b/test/freeflow/navierstokes/channel/1d/CMakeLists.txt index 90b3ccc8e1..3a736323d1 100644 --- a/test/freeflow/navierstokes/channel/1d/CMakeLists.txt +++ b/test/freeflow/navierstokes/channel/1d/CMakeLists.txt @@ -1,4 +1,4 @@ -dune_add_test(NAME test_ff_navierstokes_1d +dumux_add_test(NAME test_ff_navierstokes_1d LABELS freeflow navierstokes SOURCES main.cc CMAKE_GUARD HAVE_UMFPACK diff --git a/test/freeflow/navierstokes/channel/2d/CMakeLists.txt b/test/freeflow/navierstokes/channel/2d/CMakeLists.txt index 9ed47e24a9..79f70cdf3d 100644 --- a/test/freeflow/navierstokes/channel/2d/CMakeLists.txt +++ b/test/freeflow/navierstokes/channel/2d/CMakeLists.txt @@ -2,7 +2,7 @@ dune_symlink_to_source_files(FILES "params.input" "params_navierstokes.input" "p add_executable(test_ff_channel EXCLUDE_FROM_ALL main.cc) -dune_add_test(NAME test_ff_stokes_channel_outflow +dumux_add_test(NAME test_ff_stokes_channel_outflow TARGET test_ff_channel LABELS freeflow navierstokes CMAKE_GUARD HAVE_UMFPACK @@ -13,7 +13,7 @@ dune_add_test(NAME test_ff_stokes_channel_outflow --command "${CMAKE_CURRENT_BINARY_DIR}/test_ff_channel params.input -Problem.OutletCondition Outflow -Problem.Name test_ff_stokes_channel_outflow") -dune_add_test(NAME test_ff_stokes_channel_neumann_x_dirichlet_y +dumux_add_test(NAME test_ff_stokes_channel_neumann_x_dirichlet_y TARGET test_ff_channel LABELS freeflow navierstokes CMAKE_GUARD HAVE_UMFPACK @@ -24,7 +24,7 @@ dune_add_test(NAME test_ff_stokes_channel_neumann_x_dirichlet_y --command "${CMAKE_CURRENT_BINARY_DIR}/test_ff_channel params.input -Problem.OutletCondition NeumannX_DirichletY -Problem.Name test_ff_stokes_channel_nxdy") -dune_add_test(NAME test_ff_stokes_channel_neumann_x_neumann_y +dumux_add_test(NAME test_ff_stokes_channel_neumann_x_neumann_y TARGET test_ff_channel LABELS freeflow navierstokes CMAKE_GUARD HAVE_UMFPACK @@ -35,7 +35,7 @@ dune_add_test(NAME test_ff_stokes_channel_neumann_x_neumann_y --command "${CMAKE_CURRENT_BINARY_DIR}/test_ff_channel params.input -Grid.UpperRight \"2 1\" -Grid.Cells \"50 25\" -Problem.Name test_ff_stokes_channel_nxny -Problem.OutletCondition NeumannX_NeumannY -Problem.UseVelocityProfile true -Problem.OutletPressure 0") -dune_add_test(NAME test_ff_stokes_channel_do_nothing +dumux_add_test(NAME test_ff_stokes_channel_do_nothing TARGET test_ff_channel LABELS freeflow navierstokes CMAKE_GUARD HAVE_UMFPACK @@ -46,7 +46,7 @@ dune_add_test(NAME test_ff_stokes_channel_do_nothing --command "${CMAKE_CURRENT_BINARY_DIR}/test_ff_channel params.input -Problem.OutletCondition DoNothing -Grid.UpperRight \"2 1\" -Grid.Cells \"50 25\" -Problem.Name test_ff_stokes_channel_do_nothing -Problem.OutletCondition DoNothing -Problem.UseVelocityProfile true -Problem.OutletPressure 0") -dune_add_test(NAME test_ff_navierstokes_channel +dumux_add_test(NAME test_ff_navierstokes_channel TARGET test_ff_channel LABELS freeflow navierstokes CMAKE_GUARD HAVE_UMFPACK @@ -61,7 +61,7 @@ dune_add_test(NAME test_ff_navierstokes_channel add_executable(test_ff_stokesni_channel EXCLUDE_FROM_ALL main.cc) target_compile_definitions(test_ff_stokesni_channel PUBLIC "NONISOTHERMAL=1") -dune_add_test(NAME test_ff_stokesni_channel_convection +dumux_add_test(NAME test_ff_stokesni_channel_convection TARGET test_ff_stokesni_channel LABELS freeflow navierstokes CMAKE_GUARD HAVE_UMFPACK @@ -72,7 +72,7 @@ dune_add_test(NAME test_ff_stokesni_channel_convection --command "${CMAKE_CURRENT_BINARY_DIR}/test_ff_stokesni_channel params_convection.input -Problem.Name test_ff_stokesni_channel_convection") -dune_add_test(NAME test_ff_stokesni_channel_conduction +dumux_add_test(NAME test_ff_stokesni_channel_conduction TARGET test_ff_stokesni_channel LABELS freeflow navierstokes CMAKE_GUARD HAVE_UMFPACK diff --git a/test/freeflow/navierstokes/channel/3d/CMakeLists.txt b/test/freeflow/navierstokes/channel/3d/CMakeLists.txt index ab06fb4cd5..3e572be571 100644 --- a/test/freeflow/navierstokes/channel/3d/CMakeLists.txt +++ b/test/freeflow/navierstokes/channel/3d/CMakeLists.txt @@ -1,4 +1,4 @@ -dune_add_test(NAME test_ff_stokes_channel_3d +dumux_add_test(NAME test_ff_stokes_channel_3d LABELS freeflow navierstokes SOURCES main.cc LABELS freeflow @@ -12,7 +12,7 @@ dune_add_test(NAME test_ff_stokes_channel_3d -Problem.Name test_ff_stokes_channel_3d" --zeroThreshold {"velocity_liq \(m/s\)":1e-12}) -dune_add_test(NAME test_ff_stokes_channel_pseudo3d +dumux_add_test(NAME test_ff_stokes_channel_pseudo3d LABELS freeflow navierstokes SOURCES main.cc LABELS freeflow diff --git a/test/freeflow/navierstokes/closedsystem/CMakeLists.txt b/test/freeflow/navierstokes/closedsystem/CMakeLists.txt index 3bbeb20f2f..9365dec7d0 100644 --- a/test/freeflow/navierstokes/closedsystem/CMakeLists.txt +++ b/test/freeflow/navierstokes/closedsystem/CMakeLists.txt @@ -1,6 +1,6 @@ add_executable(test_ff_navierstokes_closedsystem EXCLUDE_FROM_ALL main.cc) -dune_add_test(NAME test_ff_navierstokes_closedsystem_ldc_re1 +dumux_add_test(NAME test_ff_navierstokes_closedsystem_ldc_re1 TARGET test_ff_navierstokes_closedsystem LABELS freeflow navierstokes CMAKE_GUARD HAVE_UMFPACK @@ -11,7 +11,7 @@ dune_add_test(NAME test_ff_navierstokes_closedsystem_ldc_re1 --command "${CMAKE_CURRENT_BINARY_DIR}/test_ff_navierstokes_closedsystem params_re1.input -Problem.Name test_ff_navierstokes_closedsystem_ldc_re1") -dune_add_test(NAME test_ff_navierstokes_closedsystem_ldc_re1000 +dumux_add_test(NAME test_ff_navierstokes_closedsystem_ldc_re1000 TARGET test_ff_navierstokes_closedsystem LABELS freeflow navierstokes CMAKE_GUARD HAVE_UMFPACK @@ -22,7 +22,7 @@ dune_add_test(NAME test_ff_navierstokes_closedsystem_ldc_re1000 --command "${CMAKE_CURRENT_BINARY_DIR}/test_ff_navierstokes_closedsystem params_re1000.input -Problem.Name test_ff_navierstokes_closedsystem_ldc_re1000") -dune_add_test(NAME test_ff_navierstokes_closedsystem_hydrostaticpressure +dumux_add_test(NAME test_ff_navierstokes_closedsystem_hydrostaticpressure TARGET test_ff_navierstokes_closedsystem LABELS freeflow navierstokes CMAKE_GUARD HAVE_UMFPACK diff --git a/test/freeflow/navierstokes/donea/CMakeLists.txt b/test/freeflow/navierstokes/donea/CMakeLists.txt index 859d6a1f85..d61d235af3 100644 --- a/test/freeflow/navierstokes/donea/CMakeLists.txt +++ b/test/freeflow/navierstokes/donea/CMakeLists.txt @@ -1,4 +1,4 @@ -dune_add_test(NAME test_ff_stokes_donea_nocaching +dumux_add_test(NAME test_ff_stokes_donea_nocaching LABELS freeflow navierstokes SOURCES main.cc CMAKE_GUARD HAVE_UMFPACK @@ -10,7 +10,7 @@ dune_add_test(NAME test_ff_stokes_donea_nocaching --command "${CMAKE_CURRENT_BINARY_DIR}/test_ff_stokes_donea_nocaching params.input -Problem.Name test_ff_stokes_donea_nocaching") -dune_add_test(NAME test_ff_stokes_donea +dumux_add_test(NAME test_ff_stokes_donea LABELS freeflow navierstokes SOURCES main.cc CMAKE_GUARD HAVE_UMFPACK diff --git a/test/freeflow/navierstokes/kovasznay/CMakeLists.txt b/test/freeflow/navierstokes/kovasznay/CMakeLists.txt index 6d46e035ac..e5bbb76d93 100644 --- a/test/freeflow/navierstokes/kovasznay/CMakeLists.txt +++ b/test/freeflow/navierstokes/kovasznay/CMakeLists.txt @@ -1,4 +1,4 @@ -dune_add_test(NAME test_ff_navierstokes_kovasznay +dumux_add_test(NAME test_ff_navierstokes_kovasznay LABELS freeflow navierstokes SOURCES main.cc CMAKE_GUARD HAVE_UMFPACK @@ -10,7 +10,7 @@ dune_add_test(NAME test_ff_navierstokes_kovasznay --command "${CMAKE_CURRENT_BINARY_DIR}/test_ff_navierstokes_kovasznay params.input -Problem.Name test_ff_navierstokes_kovasznay") -dune_add_test(NAME test_ff_navierstokes_kovasznay_higherorder +dumux_add_test(NAME test_ff_navierstokes_kovasznay_higherorder SOURCES main.cc LABELS freeflow navierstokes CMAKE_GUARD HAVE_UMFPACK diff --git a/test/freeflow/navierstokes/sincos/CMakeLists.txt b/test/freeflow/navierstokes/sincos/CMakeLists.txt index d6c3cd7642..b11ea22701 100644 --- a/test/freeflow/navierstokes/sincos/CMakeLists.txt +++ b/test/freeflow/navierstokes/sincos/CMakeLists.txt @@ -1,7 +1,7 @@ dune_symlink_to_source_files(FILES "convergencetest.py") dune_symlink_to_source_files(FILES "params.input") -dune_add_test(NAME test_ff_navierstokes_sincos +dumux_add_test(NAME test_ff_navierstokes_sincos SOURCES main.cc LABELS freeflow TIMEOUT 1000 @@ -14,7 +14,7 @@ dune_add_test(NAME test_ff_navierstokes_sincos -Problem.IsStationary true -Component.LiquidKinematicViscosity 0.001) -dune_add_test(NAME test_ff_navierstokes_sincos_instationary +dumux_add_test(NAME test_ff_navierstokes_sincos_instationary TARGET test_ff_navierstokes_sincos LABELS freeflow CMAKE_GUARD HAVE_UMFPACK diff --git a/test/freeflow/navierstokesnc/channel/CMakeLists.txt b/test/freeflow/navierstokesnc/channel/CMakeLists.txt index 6cf44fb93f..a09eba5f0e 100644 --- a/test/freeflow/navierstokesnc/channel/CMakeLists.txt +++ b/test/freeflow/navierstokesnc/channel/CMakeLists.txt @@ -3,7 +3,7 @@ dune_symlink_to_source_files(FILES "params_advection.input" "params_diffusion.in add_executable(test_ff_stokes2c_mass EXCLUDE_FROM_ALL main.cc) target_compile_definitions(test_ff_stokes2c_mass PUBLIC "USE_MASS=1") -dune_add_test(NAME test_ff_stokes2c_diffusion_mass +dumux_add_test(NAME test_ff_stokes2c_diffusion_mass TARGET test_ff_stokes2c_mass LABELS freeflow navierstokes CMAKE_GUARD HAVE_UMFPACK @@ -17,7 +17,7 @@ dune_add_test(NAME test_ff_stokes2c_diffusion_mass add_executable(test_ff_stokes2c EXCLUDE_FROM_ALL main.cc) -dune_add_test(NAME test_ff_stokes2c_diffusion_mole +dumux_add_test(NAME test_ff_stokes2c_diffusion_mole TARGET test_ff_stokes2c LABELS freeflow navierstokes CMAKE_GUARD HAVE_UMFPACK @@ -29,7 +29,7 @@ dune_add_test(NAME test_ff_stokes2c_diffusion_mole -Problem.Name test_ff_stokes2c_diffusion_mole" --zeroThreshold {"velocity_liq \(m/s\)":1e-22}) -dune_add_test(NAME test_ff_stokes2c_advection +dumux_add_test(NAME test_ff_stokes2c_advection TARGET test_ff_stokes2c LABELS freeflow navierstokes CMAKE_GUARD HAVE_UMFPACK @@ -40,7 +40,7 @@ dune_add_test(NAME test_ff_stokes2c_advection --command "${CMAKE_CURRENT_BINARY_DIR}/test_ff_stokes2c params_advection.input -Problem.Name test_ff_stokes2c_advection") -dune_add_test(NAME test_ff_stokes2c_advection_nocaching +dumux_add_test(NAME test_ff_stokes2c_advection_nocaching SOURCES main.cc LABELS freeflow navierstokes CMAKE_GUARD HAVE_UMFPACK @@ -55,7 +55,7 @@ dune_add_test(NAME test_ff_stokes2c_advection_nocaching add_executable(test_ff_stokes2cni EXCLUDE_FROM_ALL main.cc) target_compile_definitions(test_ff_stokes2cni PUBLIC "NONISOTHERMAL=1") -dune_add_test(NAME test_ff_stokes2cni_advection +dumux_add_test(NAME test_ff_stokes2cni_advection TARGET test_ff_stokes2cni LABELS freeflow navierstokes CMAKE_GUARD HAVE_UMFPACK @@ -66,7 +66,7 @@ dune_add_test(NAME test_ff_stokes2cni_advection --command "${CMAKE_CURRENT_BINARY_DIR}/test_ff_stokes2cni params_advectionni.input -Problem.Name test_ff_stokes2cni_advection") -dune_add_test(NAME test_ff_stokes2cni_diffusion +dumux_add_test(NAME test_ff_stokes2cni_diffusion TARGET test_ff_stokes2cni LABELS freeflow navierstokes CMAKE_GUARD HAVE_UMFPACK diff --git a/test/freeflow/navierstokesnc/densitydrivenflow/CMakeLists.txt b/test/freeflow/navierstokesnc/densitydrivenflow/CMakeLists.txt index 6d4ac045da..d2c0a1af74 100644 --- a/test/freeflow/navierstokesnc/densitydrivenflow/CMakeLists.txt +++ b/test/freeflow/navierstokesnc/densitydrivenflow/CMakeLists.txt @@ -1,5 +1,5 @@ -dune_add_test(NAME test_ff_stokes2c_densitydrivenflow +dumux_add_test(NAME test_ff_stokes2c_densitydrivenflow LABELS freeflow navierstokes SOURCES main.cc CMAKE_GUARD HAVE_UMFPACK diff --git a/test/freeflow/navierstokesnc/maxwellstefan/CMakeLists.txt b/test/freeflow/navierstokesnc/maxwellstefan/CMakeLists.txt index 1407ddc5d9..1fe76a15d7 100644 --- a/test/freeflow/navierstokesnc/maxwellstefan/CMakeLists.txt +++ b/test/freeflow/navierstokesnc/maxwellstefan/CMakeLists.txt @@ -1,4 +1,4 @@ -dune_add_test(NAME test_ff_stokes2c_maxwellstefan +dumux_add_test(NAME test_ff_stokes2c_maxwellstefan LABELS freeflow navierstokes SOURCES main.cc CMAKE_GUARD HAVE_UMFPACK diff --git a/test/freeflow/rans/CMakeLists.txt b/test/freeflow/rans/CMakeLists.txt index 8ccfb3b6ff..5415334a96 100644 --- a/test/freeflow/rans/CMakeLists.txt +++ b/test/freeflow/rans/CMakeLists.txt @@ -4,7 +4,7 @@ dune_symlink_to_source_files(FILES references scripts) add_executable(test_ff_rans_lauferpipe_kepsilon EXCLUDE_FROM_ALL main.cc) target_compile_definitions(test_ff_rans_lauferpipe_kepsilon PUBLIC "TYPETAG=PipeLauferKEpsilon") -dune_add_test(NAME test_ff_rans_lauferpipe_kepsilon_twolayers +dumux_add_test(NAME test_ff_rans_lauferpipe_kepsilon_twolayers TARGET test_ff_rans_lauferpipe_kepsilon LABELS freeflow rans CMAKE_GUARD HAVE_UMFPACK @@ -16,7 +16,7 @@ dune_add_test(NAME test_ff_rans_lauferpipe_kepsilon_twolayers --command "${CMAKE_CURRENT_BINARY_DIR}/test_ff_rans_lauferpipe_kepsilon params.input -Problem.Name test_ff_rans_lauferpipe_kepsilon_twolayers") -dune_add_test(NAME test_ff_rans_lauferpipe_kepsilon_wallfunction +dumux_add_test(NAME test_ff_rans_lauferpipe_kepsilon_wallfunction TARGET test_ff_rans_lauferpipe_kepsilon LABELS freeflow rans CMAKE_GUARD HAVE_UMFPACK @@ -28,7 +28,7 @@ dune_add_test(NAME test_ff_rans_lauferpipe_kepsilon_wallfunction --command "${CMAKE_CURRENT_BINARY_DIR}/test_ff_rans_lauferpipe_kepsilon params_wallfunction.input -Problem.Name test_ff_rans_lauferpipe_kepsilon_wallfunction") -dune_add_test(NAME test_ff_rans_lauferpipe_lowrekepsilon +dumux_add_test(NAME test_ff_rans_lauferpipe_lowrekepsilon SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=PipeLauferLowReKEpsilon LABELS freeflow rans @@ -40,7 +40,7 @@ dune_add_test(NAME test_ff_rans_lauferpipe_lowrekepsilon --command "${CMAKE_CURRENT_BINARY_DIR}/test_ff_rans_lauferpipe_lowrekepsilon params.input -Problem.Name test_ff_rans_lauferpipe_lowrekepsilon") -dune_add_test(NAME test_ff_rans_lauferpipe_komega +dumux_add_test(NAME test_ff_rans_lauferpipe_komega SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=PipeLauferKOmega LABELS freeflow rans @@ -52,7 +52,7 @@ dune_add_test(NAME test_ff_rans_lauferpipe_komega --command "${CMAKE_CURRENT_BINARY_DIR}/test_ff_rans_lauferpipe_komega params.input -Problem.Name test_ff_rans_lauferpipe_komega") -dune_add_test(NAME test_ff_rans_lauferpipe_oneeq +dumux_add_test(NAME test_ff_rans_lauferpipe_oneeq SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=PipeLauferOneEq LABELS freeflow rans @@ -64,7 +64,7 @@ dune_add_test(NAME test_ff_rans_lauferpipe_oneeq --command "${CMAKE_CURRENT_BINARY_DIR}/test_ff_rans_lauferpipe_oneeq params.input -Problem.Name test_ff_rans_lauferpipe_oneeq") -dune_add_test(NAME test_ff_rans_lauferpipe_zeroeq +dumux_add_test(NAME test_ff_rans_lauferpipe_zeroeq SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=PipeLauferZeroEq LABELS freeflow rans @@ -83,7 +83,7 @@ dune_add_test(NAME test_ff_rans_lauferpipe_zeroeq add_executable(test_ff_ransni_lauferpipe_kepsilon EXCLUDE_FROM_ALL main.cc) target_compile_definitions(test_ff_ransni_lauferpipe_kepsilon PUBLIC "TYPETAG=PipeLauferNIKEpsilon" "NONISOTHERMAL=1") -dune_add_test(NAME test_ff_ransni_lauferpipe_kepsilon_twolayers +dumux_add_test(NAME test_ff_ransni_lauferpipe_kepsilon_twolayers TARGET test_ff_ransni_lauferpipe_kepsilon LABELS freeflow rans CMAKE_GUARD HAVE_UMFPACK @@ -95,7 +95,7 @@ dune_add_test(NAME test_ff_ransni_lauferpipe_kepsilon_twolayers --command "${CMAKE_CURRENT_BINARY_DIR}/test_ff_ransni_lauferpipe_kepsilon params_nonisothermal.input -Problem.Name test_ff_ransni_lauferpipe_kepsilon_twolayers") -dune_add_test(NAME test_ff_ransni_lauferpipe_kepsilon_wallfunction +dumux_add_test(NAME test_ff_ransni_lauferpipe_kepsilon_wallfunction TARGET test_ff_ransni_lauferpipe_kepsilon LABELS freeflow rans TIMEOUT 1500 @@ -107,7 +107,7 @@ dune_add_test(NAME test_ff_ransni_lauferpipe_kepsilon_wallfunction --command "${CMAKE_CURRENT_BINARY_DIR}/test_ff_ransni_lauferpipe_kepsilon params_nonisothermal_wallfunction.input -Problem.Name test_ff_ransni_lauferpipe_kepsilon_wallfunction") -dune_add_test(NAME test_ff_ransni_lauferpipe_lowrekepsilon +dumux_add_test(NAME test_ff_ransni_lauferpipe_lowrekepsilon SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=PipeLauferNILowReKEpsilon LABELS freeflow rans @@ -120,7 +120,7 @@ dune_add_test(NAME test_ff_ransni_lauferpipe_lowrekepsilon -Problem.Name ./test_ff_ransni_lauferpipe_lowrekepsilon") target_compile_definitions(test_ff_ransni_lauferpipe_lowrekepsilon PUBLIC "NONISOTHERMAL=1") -dune_add_test(NAME test_ff_ransni_lauferpipe_komega +dumux_add_test(NAME test_ff_ransni_lauferpipe_komega SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=PipeLauferNIKOmega LABELS freeflow rans @@ -133,7 +133,7 @@ dune_add_test(NAME test_ff_ransni_lauferpipe_komega -Problem.Name test_ff_ransni_lauferpipe_komega") target_compile_definitions(test_ff_ransni_lauferpipe_komega PUBLIC "NONISOTHERMAL=1") -dune_add_test(NAME test_ff_ransni_lauferpipe_oneeq +dumux_add_test(NAME test_ff_ransni_lauferpipe_oneeq SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=PipeLauferNIOneEq LABELS freeflow rans @@ -146,7 +146,7 @@ dune_add_test(NAME test_ff_ransni_lauferpipe_oneeq -Problem.Name test_ff_ransni_lauferpipe_oneeq") target_compile_definitions(test_ff_ransni_lauferpipe_oneeq PUBLIC "NONISOTHERMAL=1") -dune_add_test(NAME test_ff_ransni_lauferpipe_zeroeq +dumux_add_test(NAME test_ff_ransni_lauferpipe_zeroeq SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=PipeLauferNIZeroEq LABELS freeflow rans diff --git a/test/freeflow/ransnc/CMakeLists.txt b/test/freeflow/ransnc/CMakeLists.txt index e771bb60d9..c5bcd5c7a8 100644 --- a/test/freeflow/ransnc/CMakeLists.txt +++ b/test/freeflow/ransnc/CMakeLists.txt @@ -4,7 +4,7 @@ add_input_file_links() add_executable(test_ff_rans2c_kepsilon EXCLUDE_FROM_ALL main.cc) target_compile_definitions(test_ff_rans2c_kepsilon PUBLIC "TYPETAG=FlatPlateNCKEpsilon") -dune_add_test(NAME test_ff_rans2c_kepsilon_twolayer +dumux_add_test(NAME test_ff_rans2c_kepsilon_twolayer TARGET test_ff_rans2c_kepsilon LABELS freeflow rans CMAKE_GUARD HAVE_UMFPACK @@ -15,7 +15,7 @@ dune_add_test(NAME test_ff_rans2c_kepsilon_twolayer --command "${CMAKE_CURRENT_BINARY_DIR}/test_ff_rans2c_kepsilon params.input -Problem.Name test_ff_rans2c_kepsilon_twolayer") -dune_add_test(NAME test_ff_rans2c_kepsilon_wallfunctions +dumux_add_test(NAME test_ff_rans2c_kepsilon_wallfunctions TARGET test_ff_rans2c_kepsilon LABELS freeflow rans CMAKE_GUARD HAVE_UMFPACK @@ -26,7 +26,7 @@ dune_add_test(NAME test_ff_rans2c_kepsilon_wallfunctions --command "${CMAKE_CURRENT_BINARY_DIR}/test_ff_rans2c_kepsilon params_wallfunction.input -Problem.Name test_ff_rans2c_kepsilon_wallfunctions") -dune_add_test(NAME test_ff_rans2c_komega +dumux_add_test(NAME test_ff_rans2c_komega SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=FlatPlateNCLowReKEpsilon LABELS freeflow rans @@ -38,7 +38,7 @@ dune_add_test(NAME test_ff_rans2c_komega --command "${CMAKE_CURRENT_BINARY_DIR}/test_ff_rans2c_komega params.input -Problem.Name test_ff_rans2c_komega") -dune_add_test(NAME test_ff_rans2c_lowrekepsilon +dumux_add_test(NAME test_ff_rans2c_lowrekepsilon SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=FlatPlateNCKOmega LABELS freeflow rans @@ -50,7 +50,7 @@ dune_add_test(NAME test_ff_rans2c_lowrekepsilon --command "${CMAKE_CURRENT_BINARY_DIR}/test_ff_rans2c_lowrekepsilon params.input -Problem.Name test_ff_rans2c_lowrekepsilon") -dune_add_test(NAME test_ff_rans2c_oneeq +dumux_add_test(NAME test_ff_rans2c_oneeq SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=FlatPlateNCOneEq LABELS freeflow rans @@ -63,7 +63,7 @@ dune_add_test(NAME test_ff_rans2c_oneeq -Problem.Name test_ff_rans2c_oneeq") -dune_add_test(NAME test_ff_rans2c_zeroeq +dumux_add_test(NAME test_ff_rans2c_zeroeq SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=FlatPlateNCZeroEq LABELS freeflow rans @@ -82,7 +82,7 @@ dune_add_test(NAME test_ff_rans2c_zeroeq add_executable(test_ff_rans2cni_kepsilon EXCLUDE_FROM_ALL main.cc) target_compile_definitions(test_ff_rans2cni_kepsilon PUBLIC "TYPETAG=FlatPlateNCNIKEpsilon" "NONISOTHERMAL") -dune_add_test(NAME test_ff_rans2cni_kepsilon_twolayer +dumux_add_test(NAME test_ff_rans2cni_kepsilon_twolayer TARGET test_ff_rans2cni_kepsilon LABELS freeflow rans CMAKE_GUARD HAVE_UMFPACK @@ -93,7 +93,7 @@ dune_add_test(NAME test_ff_rans2cni_kepsilon_twolayer --command "${CMAKE_CURRENT_BINARY_DIR}/test_ff_rans2cni_kepsilon params_nonisothermal.input -Problem.Name test_ff_rans2cni_kepsilon_twolayer") -dune_add_test(NAME test_ff_rans2cni_kepsilon_wallfunction +dumux_add_test(NAME test_ff_rans2cni_kepsilon_wallfunction TARGET test_ff_rans2cni_kepsilon LABELS freeflow rans CMAKE_GUARD HAVE_UMFPACK @@ -104,7 +104,7 @@ dune_add_test(NAME test_ff_rans2cni_kepsilon_wallfunction --command "${CMAKE_CURRENT_BINARY_DIR}/test_ff_rans2cni_kepsilon params_nonisothermal_wallfunction.input -Problem.Name test_ff_rans2cni_kepsilon_wallfunction") -dune_add_test(NAME test_ff_rans2cni_komega +dumux_add_test(NAME test_ff_rans2cni_komega SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=FlatPlateNCNIKOmega LABELS freeflow rans @@ -118,7 +118,7 @@ dune_add_test(NAME test_ff_rans2cni_komega -Newton.TargetSteps 12") target_compile_definitions(test_ff_rans2cni_komega PUBLIC "NONISOTHERMAL") -dune_add_test(NAME test_ff_rans2cni_lowrekepsilon +dumux_add_test(NAME test_ff_rans2cni_lowrekepsilon SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=FlatPlateNCNILowReKEpsilon LABELS freeflow rans @@ -131,7 +131,7 @@ dune_add_test(NAME test_ff_rans2cni_lowrekepsilon -Problem.Name test_ff_rans2cni_lowrekepsilon") target_compile_definitions(test_ff_rans2cni_lowrekepsilon PUBLIC "NONISOTHERMAL") -dune_add_test(NAME test_ff_rans2cni_oneeq +dumux_add_test(NAME test_ff_rans2cni_oneeq SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=FlatPlateNCNIOneEq LABELS freeflow rans @@ -145,7 +145,7 @@ dune_add_test(NAME test_ff_rans2cni_oneeq target_compile_definitions(test_ff_rans2cni_oneeq PUBLIC "NONISOTHERMAL") -dune_add_test(NAME test_ff_rans2cni_zeroeq +dumux_add_test(NAME test_ff_rans2cni_zeroeq SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=FlatPlateNCNIZeroEq LABELS freeflow rans diff --git a/test/freeflow/shallowwater/dambreak/CMakeLists.txt b/test/freeflow/shallowwater/dambreak/CMakeLists.txt index 2918b2832b..88e0ced92a 100644 --- a/test/freeflow/shallowwater/dambreak/CMakeLists.txt +++ b/test/freeflow/shallowwater/dambreak/CMakeLists.txt @@ -1,6 +1,6 @@ dune_symlink_to_source_files(FILES "params.input") -dune_add_test(NAME test_shallowwater_dambreak +dumux_add_test(NAME test_shallowwater_dambreak SOURCES main.cc TIMEOUT 1500 COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py diff --git a/test/freeflow/shallowwater/roughchannel/CMakeLists.txt b/test/freeflow/shallowwater/roughchannel/CMakeLists.txt index 261aa2c1f7..3ae5d9a161 100644 --- a/test/freeflow/shallowwater/roughchannel/CMakeLists.txt +++ b/test/freeflow/shallowwater/roughchannel/CMakeLists.txt @@ -1,6 +1,6 @@ dune_symlink_to_source_files(FILES "params.input") -dune_add_test(NAME test_shallowwater_roughchannel +dumux_add_test(NAME test_shallowwater_roughchannel SOURCES main.cc COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py CMD_ARGS --script fuzzy diff --git a/test/geomechanics/elastic/CMakeLists.txt b/test/geomechanics/elastic/CMakeLists.txt index 40026851b4..7c365740bf 100644 --- a/test/geomechanics/elastic/CMakeLists.txt +++ b/test/geomechanics/elastic/CMakeLists.txt @@ -1,7 +1,7 @@ dune_symlink_to_source_files(FILES "params.input") # using box -dune_add_test(NAME test_elastic_box +dumux_add_test(NAME test_elastic_box LABELS geomechanics elastic SOURCES main.cc COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py diff --git a/test/geomechanics/poroelastic/CMakeLists.txt b/test/geomechanics/poroelastic/CMakeLists.txt index 0e1d1d26a9..d9d0a35544 100644 --- a/test/geomechanics/poroelastic/CMakeLists.txt +++ b/test/geomechanics/poroelastic/CMakeLists.txt @@ -1,7 +1,7 @@ dune_symlink_to_source_files(FILES "params.input") # using box and numeric differentiation -dune_add_test(NAME test_poroelastic_box +dumux_add_test(NAME test_poroelastic_box LABELS geomechanics poroelastic SOURCES main.cc COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py diff --git a/test/io/container/CMakeLists.txt b/test/io/container/CMakeLists.txt index 24b7714592..f79ecc28ef 100644 --- a/test/io/container/CMakeLists.txt +++ b/test/io/container/CMakeLists.txt @@ -1,2 +1,2 @@ -dune_add_test(SOURCES test_container_io.cc +dumux_add_test(SOURCES test_container_io.cc LABELS unit io) diff --git a/test/io/gnuplotinterface/CMakeLists.txt b/test/io/gnuplotinterface/CMakeLists.txt index 0d209d496e..09465e0bfc 100644 --- a/test/io/gnuplotinterface/CMakeLists.txt +++ b/test/io/gnuplotinterface/CMakeLists.txt @@ -1,3 +1,3 @@ file(MAKE_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/output") -dune_add_test(SOURCES test_gnuplotinterface.cc +dumux_add_test(SOURCES test_gnuplotinterface.cc LABELS unit io) diff --git a/test/io/gridmanager/CMakeLists.txt b/test/io/gridmanager/CMakeLists.txt index d61252e19e..e8b3087bfd 100644 --- a/test/io/gridmanager/CMakeLists.txt +++ b/test/io/gridmanager/CMakeLists.txt @@ -6,72 +6,72 @@ target_compile_definitions(test_gridmanager_cake_ug PUBLIC "USEUG=1") add_executable(test_gridmanager_cake_alu EXCLUDE_FROM_ALL test_gridmanager_cake.cc) -dune_add_test(NAME test_gridmanager_cake_360_ug - TARGET test_gridmanager_cake_ug - LABELS unit io - CMAKE_GUARD dune-uggrid_FOUND - COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py - CMD_ARGS --script fuzzy - --command "${CMAKE_CURRENT_BINARY_DIR}/test_gridmanager_cake_ug -Grid.Name ug-360" - --files ${CMAKE_SOURCE_DIR}/test/references/test_gridmanager_cake_3d_360-reference.vtu - ${CMAKE_CURRENT_BINARY_DIR}/cake-3d-ug-360.vtu - ${CMAKE_SOURCE_DIR}/test/references/test_gridmanager_cake_2d_360-reference.vtu - ${CMAKE_CURRENT_BINARY_DIR}/cake-2d-ug-360.vtu - --relative 1e-6) - -dune_add_test(NAME test_gridmanager_cake_360_alu - TARGET test_gridmanager_cake_alu - LABELS unit io - CMAKE_GUARD dune-alugrid_FOUND - COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py - CMD_ARGS --script fuzzy - --command "${CMAKE_CURRENT_BINARY_DIR}/test_gridmanager_cake_alu -Grid.Name alu-360" - --files ${CMAKE_SOURCE_DIR}/test/references/test_gridmanager_cake_3d_360-reference.vtu - ${CMAKE_CURRENT_BINARY_DIR}/cake-3d-alu-360.vtu - ${CMAKE_SOURCE_DIR}/test/references/test_gridmanager_cake_2d_360-reference.vtu - ${CMAKE_CURRENT_BINARY_DIR}/cake-2d-alu-360.vtu - --relative 1e-6) - -dune_add_test(NAME test_gridmanager_cake_210_ug - TARGET test_gridmanager_cake_ug - LABELS unit io - CMAKE_GUARD dune-uggrid_FOUND - COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py - CMD_ARGS --script fuzzy - --command "${CMAKE_CURRENT_BINARY_DIR}/test_gridmanager_cake_ug -Grid.Name ug-210 -Grid.Angular1 '0.0 210.0'" - --files ${CMAKE_SOURCE_DIR}/test/references/test_gridmanager_cake_3d_210-reference.vtu - ${CMAKE_CURRENT_BINARY_DIR}/cake-3d-ug-210.vtu - ${CMAKE_SOURCE_DIR}/test/references/test_gridmanager_cake_2d_210-reference.vtu - ${CMAKE_CURRENT_BINARY_DIR}/cake-2d-ug-210.vtu - --relative 1e-6) - -dune_add_test(NAME test_gridmanager_cake_210_alu - TARGET test_gridmanager_cake_alu - LABELS unit io - CMAKE_GUARD dune-alugrid_FOUND - COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py - CMD_ARGS --script fuzzy - --command "${CMAKE_CURRENT_BINARY_DIR}/test_gridmanager_cake_alu -Grid.Name alu-210 -Grid.Angular1 '0.0 210.0'" - --files ${CMAKE_SOURCE_DIR}/test/references/test_gridmanager_cake_3d_210-reference.vtu - ${CMAKE_CURRENT_BINARY_DIR}/cake-3d-alu-210.vtu - ${CMAKE_SOURCE_DIR}/test/references/test_gridmanager_cake_2d_210-reference.vtu - ${CMAKE_CURRENT_BINARY_DIR}/cake-2d-alu-210.vtu - --relative 1e-6) - -dune_add_test(NAME test_gridmanager_cake_360_nowell - TARGET test_gridmanager_cake_ug - LABELS unit io - CMAKE_GUARD dune-uggrid_FOUND - COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py - CMD_ARGS --script fuzzy - --command "${CMAKE_CURRENT_BINARY_DIR}/test_gridmanager_cake_ug -Grid.Name nowell-360 -Grid.Radial0 '0.0 0.3 1.0'" - --files ${CMAKE_SOURCE_DIR}/test/references/test_gridmanager_cake_3d_360_nowell-reference.vtu - ${CMAKE_CURRENT_BINARY_DIR}/cake-3d-nowell-360.vtu - ${CMAKE_SOURCE_DIR}/test/references/test_gridmanager_cake_2d_360_nowell-reference.vtu - ${CMAKE_CURRENT_BINARY_DIR}/cake-2d-nowell-360.vtu - --relative 1e-6) - -dune_add_test(NAME test_gridmanager_subgrid +dumux_add_test(NAME test_gridmanager_cake_360_ug + TARGET test_gridmanager_cake_ug + LABELS unit io + CMAKE_GUARD dune-uggrid_FOUND + COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py + CMD_ARGS --script fuzzy + --command "${CMAKE_CURRENT_BINARY_DIR}/test_gridmanager_cake_ug -Grid.Name ug-360" + --files ${CMAKE_SOURCE_DIR}/test/references/test_gridmanager_cake_3d_360-reference.vtu + ${CMAKE_CURRENT_BINARY_DIR}/cake-3d-ug-360.vtu + ${CMAKE_SOURCE_DIR}/test/references/test_gridmanager_cake_2d_360-reference.vtu + ${CMAKE_CURRENT_BINARY_DIR}/cake-2d-ug-360.vtu + --relative 1e-6) + +dumux_add_test(NAME test_gridmanager_cake_360_alu + TARGET test_gridmanager_cake_alu + LABELS unit io + CMAKE_GUARD dune-alugrid_FOUND + COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py + CMD_ARGS --script fuzzy + --command "${CMAKE_CURRENT_BINARY_DIR}/test_gridmanager_cake_alu -Grid.Name alu-360" + --files ${CMAKE_SOURCE_DIR}/test/references/test_gridmanager_cake_3d_360-reference.vtu + ${CMAKE_CURRENT_BINARY_DIR}/cake-3d-alu-360.vtu + ${CMAKE_SOURCE_DIR}/test/references/test_gridmanager_cake_2d_360-reference.vtu + ${CMAKE_CURRENT_BINARY_DIR}/cake-2d-alu-360.vtu + --relative 1e-6) + +dumux_add_test(NAME test_gridmanager_cake_210_ug + TARGET test_gridmanager_cake_ug + LABELS unit io + CMAKE_GUARD dune-uggrid_FOUND + COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py + CMD_ARGS --script fuzzy + --command "${CMAKE_CURRENT_BINARY_DIR}/test_gridmanager_cake_ug -Grid.Name ug-210 -Grid.Angular1 '0.0 210.0'" + --files ${CMAKE_SOURCE_DIR}/test/references/test_gridmanager_cake_3d_210-reference.vtu + ${CMAKE_CURRENT_BINARY_DIR}/cake-3d-ug-210.vtu + ${CMAKE_SOURCE_DIR}/test/references/test_gridmanager_cake_2d_210-reference.vtu + ${CMAKE_CURRENT_BINARY_DIR}/cake-2d-ug-210.vtu + --relative 1e-6) + +dumux_add_test(NAME test_gridmanager_cake_210_alu + TARGET test_gridmanager_cake_alu + LABELS unit io + CMAKE_GUARD dune-alugrid_FOUND + COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py + CMD_ARGS --script fuzzy + --command "${CMAKE_CURRENT_BINARY_DIR}/test_gridmanager_cake_alu -Grid.Name alu-210 -Grid.Angular1 '0.0 210.0'" + --files ${CMAKE_SOURCE_DIR}/test/references/test_gridmanager_cake_3d_210-reference.vtu + ${CMAKE_CURRENT_BINARY_DIR}/cake-3d-alu-210.vtu + ${CMAKE_SOURCE_DIR}/test/references/test_gridmanager_cake_2d_210-reference.vtu + ${CMAKE_CURRENT_BINARY_DIR}/cake-2d-alu-210.vtu + --relative 1e-6) + +dumux_add_test(NAME test_gridmanager_cake_360_nowell + TARGET test_gridmanager_cake_ug + LABELS unit io + CMAKE_GUARD dune-uggrid_FOUND + COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py + CMD_ARGS --script fuzzy + --command "${CMAKE_CURRENT_BINARY_DIR}/test_gridmanager_cake_ug -Grid.Name nowell-360 -Grid.Radial0 '0.0 0.3 1.0'" + --files ${CMAKE_SOURCE_DIR}/test/references/test_gridmanager_cake_3d_360_nowell-reference.vtu + ${CMAKE_CURRENT_BINARY_DIR}/cake-3d-nowell-360.vtu + ${CMAKE_SOURCE_DIR}/test/references/test_gridmanager_cake_2d_360_nowell-reference.vtu + ${CMAKE_CURRENT_BINARY_DIR}/cake-2d-nowell-360.vtu + --relative 1e-6) + +dumux_add_test(NAME test_gridmanager_subgrid SOURCES test_gridmanager_subgrid.cc LABELS unit io CMAKE_GUARD dune-subgrid_FOUND @@ -90,7 +90,7 @@ dune_symlink_to_source_files(FILES "test_gridmanager_gmsh_3d.input" add_executable(test_gridmanager_gmsh_3d_alu EXCLUDE_FROM_ALL test_gridmanager_gmsh_3d.cc) target_compile_definitions(test_gridmanager_gmsh_3d_alu PUBLIC GRIDTYPE=Dune::ALUGrid<3,3,Dune::simplex,Dune::nonconforming>) -dune_add_test(NAME test_gridmanager_gmsh_3d_alu_sequential +dumux_add_test(NAME test_gridmanager_gmsh_3d_alu_sequential TARGET test_gridmanager_gmsh_3d_alu LABELS unit io CMAKE_GUARD dune-alugrid_FOUND @@ -100,7 +100,7 @@ dune_add_test(NAME test_gridmanager_gmsh_3d_alu_sequential --files ${CMAKE_SOURCE_DIR}/test/references/gridmanager-bifurcation-3d-reference.vtu ${CMAKE_CURRENT_BINARY_DIR}/bifurcation_alu-00000.vtu) -dune_add_test(NAME test_gridmanager_gmsh_3d_alu_parallel +dumux_add_test(NAME test_gridmanager_gmsh_3d_alu_parallel TARGET test_gridmanager_gmsh_3d_alu LABELS unit io parallel TIMEOUT 300 @@ -114,7 +114,7 @@ dune_add_test(NAME test_gridmanager_gmsh_3d_alu_parallel add_executable(test_gridmanager_gmsh_3d_ug EXCLUDE_FROM_ALL test_gridmanager_gmsh_3d.cc) target_compile_definitions(test_gridmanager_gmsh_3d_ug PUBLIC GRIDTYPE=Dune::UGGrid<3>) -dune_add_test(NAME test_gridmanager_gmsh_3d_ug_sequential +dumux_add_test(NAME test_gridmanager_gmsh_3d_ug_sequential TARGET test_gridmanager_gmsh_3d_ug LABELS unit io CMAKE_GUARD dune-uggrid_FOUND @@ -126,7 +126,7 @@ dune_add_test(NAME test_gridmanager_gmsh_3d_ug_sequential ${CMAKE_SOURCE_DIR}/test/references/gridmanager-bifurcation-3d-reference-refined.vtu ${CMAKE_CURRENT_BINARY_DIR}/bifurcation_ug-00001.vtu) -dune_add_test(NAME test_gridmanager_gmsh_3d_ug_parallel +dumux_add_test(NAME test_gridmanager_gmsh_3d_ug_parallel TARGET test_gridmanager_gmsh_3d_ug LABELS unit io parallel TIMEOUT 300 @@ -140,7 +140,7 @@ dune_add_test(NAME test_gridmanager_gmsh_3d_ug_parallel add_executable(test_gridmanager_gmsh_e_markers_alu EXCLUDE_FROM_ALL test_gridmanager_gmsh_e_markers.cc) target_compile_definitions(test_gridmanager_gmsh_e_markers_alu PUBLIC GRIDTYPE=Dune::ALUGrid<2,2,Dune::simplex,Dune::nonconforming>) -dune_add_test(NAME test_gridmanager_gmsh_e_markers_alu_sequential +dumux_add_test(NAME test_gridmanager_gmsh_e_markers_alu_sequential TARGET test_gridmanager_gmsh_e_markers_alu LABELS unit io CMAKE_GUARD dune-alugrid_FOUND @@ -152,7 +152,7 @@ dune_add_test(NAME test_gridmanager_gmsh_e_markers_alu_sequential ${CMAKE_SOURCE_DIR}/test/references/gridmanager-fracture-reference-refined.vtu ${CMAKE_CURRENT_BINARY_DIR}/fracture_alu-00001.vtu) -dune_add_test(NAME test_gridmanager_gmsh_e_markers_alu_parallel +dumux_add_test(NAME test_gridmanager_gmsh_e_markers_alu_parallel TARGET test_gridmanager_gmsh_e_markers_alu LABELS unit io parallel TIMEOUT 300 @@ -168,7 +168,7 @@ dune_add_test(NAME test_gridmanager_gmsh_e_markers_alu_parallel add_executable(test_gridmanager_gmsh_e_markers_ug EXCLUDE_FROM_ALL test_gridmanager_gmsh_e_markers.cc) target_compile_definitions(test_gridmanager_gmsh_e_markers_ug PUBLIC GRIDTYPE=Dune::UGGrid<2>) -dune_add_test(NAME test_gridmanager_gmsh_e_markers_ug_sequential +dumux_add_test(NAME test_gridmanager_gmsh_e_markers_ug_sequential TARGET test_gridmanager_gmsh_e_markers_ug LABELS unit io CMAKE_GUARD dune-uggrid_FOUND @@ -180,7 +180,7 @@ dune_add_test(NAME test_gridmanager_gmsh_e_markers_ug_sequential ${CMAKE_SOURCE_DIR}/test/references/gridmanager-fracture-reference-refined.vtu ${CMAKE_CURRENT_BINARY_DIR}/fracture_ug-00001.vtu) -dune_add_test(NAME test_gridmanager_gmsh_e_markers_ug_parallel +dumux_add_test(NAME test_gridmanager_gmsh_e_markers_ug_parallel TARGET test_gridmanager_gmsh_e_markers_ug LABELS unit io parallel TIMEOUT 300 @@ -196,7 +196,7 @@ dune_add_test(NAME test_gridmanager_gmsh_e_markers_ug_parallel add_executable(test_gridmanager_dgf_alu EXCLUDE_FROM_ALL test_gridmanager_dgf.cc) target_compile_definitions(test_gridmanager_dgf_alu PUBLIC GRIDTYPE=Dune::ALUGrid<2,2,Dune::simplex,Dune::conforming>) -dune_add_test(NAME test_gridmanager_dgf_alu_sequential +dumux_add_test(NAME test_gridmanager_dgf_alu_sequential TARGET test_gridmanager_dgf_alu LABELS unit io CMAKE_GUARD dune-alugrid_FOUND @@ -210,7 +210,7 @@ dune_add_test(NAME test_gridmanager_dgf_alu_sequential ${CMAKE_SOURCE_DIR}/test/references/gridmanager-co2-simpl-vertex-reference.vtu ${CMAKE_CURRENT_BINARY_DIR}/co2_alu-vertex-00000.vtu) -dune_add_test(NAME test_gridmanager_dgf_alu_parallel +dumux_add_test(NAME test_gridmanager_dgf_alu_parallel TARGET test_gridmanager_dgf_alu LABELS unit io parallel TIMEOUT 300 @@ -228,7 +228,7 @@ dune_add_test(NAME test_gridmanager_dgf_alu_parallel add_executable(test_gridmanager_dgf_ug EXCLUDE_FROM_ALL test_gridmanager_dgf.cc) target_compile_definitions(test_gridmanager_dgf_ug PUBLIC GRIDTYPE=Dune::UGGrid<2>) -dune_add_test(NAME test_gridmanager_dgf_ug_sequential +dumux_add_test(NAME test_gridmanager_dgf_ug_sequential TARGET test_gridmanager_dgf_ug LABELS unit io CMAKE_GUARD dune-uggrid_FOUND @@ -242,7 +242,7 @@ dune_add_test(NAME test_gridmanager_dgf_ug_sequential ${CMAKE_SOURCE_DIR}/test/references/gridmanager-co2-quad-vertex-reference.vtu ${CMAKE_CURRENT_BINARY_DIR}/co2_ug-vertex-00000.vtu) -dune_add_test(NAME test_gridmanager_dgf_ug_parallel +dumux_add_test(NAME test_gridmanager_dgf_ug_parallel TARGET test_gridmanager_dgf_ug LABELS unit io parallel TIMEOUT 300 @@ -257,7 +257,7 @@ dune_add_test(NAME test_gridmanager_dgf_ug_parallel ${CMAKE_SOURCE_DIR}/test/references/gridmanager-co2-quad-vertex-reference.vtu ${CMAKE_CURRENT_BINARY_DIR}/s0002-co2_ug_parallel-vertex-00000.pvtu) -dune_add_test(NAME test_gridmanager_vtk_foam +dumux_add_test(NAME test_gridmanager_vtk_foam SOURCES test_gridmanager_vtk.cc LABELS unit io COMPILE_DEFINITIONS FOAMGRID @@ -268,7 +268,7 @@ dune_add_test(NAME test_gridmanager_vtk_foam --files ${CMAKE_CURRENT_BINARY_DIR}/grids/lupine.vtp ${CMAKE_CURRENT_BINARY_DIR}/test-gridmanager-vtk-foamgrid-0.vtp) -dune_add_test(NAME test_gridmanager_vtk_ug +dumux_add_test(NAME test_gridmanager_vtk_ug SOURCES test_gridmanager_vtk.cc LABELS unit io COMPILE_DEFINITIONS UGGRID @@ -280,21 +280,21 @@ dune_add_test(NAME test_gridmanager_vtk_ug ${CMAKE_CURRENT_BINARY_DIR}/test-gridmanager-vtk-uggrid-0.vtu) -dune_add_test(NAME test_gmshboundaryflag +dumux_add_test(NAME test_gmshboundaryflag SOURCES test_gmshboundaryflag.cc COMPILE_DEFINITIONS ENABLE_CACHING=false LABELS unit io CMAKE_GUARD "( dune-alugrid_FOUND )" ) -dune_add_test(NAME test_gmshboundaryflag_caching +dumux_add_test(NAME test_gmshboundaryflag_caching SOURCES test_gmshboundaryflag.cc COMPILE_DEFINITIONS ENABLE_CACHING=true LABELS unit io CMAKE_GUARD "( dune-alugrid_FOUND )" ) -dune_add_test(NAME test_gridmanager_mmesh +dumux_add_test(NAME test_gridmanager_mmesh SOURCES test_gridmanager_mmesh.cc LABELS unit io CMAKE_GUARD "( dune-mmesh_FOUND )" diff --git a/test/io/rasterimagereader/CMakeLists.txt b/test/io/rasterimagereader/CMakeLists.txt index 894d24129f..5dbae8b466 100644 --- a/test/io/rasterimagereader/CMakeLists.txt +++ b/test/io/rasterimagereader/CMakeLists.txt @@ -1,5 +1,5 @@ dune_symlink_to_source_files(FILES blackwhite_j.pbm blackwhite_binary_j.pbm blackwhite_j.txt grayscale_j.pgm grayscale_binary_j.pgm grayscale_j.txt) -dune_add_test(NAME test_io_rasterimagereader +dumux_add_test(NAME test_io_rasterimagereader SOURCES test_rasterimagereader.cc LABELS unit io) diff --git a/test/io/vtk/CMakeLists.txt b/test/io/vtk/CMakeLists.txt index 937f243311..e57250e071 100644 --- a/test/io/vtk/CMakeLists.txt +++ b/test/io/vtk/CMakeLists.txt @@ -1,7 +1,7 @@ add_input_file_links() dune_symlink_to_source_files(FILES polyline.vtp) -dune_add_test(NAME test_vtkreader_3d +dumux_add_test(NAME test_vtkreader_3d SOURCES test_vtkreader.cc LABELS unit io CMAKE_GUARD dune-alugrid_FOUND @@ -13,12 +13,12 @@ dune_add_test(NAME test_vtkreader_3d --files ${CMAKE_SOURCE_DIR}/test/references/test_md_embedded1d3d_1p2c_richards2c_3d-reference.vtu ${CMAKE_CURRENT_BINARY_DIR}/test-3d.vtu) -# dune_add_test(NAME test_vtkreader_3d_structured_notimplemented +# dumux_add_test(NAME test_vtkreader_3d_structured_notimplemented # SOURCES test_vtkreader.cc # COMPILE_DEFINITIONS GRIDTYPE=Dune::YaspGrid<3,Dune::EquidistantOffsetCoordinates<double,3>> # EXPECT_COMPILE_FAIL) -dune_add_test(NAME test_vtkreader_2d +dumux_add_test(NAME test_vtkreader_2d SOURCES test_vtkreader.cc LABELS unit io CMAKE_GUARD dune-alugrid_FOUND @@ -30,7 +30,7 @@ dune_add_test(NAME test_vtkreader_2d --files ${CMAKE_SOURCE_DIR}/test/references/test_1p_box-reference.vtu ${CMAKE_CURRENT_BINARY_DIR}/test-2d.vtu) -dune_add_test(NAME test_vtkreader_2d3d +dumux_add_test(NAME test_vtkreader_2d3d SOURCES test_vtkreader.cc LABELS unit io CMAKE_GUARD dune-foamgrid_FOUND @@ -42,7 +42,7 @@ dune_add_test(NAME test_vtkreader_2d3d --files ${CMAKE_SOURCE_DIR}/test/references/test_md_embedded2d3d_fracture1p_tpfa_2d-reference.vtu ${CMAKE_CURRENT_BINARY_DIR}/test-2d3d.vtu) -dune_add_test(NAME test_vtkreader_1d +dumux_add_test(NAME test_vtkreader_1d SOURCES test_vtkreader.cc LABELS unit io CMAKE_GUARD dune-foamgrid_FOUND @@ -54,7 +54,7 @@ dune_add_test(NAME test_vtkreader_1d --files ${CMAKE_SOURCE_DIR}/test/references/test_md_embedded1d3d_1p_richards_tpfatpfa_1d-reference.vtp ${CMAKE_CURRENT_BINARY_DIR}/test-1d.vtp) -dune_add_test(NAME test_vtkreader_1d_polyline +dumux_add_test(NAME test_vtkreader_1d_polyline TARGET test_vtkreader_1d LABELS unit io COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py @@ -63,6 +63,6 @@ dune_add_test(NAME test_vtkreader_1d_polyline --files ${CMAKE_SOURCE_DIR}/test/references/test_vtkreader_1d_polyline-reference.vtp ${CMAKE_CURRENT_BINARY_DIR}/test_polyline.vtp) -dune_add_test(NAME test_vtk_staggeredfreeflowpvnames +dumux_add_test(NAME test_vtk_staggeredfreeflowpvnames SOURCES test_vtk_staggeredfreeflowpvnames.cc LABELS unit io) diff --git a/test/material/binarycoefficients/CMakeLists.txt b/test/material/binarycoefficients/CMakeLists.txt index 39a59aa25d..eafd05b7d3 100644 --- a/test/material/binarycoefficients/CMakeLists.txt +++ b/test/material/binarycoefficients/CMakeLists.txt @@ -1,2 +1,2 @@ -dune_add_test(SOURCES test_binarycoefficients.cc +dumux_add_test(SOURCES test_binarycoefficients.cc LABELS unit material) diff --git a/test/material/components/CMakeLists.txt b/test/material/components/CMakeLists.txt index 46f3c0bb21..045e5f9b94 100644 --- a/test/material/components/CMakeLists.txt +++ b/test/material/components/CMakeLists.txt @@ -1,124 +1,124 @@ -dune_add_test(SOURCES test_componenttraits.cc +dumux_add_test(SOURCES test_componenttraits.cc COMPILE_ONLY LABELS unit material) add_executable(plot_component plotproperties.cc) -dune_add_test(NAME plot_air +dumux_add_test(NAME plot_air TARGET plot_component COMMAND ./plot_component CMD_ARGS "Air" LABELS unit material) -dune_add_test(NAME plot_benzene +dumux_add_test(NAME plot_benzene TARGET plot_component COMMAND ./plot_component CMD_ARGS "Benzene" LABELS unit material) -dune_add_test(NAME plot_brine +dumux_add_test(NAME plot_brine TARGET plot_component COMMAND ./plot_component CMD_ARGS "Brine" LABELS unit material) -dune_add_test(NAME plot_calcite +dumux_add_test(NAME plot_calcite TARGET plot_component COMMAND ./plot_component CMD_ARGS "Calcite" LABELS unit material) -dune_add_test(NAME plot_calciumion +dumux_add_test(NAME plot_calciumion TARGET plot_component COMMAND ./plot_component CMD_ARGS "CalciumIon" LABELS unit material) -dune_add_test(NAME plot_cao +dumux_add_test(NAME plot_cao TARGET plot_component COMMAND ./plot_component CMD_ARGS "CaO" LABELS unit material) -dune_add_test(NAME plot_cao2h2 +dumux_add_test(NAME plot_cao2h2 TARGET plot_component COMMAND ./plot_component CMD_ARGS "CaO2H2" LABELS unit material) -dune_add_test(NAME plot_carbonateion +dumux_add_test(NAME plot_carbonateion TARGET plot_component COMMAND ./plot_component CMD_ARGS "CarbonateIon" LABELS unit material) -dune_add_test(NAME plot_ch4 +dumux_add_test(NAME plot_ch4 TARGET plot_component COMMAND ./plot_component CMD_ARGS "CH4" LABELS unit material) -dune_add_test(NAME plot_granite +dumux_add_test(NAME plot_granite TARGET plot_component COMMAND ./plot_component CMD_ARGS "Granite" LABELS unit material) -dune_add_test(NAME plot_h2 +dumux_add_test(NAME plot_h2 TARGET plot_component COMMAND ./plot_component CMD_ARGS "H2" LABELS unit material) -dune_add_test(NAME plot_h2o +dumux_add_test(NAME plot_h2o TARGET plot_component COMMAND ./plot_component CMD_ARGS "H2O" LABELS unit material) -dune_add_test(NAME plot_heavyoil +dumux_add_test(NAME plot_heavyoil TARGET plot_component COMMAND ./plot_component CMD_ARGS "HeavyOil" LABELS unit material) -dune_add_test(NAME plot_mesitylene +dumux_add_test(NAME plot_mesitylene TARGET plot_component COMMAND ./plot_component CMD_ARGS "Mesitylene" LABELS unit material) -dune_add_test(NAME plot_n2 +dumux_add_test(NAME plot_n2 TARGET plot_component COMMAND ./plot_component CMD_ARGS "N2" LABELS unit material) -dune_add_test(NAME plot_nacl +dumux_add_test(NAME plot_nacl TARGET plot_component COMMAND ./plot_component CMD_ARGS "NaCl" LABELS unit material) -dune_add_test(NAME plot_o2 +dumux_add_test(NAME plot_o2 TARGET plot_component COMMAND ./plot_component CMD_ARGS "O2" LABELS unit material) -dune_add_test(NAME plot_simpleh2o +dumux_add_test(NAME plot_simpleh2o TARGET plot_component COMMAND ./plot_component CMD_ARGS "SimpleH2O" LABELS unit material) -dune_add_test(NAME plot_trichloroethene +dumux_add_test(NAME plot_trichloroethene TARGET plot_component COMMAND ./plot_component CMD_ARGS "Trichloroethene" LABELS unit material) -dune_add_test(NAME plot_xylene +dumux_add_test(NAME plot_xylene TARGET plot_component COMMAND ./plot_component CMD_ARGS "Xylene" diff --git a/test/material/compositionalflash/CMakeLists.txt b/test/material/compositionalflash/CMakeLists.txt index 3efcca4912..f231a9dc81 100644 --- a/test/material/compositionalflash/CMakeLists.txt +++ b/test/material/compositionalflash/CMakeLists.txt @@ -1,2 +1,2 @@ -dune_add_test(SOURCES test_compositionalflash.cc +dumux_add_test(SOURCES test_compositionalflash.cc LABELS unit material) diff --git a/test/material/fluidmatrixinteractions/2p/CMakeLists.txt b/test/material/fluidmatrixinteractions/2p/CMakeLists.txt index 0c003b9418..c0c84a8d4b 100644 --- a/test/material/fluidmatrixinteractions/2p/CMakeLists.txt +++ b/test/material/fluidmatrixinteractions/2p/CMakeLists.txt @@ -1,4 +1,4 @@ -dune_add_test(SOURCES test_thermalconductivityjohansen.cc +dumux_add_test(SOURCES test_thermalconductivityjohansen.cc LABELS unit material COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py CMD_ARGS --script fuzzyData --delimiter " " @@ -6,7 +6,7 @@ dune_add_test(SOURCES test_thermalconductivityjohansen.cc ${CMAKE_CURRENT_BINARY_DIR}/johansen_lambda_eff.dat --command "${CMAKE_CURRENT_BINARY_DIR}/test_thermalconductivityjohansen") -dune_add_test(SOURCES test_thermalconductivitysomerton.cc +dumux_add_test(SOURCES test_thermalconductivitysomerton.cc LABELS unit material COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py CMD_ARGS --script fuzzyData --delimiter " " diff --git a/test/material/fluidmatrixinteractions/CMakeLists.txt b/test/material/fluidmatrixinteractions/CMakeLists.txt index 9dc48993b2..3804f33504 100644 --- a/test/material/fluidmatrixinteractions/CMakeLists.txt +++ b/test/material/fluidmatrixinteractions/CMakeLists.txt @@ -1,6 +1,6 @@ add_subdirectory(2p) -dune_add_test(SOURCES test_effectivediffusivitymillingtonquirk.cc +dumux_add_test(SOURCES test_effectivediffusivitymillingtonquirk.cc LABELS unit material COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py CMD_ARGS --script fuzzyData --delimiter " " @@ -8,7 +8,7 @@ dune_add_test(SOURCES test_effectivediffusivitymillingtonquirk.cc ${CMAKE_CURRENT_BINARY_DIR}/millingtonquirk_d_eff.dat --command "${CMAKE_CURRENT_BINARY_DIR}/test_effectivediffusivitymillingtonquirk") -dune_add_test(SOURCES test_effectivediffusivityconstanttortuosity.cc +dumux_add_test(SOURCES test_effectivediffusivityconstanttortuosity.cc LABELS unit material COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py CMD_ARGS --script fuzzyData --delimiter " " diff --git a/test/material/fluidsystems/CMakeLists.txt b/test/material/fluidsystems/CMakeLists.txt index 659c138e7a..65866a537b 100644 --- a/test/material/fluidsystems/CMakeLists.txt +++ b/test/material/fluidsystems/CMakeLists.txt @@ -1,2 +1,2 @@ -dune_add_test(SOURCES test_fluidsystems.cc +dumux_add_test(SOURCES test_fluidsystems.cc LABELS unit material) diff --git a/test/material/immiscibleflash/CMakeLists.txt b/test/material/immiscibleflash/CMakeLists.txt index 5f714d0e87..f125eb1f30 100644 --- a/test/material/immiscibleflash/CMakeLists.txt +++ b/test/material/immiscibleflash/CMakeLists.txt @@ -1,2 +1,2 @@ -dune_add_test(SOURCES test_immiscibleflash.cc +dumux_add_test(SOURCES test_immiscibleflash.cc LABELS unit material) diff --git a/test/material/ncpflash/CMakeLists.txt b/test/material/ncpflash/CMakeLists.txt index fccaf9b1ff..4ee916369c 100644 --- a/test/material/ncpflash/CMakeLists.txt +++ b/test/material/ncpflash/CMakeLists.txt @@ -1,2 +1,2 @@ -dune_add_test(SOURCES test_ncpflash.cc +dumux_add_test(SOURCES test_ncpflash.cc LABELS unit material) diff --git a/test/material/pengrobinson/CMakeLists.txt b/test/material/pengrobinson/CMakeLists.txt index 1fb81455c5..b8695061c3 100644 --- a/test/material/pengrobinson/CMakeLists.txt +++ b/test/material/pengrobinson/CMakeLists.txt @@ -1,2 +1,2 @@ -dune_add_test(SOURCES test_pengrobinson.cc +dumux_add_test(SOURCES test_pengrobinson.cc LABELS unit material) diff --git a/test/material/solidsystems/CMakeLists.txt b/test/material/solidsystems/CMakeLists.txt index a89f504362..7afc19da1c 100644 --- a/test/material/solidsystems/CMakeLists.txt +++ b/test/material/solidsystems/CMakeLists.txt @@ -1,2 +1,2 @@ -dune_add_test(SOURCES test_solidsystems.cc +dumux_add_test(SOURCES test_solidsystems.cc LABELS unit material) diff --git a/test/material/tabulation/CMakeLists.txt b/test/material/tabulation/CMakeLists.txt index 2174ab13e3..eed5ea29d2 100644 --- a/test/material/tabulation/CMakeLists.txt +++ b/test/material/tabulation/CMakeLists.txt @@ -1,2 +1,2 @@ -dune_add_test(SOURCES test_tabulation.cc +dumux_add_test(SOURCES test_tabulation.cc LABELS unit material) diff --git a/test/multidomain/boundary/darcydarcy/1p_1p/CMakeLists.txt b/test/multidomain/boundary/darcydarcy/1p_1p/CMakeLists.txt index 5a550556b9..3c29cf11f4 100644 --- a/test/multidomain/boundary/darcydarcy/1p_1p/CMakeLists.txt +++ b/test/multidomain/boundary/darcydarcy/1p_1p/CMakeLists.txt @@ -1,4 +1,4 @@ -dune_add_test(NAME test_md_boundary_darcy1p_darcy1p_half +dumux_add_test(NAME test_md_boundary_darcy1p_darcy1p_half LABELS multidomain multidomain_boundary darcydarcy 1p SOURCES main.cc COMPILE_DEFINITIONS DOMAINSPLIT=0 @@ -9,7 +9,7 @@ dune_add_test(NAME test_md_boundary_darcy1p_darcy1p_half --command "${CMAKE_CURRENT_BINARY_DIR}/test_md_boundary_darcy1p_darcy1p_half params.input \ -Vtk.OutputName test_md_boundary_darcy1p_darcy1p_half") -dune_add_test(NAME test_md_boundary_darcy1p_darcy1p_lens +dumux_add_test(NAME test_md_boundary_darcy1p_darcy1p_lens LABELS multidomain multidomain_boundary darcydarcy 1p SOURCES main.cc COMPILE_DEFINITIONS DOMAINSPLIT=1 diff --git a/test/multidomain/boundary/darcydarcy/1p_2p/CMakeLists.txt b/test/multidomain/boundary/darcydarcy/1p_2p/CMakeLists.txt index 13a0d8c0fc..1442041181 100644 --- a/test/multidomain/boundary/darcydarcy/1p_2p/CMakeLists.txt +++ b/test/multidomain/boundary/darcydarcy/1p_2p/CMakeLists.txt @@ -1,4 +1,4 @@ -dune_add_test(NAME test_md_boundary_darcy1p_darcy2p +dumux_add_test(NAME test_md_boundary_darcy1p_darcy2p LABELS multidomain multidomain_boundary darcydarcy 1p 2p SOURCES main.cc COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py diff --git a/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/CMakeLists.txt b/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/CMakeLists.txt index 4f4ce94937..25afa7e1d4 100644 --- a/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/CMakeLists.txt +++ b/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/CMakeLists.txt @@ -4,7 +4,7 @@ add_input_file_links() add_executable(test_md_boundary_darcy1p2c_stokes1p2c EXCLUDE_FROM_ALL main.cc) -dune_add_test(NAME test_md_boundary_darcy1p2c_stokes1p2c_horizontal +dumux_add_test(NAME test_md_boundary_darcy1p2c_stokes1p2c_horizontal LABELS multidomain multidomain_boundary stokesdarcy 1pnc navierstokes TARGET test_md_boundary_darcy1p2c_stokes1p2c CMAKE_GUARD HAVE_UMFPACK @@ -17,7 +17,7 @@ dune_add_test(NAME test_md_boundary_darcy1p2c_stokes1p2c_horizontal --command "${CMAKE_CURRENT_BINARY_DIR}/test_md_boundary_darcy1p2c_stokes1p2c params_horizontalflow.input -Vtk.OutputName test_md_boundary_darcy1p2c_stokes1p2c_horizontal") -dune_add_test(NAME test_md_boundary_darcy1p2c_stokes1p2c_vertical_diffusion +dumux_add_test(NAME test_md_boundary_darcy1p2c_stokes1p2c_vertical_diffusion LABELS multidomain multidomain_boundary stokesdarcy 1pnc navierstokes TARGET test_md_boundary_darcy1p2c_stokes1p2c CMAKE_GUARD HAVE_UMFPACK @@ -31,7 +31,7 @@ dune_add_test(NAME test_md_boundary_darcy1p2c_stokes1p2c_vertical_diffusion --command "${CMAKE_CURRENT_BINARY_DIR}/test_md_boundary_darcy1p2c_stokes1p2c params_verticalflow_diffusion.input -Vtk.OutputName test_md_boundary_darcy1p2c_stokes1p2c_vertical_diffusion") -dune_add_test(NAME test_md_boundary_darcy1p2c_stokes1p2c_vertical_advection +dumux_add_test(NAME test_md_boundary_darcy1p2c_stokes1p2c_vertical_advection LABELS multidomain multidomain_boundary stokesdarcy 1pnc navierstokes TARGET test_md_boundary_darcy1p2c_stokes1p2c CMAKE_GUARD HAVE_UMFPACK diff --git a/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/diffusionlawcomparison/CMakeLists.txt b/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/diffusionlawcomparison/CMakeLists.txt index 8ecf1527f4..af24169339 100644 --- a/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/diffusionlawcomparison/CMakeLists.txt +++ b/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/diffusionlawcomparison/CMakeLists.txt @@ -1,6 +1,6 @@ add_input_file_links() -dune_add_test(NAME test_md_boundary_darcy1p2c_stokes1p2c_maxwellstefan +dumux_add_test(NAME test_md_boundary_darcy1p2c_stokes1p2c_maxwellstefan LABELS multidomain multidomain_boundary freeflow 1pnc SOURCES main.cc CMAKE_GUARD HAVE_UMFPACK @@ -15,7 +15,7 @@ dune_add_test(NAME test_md_boundary_darcy1p2c_stokes1p2c_maxwellstefan --command "${CMAKE_CURRENT_BINARY_DIR}/test_md_boundary_darcy1p2c_stokes1p2c_maxwellstefan params.input -Problem.Name test_md_boundary_darcy1p2c_stokes1p2c_comparison_ms") -dune_add_test(NAME test_md_boundary_darcy1p2c_stokes1p2c_fickslaw +dumux_add_test(NAME test_md_boundary_darcy1p2c_stokes1p2c_fickslaw LABELS multidomain multidomain_boundary freeflow 1pnc SOURCES main.cc CMAKE_GUARD HAVE_UMFPACK diff --git a/test/multidomain/boundary/stokesdarcy/1p2c_2p2c/CMakeLists.txt b/test/multidomain/boundary/stokesdarcy/1p2c_2p2c/CMakeLists.txt index 9f6195c3a8..b7b2ca3e4e 100644 --- a/test/multidomain/boundary/stokesdarcy/1p2c_2p2c/CMakeLists.txt +++ b/test/multidomain/boundary/stokesdarcy/1p2c_2p2c/CMakeLists.txt @@ -1,6 +1,6 @@ add_input_file_links() -dune_add_test(NAME test_md_boundary_darcy2p2c_stokes1p2c_horizontal +dumux_add_test(NAME test_md_boundary_darcy2p2c_stokes1p2c_horizontal LABELS multidomain multidomain_boundary stokesdarcy 2p2c navierstokes SOURCES main.cc CMAKE_GUARD HAVE_UMFPACK @@ -14,7 +14,7 @@ dune_add_test(NAME test_md_boundary_darcy2p2c_stokes1p2c_horizontal --command "${CMAKE_CURRENT_BINARY_DIR}/test_md_boundary_darcy2p2c_stokes1p2c_horizontal params.input -Vtk.OutputName test_md_boundary_darcy2p2c_stokes1p2c_horizontal") -dune_add_test(NAME test_md_boundary_darcy2p2cni_stokes1p2cni_horizontal +dumux_add_test(NAME test_md_boundary_darcy2p2cni_stokes1p2cni_horizontal LABELS multidomain multidomain_boundary stokesdarcy 2p2c navierstokes SOURCES main.cc COMPILE_DEFINITIONS NONISOTHERMAL=1 diff --git a/test/multidomain/boundary/stokesdarcy/1p3c_1p3c/CMakeLists.txt b/test/multidomain/boundary/stokesdarcy/1p3c_1p3c/CMakeLists.txt index 01c98f5a8c..b3fa296c14 100644 --- a/test/multidomain/boundary/stokesdarcy/1p3c_1p3c/CMakeLists.txt +++ b/test/multidomain/boundary/stokesdarcy/1p3c_1p3c/CMakeLists.txt @@ -1,6 +1,6 @@ add_input_file_links() -dune_add_test(NAME test_md_boundary_darcy1p3c_stokes1p3c_horizontal +dumux_add_test(NAME test_md_boundary_darcy1p3c_stokes1p3c_horizontal LABELS multidomain multidomain_boundary stokesdarcy 1pnc navierstokes SOURCES main.cc CMAKE_GUARD HAVE_UMFPACK diff --git a/test/multidomain/boundary/stokesdarcy/1p_1p/CMakeLists.txt b/test/multidomain/boundary/stokesdarcy/1p_1p/CMakeLists.txt index 67d8b85b22..9bc324aad6 100644 --- a/test/multidomain/boundary/stokesdarcy/1p_1p/CMakeLists.txt +++ b/test/multidomain/boundary/stokesdarcy/1p_1p/CMakeLists.txt @@ -2,7 +2,7 @@ add_input_file_links() add_executable(test_md_boundary_darcy1p_stokes1p EXCLUDE_FROM_ALL main.cc) -dune_add_test(NAME test_md_boundary_darcy1p_stokes1p_horizontal +dumux_add_test(NAME test_md_boundary_darcy1p_stokes1p_horizontal LABELS multidomain multidomain_boundary stokesdarcy 1p navierstokes TARGET test_md_boundary_darcy1p_stokes1p CMAKE_GUARD HAVE_UMFPACK @@ -15,7 +15,7 @@ dune_add_test(NAME test_md_boundary_darcy1p_stokes1p_horizontal --command "${CMAKE_CURRENT_BINARY_DIR}/test_md_boundary_darcy1p_stokes1p params_horizontalflow.input -Vtk.OutputName test_md_boundary_darcy1p_stokes1p_horizontal") -dune_add_test(NAME test_md_boundary_darcy1p_stokes1p_vertical +dumux_add_test(NAME test_md_boundary_darcy1p_stokes1p_vertical LABELS multidomain multidomain_boundary stokesdarcy 1p navierstokes TARGET test_md_boundary_darcy1p_stokes1p CMAKE_GUARD HAVE_UMFPACK diff --git a/test/multidomain/boundary/stokesdarcy/1p_2p/CMakeLists.txt b/test/multidomain/boundary/stokesdarcy/1p_2p/CMakeLists.txt index 07eb26fe2d..62e62885ff 100644 --- a/test/multidomain/boundary/stokesdarcy/1p_2p/CMakeLists.txt +++ b/test/multidomain/boundary/stokesdarcy/1p_2p/CMakeLists.txt @@ -1,6 +1,6 @@ add_input_file_links() -dune_add_test(NAME test_md_boundary_darcy2p_stokes1p_vertical +dumux_add_test(NAME test_md_boundary_darcy2p_stokes1p_vertical LABELS multidomain multidomain_boundary stokesdarcy 1p navierstokes SOURCES main.cc CMAKE_GUARD HAVE_UMFPACK diff --git a/test/multidomain/embedded/1d3d/1p2c_richards2c/CMakeLists.txt b/test/multidomain/embedded/1d3d/1p2c_richards2c/CMakeLists.txt index 7f97585b70..78df38b3e7 100644 --- a/test/multidomain/embedded/1d3d/1p2c_richards2c/CMakeLists.txt +++ b/test/multidomain/embedded/1d3d/1p2c_richards2c/CMakeLists.txt @@ -1,4 +1,4 @@ -dune_add_test(NAME test_md_embedded1d3d_1p2c_richards2c +dumux_add_test(NAME test_md_embedded1d3d_1p2c_richards2c LABELS multidomain multidomain_embedded 1pnc richardsnc SOURCES main.cc CMAKE_GUARD "( dune-foamgrid_FOUND AND HAVE_UG )" diff --git a/test/multidomain/embedded/1d3d/1p_1p/CMakeLists.txt b/test/multidomain/embedded/1d3d/1p_1p/CMakeLists.txt index 35b6f52d68..2b14bf68ef 100644 --- a/test/multidomain/embedded/1d3d/1p_1p/CMakeLists.txt +++ b/test/multidomain/embedded/1d3d/1p_1p/CMakeLists.txt @@ -1,4 +1,4 @@ -dune_add_test(NAME test_md_embedded1d3d_1p1p_tpfatpfa_average +dumux_add_test(NAME test_md_embedded1d3d_1p1p_tpfatpfa_average LABELS multidomain multidomain_embedded 1p SOURCES main.cc COMPILE_DEFINITIONS BULKTYPETAG=TissueCC LOWDIMTYPETAG=BloodFlowCC COUPLINGMODE=EmbeddedCouplingMode::average @@ -12,7 +12,7 @@ dune_add_test(NAME test_md_embedded1d3d_1p1p_tpfatpfa_average --command "${CMAKE_CURRENT_BINARY_DIR}/test_md_embedded1d3d_1p1p_tpfatpfa_average params.input \ -Vtk.OutputName test_md_embedded1d3d_1p1p_tpfatpfa_average") -dune_add_test(NAME test_md_embedded1d3d_1p1p_boxtpfa_average +dumux_add_test(NAME test_md_embedded1d3d_1p1p_boxtpfa_average LABELS multidomain multidomain_embedded 1p SOURCES main.cc COMPILE_DEFINITIONS BULKTYPETAG=TissueBox LOWDIMTYPETAG=BloodFlowCC COUPLINGMODE=EmbeddedCouplingMode::average @@ -26,7 +26,7 @@ dune_add_test(NAME test_md_embedded1d3d_1p1p_boxtpfa_average --command "${CMAKE_CURRENT_BINARY_DIR}/test_md_embedded1d3d_1p1p_boxtpfa_average params.input \ -Vtk.OutputName test_md_embedded1d3d_1p1p_boxtpfa_average -Tissue.Grid.Cells \"19 19 19\"") -dune_add_test(NAME test_md_embedded1d3d_1p1p_tpfabox_average +dumux_add_test(NAME test_md_embedded1d3d_1p1p_tpfabox_average LABELS multidomain multidomain_embedded 1p SOURCES main.cc COMPILE_DEFINITIONS BULKTYPETAG=TissueCC LOWDIMTYPETAG=BloodFlowBox COUPLINGMODE=EmbeddedCouplingMode::average @@ -40,7 +40,7 @@ dune_add_test(NAME test_md_embedded1d3d_1p1p_tpfabox_average --command "${CMAKE_CURRENT_BINARY_DIR}/test_md_embedded1d3d_1p1p_tpfabox_average params.input \ -Vtk.OutputName test_md_embedded1d3d_1p1p_tpfabox_average") -dune_add_test(NAME test_md_embedded1d3d_1p1p_boxbox_average +dumux_add_test(NAME test_md_embedded1d3d_1p1p_boxbox_average LABELS multidomain multidomain_embedded 1p SOURCES main.cc COMPILE_DEFINITIONS BULKTYPETAG=TissueBox LOWDIMTYPETAG=BloodFlowBox COUPLINGMODE=EmbeddedCouplingMode::average @@ -55,7 +55,7 @@ dune_add_test(NAME test_md_embedded1d3d_1p1p_boxbox_average -Vtk.OutputName test_md_embedded1d3d_1p1p_boxbox_average -Tissue.Grid.Cells \"19 19 19\"") # make sure these configurations compile and run too -dune_add_test(NAME test_md_embedded1d3d_1p1p_tpfatpfa_cylindersources +dumux_add_test(NAME test_md_embedded1d3d_1p1p_tpfatpfa_cylindersources LABELS multidomain multidomain_embedded 1p SOURCES main.cc COMPILE_DEFINITIONS BULKTYPETAG=TissueCC LOWDIMTYPETAG=BloodFlowCC COUPLINGMODE=EmbeddedCouplingMode::cylindersources @@ -63,7 +63,7 @@ dune_add_test(NAME test_md_embedded1d3d_1p1p_tpfatpfa_cylindersources CMAKE_GUARD dune-foamgrid_FOUND CMD_ARGS params.input) -dune_add_test(NAME test_md_embedded1d3d_1p1p_tpfatpfa_line +dumux_add_test(NAME test_md_embedded1d3d_1p1p_tpfatpfa_line LABELS multidomain multidomain_embedded 1p SOURCES main.cc COMPILE_DEFINITIONS BULKTYPETAG=TissueCC LOWDIMTYPETAG=BloodFlowCC COUPLINGMODE=EmbeddedCouplingMode::line @@ -71,7 +71,7 @@ dune_add_test(NAME test_md_embedded1d3d_1p1p_tpfatpfa_line CMAKE_GUARD dune-foamgrid_FOUND CMD_ARGS params.input) -dune_add_test(NAME test_md_embedded1d3d_1p1p_tpfatpfa_kernel +dumux_add_test(NAME test_md_embedded1d3d_1p1p_tpfatpfa_kernel LABELS multidomain multidomain_embedded 1p SOURCES main.cc COMPILE_DEFINITIONS BULKTYPETAG=TissueCC LOWDIMTYPETAG=BloodFlowCC COUPLINGMODE=EmbeddedCouplingMode::kernel diff --git a/test/multidomain/embedded/1d3d/1p_richards/CMakeLists.txt b/test/multidomain/embedded/1d3d/1p_richards/CMakeLists.txt index f2df766e43..6dbe99bb6f 100644 --- a/test/multidomain/embedded/1d3d/1p_richards/CMakeLists.txt +++ b/test/multidomain/embedded/1d3d/1p_richards/CMakeLists.txt @@ -1,4 +1,4 @@ -dune_add_test(NAME test_md_embedded1d3d_1p_richards_tpfatpfa +dumux_add_test(NAME test_md_embedded1d3d_1p_richards_tpfatpfa LABELS multidomain multidomain_embedded 1p richards SOURCES main.cc COMPILE_DEFINITIONS SOILTYPETAG=SoilCC @@ -13,7 +13,7 @@ dune_add_test(NAME test_md_embedded1d3d_1p_richards_tpfatpfa --command "${CMAKE_CURRENT_BINARY_DIR}/test_md_embedded1d3d_1p_richards_tpfatpfa params.input \ -Vtk.OutputName test_md_embedded1d3d_1p_richards_tpfatpfa") -dune_add_test(NAME test_md_embedded1d3d_1p_richards_tpfabox +dumux_add_test(NAME test_md_embedded1d3d_1p_richards_tpfabox LABELS multidomain multidomain_embedded 1p richards SOURCES main.cc COMPILE_DEFINITIONS SOILTYPETAG=SoilBox diff --git a/test/multidomain/embedded/2d3d/1p_1p/CMakeLists.txt b/test/multidomain/embedded/2d3d/1p_1p/CMakeLists.txt index 79f2e3942d..59b2aa285e 100644 --- a/test/multidomain/embedded/2d3d/1p_1p/CMakeLists.txt +++ b/test/multidomain/embedded/2d3d/1p_1p/CMakeLists.txt @@ -1,6 +1,6 @@ add_executable(test_md_embedded2d3d_fracture1p_tpfa EXCLUDE_FROM_ALL main.cc) -dune_add_test(NAME test_md_embedded2d3d_fracture1p_tpfa_linearsolver +dumux_add_test(NAME test_md_embedded2d3d_fracture1p_tpfa_linearsolver LABELS multidomain multidomain_embedded 1p TARGET test_md_embedded2d3d_fracture1p_tpfa COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py @@ -13,7 +13,7 @@ dune_add_test(NAME test_md_embedded2d3d_fracture1p_tpfa_linearsolver --command "${CMAKE_CURRENT_BINARY_DIR}/test_md_embedded2d3d_fracture1p_tpfa params.input \ -Vtk.OutputName test_md_embedded2d3d_fracture1p_tpfa_linearsolver -Problem.SolverType linear") -dune_add_test(NAME test_md_embedded2d3d_fracture1p_tpfa_nonlinearsolver +dumux_add_test(NAME test_md_embedded2d3d_fracture1p_tpfa_nonlinearsolver LABELS multidomain multidomain_embedded 1p TARGET test_md_embedded2d3d_fracture1p_tpfa COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py diff --git a/test/multidomain/facet/1p_1p/analytical/CMakeLists.txt b/test/multidomain/facet/1p_1p/analytical/CMakeLists.txt index 0fc80dc223..ac35de8aa5 100644 --- a/test/multidomain/facet/1p_1p/analytical/CMakeLists.txt +++ b/test/multidomain/facet/1p_1p/analytical/CMakeLists.txt @@ -1,6 +1,6 @@ dune_symlink_to_source_files(FILES "grids" "params.input" "convergencetest.py") -dune_add_test(NAME test_md_facet_1p1p_tpfa_convergence +dumux_add_test(NAME test_md_facet_1p1p_tpfa_convergence LABELS multidomain multidomain_facet 1p CMAKE_GUARD "( dune-foamgrid_FOUND AND dune-alugrid_FOUND AND gmsh_FOUND )" SOURCES main.cc @@ -8,7 +8,7 @@ dune_add_test(NAME test_md_facet_1p1p_tpfa_convergence COMMAND ./convergencetest.py CMD_ARGS test_md_facet_1p1p_tpfa_convergence 1e-4) -dune_add_test(NAME test_md_facet_1p1p_box_convergence +dumux_add_test(NAME test_md_facet_1p1p_box_convergence LABELS multidomain multidomain_facet 1p CMAKE_GUARD "( dune-foamgrid_FOUND AND dune-alugrid_FOUND AND gmsh_FOUND )" SOURCES main.cc diff --git a/test/multidomain/facet/1p_1p/gravity/CMakeLists.txt b/test/multidomain/facet/1p_1p/gravity/CMakeLists.txt index ab6c576d8b..33e42f31c4 100644 --- a/test/multidomain/facet/1p_1p/gravity/CMakeLists.txt +++ b/test/multidomain/facet/1p_1p/gravity/CMakeLists.txt @@ -15,7 +15,7 @@ target_compile_definitions(test_md_facet_1p1p_gravity_mpfa LOWDIMGRIDTYPE=Dune::FoamGrid<1,2> BULKGRIDTYPE=Dune::ALUGrid<2,2,Dune::cube,Dune::nonconforming>) -dune_add_test(NAME test_md_facet_1p1p_gravity_xi1_tpfa +dumux_add_test(NAME test_md_facet_1p1p_gravity_xi1_tpfa LABELS multidomain multidomain_facet 1p CMAKE_GUARD "( dune-foamgrid_FOUND AND dune-alugrid_FOUND )" TARGET test_md_facet_1p1p_gravity_tpfa @@ -29,7 +29,7 @@ dune_add_test(NAME test_md_facet_1p1p_gravity_xi1_tpfa -Vtk.OutputName test_md_facet_1p1p_gravity_xi1_tpfa") -dune_add_test(NAME test_md_facet_1p1p_gravity_xi066_tpfa +dumux_add_test(NAME test_md_facet_1p1p_gravity_xi066_tpfa LABELS multidomain multidomain_facet 1p CMAKE_GUARD "( dune-foamgrid_FOUND AND dune-alugrid_FOUND )" TARGET test_md_facet_1p1p_gravity_tpfa @@ -44,7 +44,7 @@ dune_add_test(NAME test_md_facet_1p1p_gravity_xi066_tpfa -dune_add_test(NAME test_md_facet_1p1p_gravity_xi1_mpfa +dumux_add_test(NAME test_md_facet_1p1p_gravity_xi1_mpfa LABELS multidomain multidomain_facet 1p CMAKE_GUARD "( dune-foamgrid_FOUND AND dune-alugrid_FOUND )" TARGET test_md_facet_1p1p_gravity_mpfa @@ -57,7 +57,7 @@ dune_add_test(NAME test_md_facet_1p1p_gravity_xi1_mpfa --command "${CMAKE_CURRENT_BINARY_DIR}/test_md_facet_1p1p_gravity_mpfa params.input \ -Vtk.OutputName test_md_facet_1p1p_gravity_xi1_mpfa") -dune_add_test(NAME test_md_facet_1p1p_gravity_xi066_mpfa +dumux_add_test(NAME test_md_facet_1p1p_gravity_xi066_mpfa LABELS multidomain multidomain_facet 1p CMAKE_GUARD "( dune-foamgrid_FOUND AND dune-alugrid_FOUND )" TARGET test_md_facet_1p1p_gravity_mpfa diff --git a/test/multidomain/facet/1p_1p/linearprofile/CMakeLists.txt b/test/multidomain/facet/1p_1p/linearprofile/CMakeLists.txt index 82b4a8e5a9..36a03ecdd0 100644 --- a/test/multidomain/facet/1p_1p/linearprofile/CMakeLists.txt +++ b/test/multidomain/facet/1p_1p/linearprofile/CMakeLists.txt @@ -28,7 +28,7 @@ target_compile_definitions(test_md_facet_1p1p_linearprofile_surface_mpfa LOWDIMGRIDTYPE=Dune::FoamGrid<1,3> BULKGRIDTYPE=Dune::ALUGrid<2,3,Dune::cube,Dune::nonconforming>) -dune_add_test(NAME test_md_facet_1p1p_linearprofile_xi1_tpfa +dumux_add_test(NAME test_md_facet_1p1p_linearprofile_xi1_tpfa LABELS multidomain multidomain_facet 1p CMAKE_GUARD "( dune-foamgrid_FOUND AND dune-alugrid_FOUND )" TARGET test_md_facet_1p1p_linearprofile_tpfa @@ -40,7 +40,7 @@ dune_add_test(NAME test_md_facet_1p1p_linearprofile_xi1_tpfa ${CMAKE_CURRENT_BINARY_DIR}/test_md_facet_1p1p_linearprofile_xi1_tpfa_lowdim-00001.vtp --command "${CMAKE_CURRENT_BINARY_DIR}/test_md_facet_1p1p_linearprofile_tpfa params.input") -dune_add_test(NAME test_md_facet_1p1p_linearprofile_xi066_tpfa +dumux_add_test(NAME test_md_facet_1p1p_linearprofile_xi066_tpfa LABELS multidomain multidomain_facet 1p CMAKE_GUARD "( dune-foamgrid_FOUND AND dune-alugrid_FOUND )" TARGET test_md_facet_1p1p_linearprofile_tpfa @@ -54,7 +54,7 @@ dune_add_test(NAME test_md_facet_1p1p_linearprofile_xi066_tpfa -FacetCoupling.Xi 0.66 \ -Vtk.OutputName test_md_facet_1p1p_linearprofile_xi066_tpfa") -dune_add_test(NAME test_md_facet_1p1p_linearprofile_surface_xi1_tpfa +dumux_add_test(NAME test_md_facet_1p1p_linearprofile_surface_xi1_tpfa LABELS multidomain multidomain_facet 1p CMAKE_GUARD "( dune-foamgrid_FOUND AND dune-alugrid_FOUND )" TARGET test_md_facet_1p1p_linearprofile_surface_tpfa @@ -67,7 +67,7 @@ dune_add_test(NAME test_md_facet_1p1p_linearprofile_surface_xi1_tpfa --command "${CMAKE_CURRENT_BINARY_DIR}/test_md_facet_1p1p_linearprofile_surface_tpfa params.input \ -Vtk.OutputName test_md_facet_1p1p_linearprofile_surface_xi1_tpfa") -dune_add_test(NAME test_md_facet_1p1p_linearprofile_xi1_mpfa +dumux_add_test(NAME test_md_facet_1p1p_linearprofile_xi1_mpfa LABELS multidomain multidomain_facet 1p CMAKE_GUARD "( dune-foamgrid_FOUND AND dune-alugrid_FOUND )" TARGET test_md_facet_1p1p_linearprofile_mpfa @@ -80,7 +80,7 @@ dune_add_test(NAME test_md_facet_1p1p_linearprofile_xi1_mpfa --command "${CMAKE_CURRENT_BINARY_DIR}/test_md_facet_1p1p_linearprofile_mpfa params.input \ -Vtk.OutputName test_md_facet_1p1p_linearprofile_xi1_mpfa") -dune_add_test(NAME test_md_facet_1p1p_linearprofile_xi066_mpfa +dumux_add_test(NAME test_md_facet_1p1p_linearprofile_xi066_mpfa LABELS multidomain multidomain_facet 1p CMAKE_GUARD "( dune-foamgrid_FOUND AND dune-alugrid_FOUND )" TARGET test_md_facet_1p1p_linearprofile_mpfa @@ -94,7 +94,7 @@ dune_add_test(NAME test_md_facet_1p1p_linearprofile_xi066_mpfa -FacetCoupling.Xi 0.66 \ -Vtk.OutputName test_md_facet_1p1p_linearprofile_xi066_mpfa") -dune_add_test(NAME test_md_facet_1p1p_linearprofile_surface_xi1_mpfa +dumux_add_test(NAME test_md_facet_1p1p_linearprofile_surface_xi1_mpfa LABELS multidomain multidomain_facet 1p CMAKE_GUARD "( dune-foamgrid_FOUND AND dune-alugrid_FOUND )" TARGET test_md_facet_1p1p_linearprofile_surface_mpfa diff --git a/test/multidomain/facet/1p_1p/threedomain/CMakeLists.txt b/test/multidomain/facet/1p_1p/threedomain/CMakeLists.txt index 9c163fad7a..09e533905b 100644 --- a/test/multidomain/facet/1p_1p/threedomain/CMakeLists.txt +++ b/test/multidomain/facet/1p_1p/threedomain/CMakeLists.txt @@ -1,6 +1,6 @@ dune_symlink_to_source_files(FILES "grids" "params.input") -dune_add_test(NAME test_md_facet_1p1p_threedomain_tpfa +dumux_add_test(NAME test_md_facet_1p1p_threedomain_tpfa LABELS multidomain multidomain_facet 1p COMPILE_DEFINITIONS BULKTYPETAG=Dumux::Properties::TTag::OnePBulkTpfa COMPILE_DEFINITIONS FACETTYPETAG=Dumux::Properties::TTag::OnePFacetTpfa @@ -22,7 +22,7 @@ dune_add_test(NAME test_md_facet_1p1p_threedomain_tpfa # As soon as grid-wide flux variables caching is supported in multidomain # simulations we can probably include this test as it will speed it up significantly # TODO create reference solutions -# dune_add_test(NAME test_md_facet_1p1p_threedomain_mpfa +# dumux_add_test(NAME test_md_facet_1p1p_threedomain_mpfa # LABELS multidomain multidomain_facet 1p # COMPILE_DEFINITIONS BULKTYPETAG=Dumux::Properties::TTag::OnePBulkMpfa # COMPILE_DEFINITIONS FACETTYPETAG=Dumux::Properties::TTag::OnePFacetMpfa @@ -40,7 +40,7 @@ dune_add_test(NAME test_md_facet_1p1p_threedomain_tpfa # --command "${CMAKE_CURRENT_BINARY_DIR}/test_md_facet_1p1p_threedomain_mpfa params.input # -Vtk.OutputName test_md_facet_1p1p_threedomain_mpfa") -dune_add_test(NAME test_md_facet_1p1p_threedomain_box +dumux_add_test(NAME test_md_facet_1p1p_threedomain_box LABELS multidomain multidomain_facet 1p COMPILE_DEFINITIONS BULKTYPETAG=Dumux::Properties::TTag::OnePBulkBox COMPILE_DEFINITIONS FACETTYPETAG=Dumux::Properties::TTag::OnePFacetBox diff --git a/test/multidomain/facet/CMakeLists.txt b/test/multidomain/facet/CMakeLists.txt index e2110c1846..8e5e379b71 100644 --- a/test/multidomain/facet/CMakeLists.txt +++ b/test/multidomain/facet/CMakeLists.txt @@ -3,7 +3,7 @@ add_subdirectory(tracer_tracer) dune_symlink_to_source_files(FILES "grid.msh" "grid2.msh" "test_gridmanager.input" "test_vertexmapper.input" "test_couplingmapper_boundary.input" "2d_grid.msh" "3d_grid.msh") -dune_add_test(NAME test_facetgridmanager_alu +dumux_add_test(NAME test_facetgridmanager_alu LABELS multidomain multidomain_facet CMAKE_GUARD "( dune-foamgrid_FOUND AND dune-alugrid_FOUND )" COMPILE_DEFINITIONS BULKGRIDTYPE=Dune::ALUGrid<3,3,Dune::simplex,Dune::conforming> @@ -11,7 +11,7 @@ dune_add_test(NAME test_facetgridmanager_alu COMMAND ./test_facetgridmanager_alu CMD_ARGS test_gridmanager.input) -dune_add_test(NAME test_facetgridmanager_ug +dumux_add_test(NAME test_facetgridmanager_ug LABELS multidomain multidomain_facet CMAKE_GUARD "( dune-foamgrid_FOUND AND dune-uggrid_FOUND )" COMPILE_DEFINITIONS BULKGRIDTYPE=Dune::UGGrid<3> @@ -19,7 +19,7 @@ dune_add_test(NAME test_facetgridmanager_ug COMMAND ./test_facetgridmanager_ug CMD_ARGS test_gridmanager.input) -dune_add_test(NAME test_facetcouplingmapper_tpfa_alu +dumux_add_test(NAME test_facetcouplingmapper_tpfa_alu LABELS multidomain multidomain_facet CMAKE_GUARD "( dune-foamgrid_FOUND AND dune-alugrid_FOUND )" COMPILE_DEFINITIONS BULKGRIDTYPE=Dune::ALUGrid<3,3,Dune::simplex,Dune::conforming> @@ -27,7 +27,7 @@ dune_add_test(NAME test_facetcouplingmapper_tpfa_alu COMMAND ./test_facetcouplingmapper_tpfa_alu CMD_ARGS test_gridmanager.input) -dune_add_test(NAME test_facetcouplingmapper_tpfa_ug +dumux_add_test(NAME test_facetcouplingmapper_tpfa_ug LABELS multidomain multidomain_facet CMAKE_GUARD "( dune-foamgrid_FOUND AND dune-uggrid_FOUND )" COMPILE_DEFINITIONS BULKGRIDTYPE=Dune::UGGrid<3> @@ -35,7 +35,7 @@ dune_add_test(NAME test_facetcouplingmapper_tpfa_ug COMMAND ./test_facetcouplingmapper_tpfa_ug CMD_ARGS test_gridmanager.input) -dune_add_test(NAME test_facetcouplingmapper_mpfa_alu +dumux_add_test(NAME test_facetcouplingmapper_mpfa_alu LABELS multidomain multidomain_facet CMAKE_GUARD "( dune-foamgrid_FOUND AND dune-alugrid_FOUND )" COMPILE_DEFINITIONS BULKGRIDTYPE=Dune::ALUGrid<3,3,Dune::simplex,Dune::conforming> @@ -44,7 +44,7 @@ dune_add_test(NAME test_facetcouplingmapper_mpfa_alu COMMAND ./test_facetcouplingmapper_mpfa_alu CMD_ARGS test_gridmanager.input) -dune_add_test(NAME test_facetcouplingmapper_mpfa_ug +dumux_add_test(NAME test_facetcouplingmapper_mpfa_ug LABELS multidomain multidomain_facet CMAKE_GUARD "( dune-foamgrid_FOUND AND dune-uggrid_FOUND )" COMPILE_DEFINITIONS BULKGRIDTYPE=Dune::UGGrid<3> @@ -53,7 +53,7 @@ dune_add_test(NAME test_facetcouplingmapper_mpfa_ug COMMAND ./test_facetcouplingmapper_mpfa_ug CMD_ARGS test_gridmanager.input) -dune_add_test(NAME test_facetcouplingmapper_box_alu +dumux_add_test(NAME test_facetcouplingmapper_box_alu LABELS multidomain facet CMAKE_GUARD "( dune-foamgrid_FOUND AND dune-alugrid_FOUND )" COMPILE_DEFINITIONS BULKGRIDTYPE=Dune::ALUGrid<3,3,Dune::simplex,Dune::conforming> @@ -62,7 +62,7 @@ dune_add_test(NAME test_facetcouplingmapper_box_alu COMMAND ./test_facetcouplingmapper_box_alu CMD_ARGS test_gridmanager.input) -dune_add_test(NAME test_facetcouplingmapper_box_ug +dumux_add_test(NAME test_facetcouplingmapper_box_ug LABELS multidomain multidomain_facet CMAKE_GUARD "( dune-foamgrid_FOUND AND dune-uggrid_FOUND )" COMPILE_DEFINITIONS BULKGRIDTYPE=Dune::UGGrid<3> @@ -71,7 +71,7 @@ dune_add_test(NAME test_facetcouplingmapper_box_ug COMMAND ./test_facetcouplingmapper_box_ug CMD_ARGS test_gridmanager.input) -dune_add_test(NAME test_facetcouplingmapper_tpfa_boundary_alu +dumux_add_test(NAME test_facetcouplingmapper_tpfa_boundary_alu LABELS multidomain multidomain_facet CMAKE_GUARD "( dune-foamgrid_FOUND AND dune-alugrid_FOUND )" COMPILE_DEFINITIONS BULKGRIDTYPE=Dune::ALUGrid<2,2,Dune::simplex,Dune::conforming> @@ -79,7 +79,7 @@ dune_add_test(NAME test_facetcouplingmapper_tpfa_boundary_alu COMMAND ./test_facetcouplingmapper_tpfa_boundary_alu CMD_ARGS test_couplingmapper_boundary.input) -dune_add_test(NAME test_facetcouplingmapper_tpfa_boundary_ug +dumux_add_test(NAME test_facetcouplingmapper_tpfa_boundary_ug LABELS multidomain multidomain_facet CMAKE_GUARD "( dune-foamgrid_FOUND AND dune-uggrid_FOUND )" COMPILE_DEFINITIONS BULKGRIDTYPE=Dune::UGGrid<2> @@ -87,7 +87,7 @@ dune_add_test(NAME test_facetcouplingmapper_tpfa_boundary_ug COMMAND ./test_facetcouplingmapper_tpfa_boundary_ug CMD_ARGS test_couplingmapper_boundary.input) -dune_add_test(NAME test_vertexmapper_alu_3d +dumux_add_test(NAME test_vertexmapper_alu_3d LABELS multidomain multidomain_facet CMAKE_GUARD "( dune-foamgrid_FOUND AND dune-alugrid_FOUND )" COMPILE_DEFINITIONS BULKGRIDTYPE=Dune::ALUGrid<3,3,Dune::simplex,Dune::conforming> @@ -96,7 +96,7 @@ dune_add_test(NAME test_vertexmapper_alu_3d COMMAND ./test_vertexmapper_alu_3d CMD_ARGS test_vertexmapper.input -Grid.File 3d_grid.msh) -dune_add_test(NAME test_vertexmapper_alu_2d +dumux_add_test(NAME test_vertexmapper_alu_2d LABELS multidomain multidomain_facet CMAKE_GUARD "( dune-foamgrid_FOUND AND dune-alugrid_FOUND )" COMPILE_DEFINITIONS BULKGRIDTYPE=Dune::ALUGrid<2,2,Dune::simplex,Dune::conforming> diff --git a/test/multidomain/facet/tracer_tracer/CMakeLists.txt b/test/multidomain/facet/tracer_tracer/CMakeLists.txt index e523bae44d..50e59d04c7 100644 --- a/test/multidomain/facet/tracer_tracer/CMakeLists.txt +++ b/test/multidomain/facet/tracer_tracer/CMakeLists.txt @@ -1,6 +1,6 @@ dune_symlink_to_source_files(FILES "grids" "params.input") -dune_add_test(NAME test_md_facet_tracertracer_tpfa +dumux_add_test(NAME test_md_facet_tracertracer_tpfa LABELS multidomain multidomain_facet tracer SOURCES main.cc COMPILE_DEFINITIONS ONEPBULKTYPETAG=OnePBulkTpfa @@ -21,7 +21,7 @@ dune_add_test(NAME test_md_facet_tracertracer_tpfa --command "${CMAKE_CURRENT_BINARY_DIR}/test_md_facet_tracertracer_tpfa params.input \ -Vtk.OutputName test_md_facet_tracertracer_tpfa") -dune_add_test(NAME test_md_facet_tracertracer_mpfa +dumux_add_test(NAME test_md_facet_tracertracer_mpfa LABELS multidomain multidomain_facet tracer SOURCES main.cc COMPILE_DEFINITIONS ONEPBULKTYPETAG=OnePBulkMpfa @@ -43,7 +43,7 @@ dune_add_test(NAME test_md_facet_tracertracer_mpfa --command "${CMAKE_CURRENT_BINARY_DIR}/test_md_facet_tracertracer_mpfa params.input \ -Vtk.OutputName test_md_facet_tracertracer_mpfa") -dune_add_test(NAME test_md_facet_tracertracer_box +dumux_add_test(NAME test_md_facet_tracertracer_box LABELS multidomain multidomain_facet tracer SOURCES main.cc COMPILE_DEFINITIONS ONEPBULKTYPETAG=OnePBulkBox diff --git a/test/multidomain/poromechanics/el1p/CMakeLists.txt b/test/multidomain/poromechanics/el1p/CMakeLists.txt index e4a7bf67f3..cc801060a8 100644 --- a/test/multidomain/poromechanics/el1p/CMakeLists.txt +++ b/test/multidomain/poromechanics/el1p/CMakeLists.txt @@ -1,6 +1,6 @@ dune_symlink_to_source_files(FILES "params.input") -dune_add_test(NAME test_md_poromechanics_el1p +dumux_add_test(NAME test_md_poromechanics_el1p LABELS multidomain poromechanics 1p poroelastic SOURCES main.cc COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py diff --git a/test/multidomain/poromechanics/el2p/CMakeLists.txt b/test/multidomain/poromechanics/el2p/CMakeLists.txt index 1434109db6..35eab6328f 100644 --- a/test/multidomain/poromechanics/el2p/CMakeLists.txt +++ b/test/multidomain/poromechanics/el2p/CMakeLists.txt @@ -1,6 +1,6 @@ dune_symlink_to_source_files(FILES "params.input") -dune_add_test(NAME test_md_poromechanics_el2p +dumux_add_test(NAME test_md_poromechanics_el2p LABELS multidomain poromechanics 2p poroelastic SOURCES main.cc CMAKE_GUARD HAVE_UMFPACK diff --git a/test/porousmediumflow/1p/implicit/compressible/instationary/CMakeLists.txt b/test/porousmediumflow/1p/implicit/compressible/instationary/CMakeLists.txt index 76426275cb..938bd8ba7f 100644 --- a/test/porousmediumflow/1p/implicit/compressible/instationary/CMakeLists.txt +++ b/test/porousmediumflow/1p/implicit/compressible/instationary/CMakeLists.txt @@ -1,7 +1,7 @@ dune_symlink_to_source_files(FILES "params.input") # compressible instationary -dune_add_test(NAME test_1p_compressible_instationary_tpfa +dumux_add_test(NAME test_1p_compressible_instationary_tpfa LABELS porousmediumflow 1p SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=OnePCompressibleTpfa @@ -11,7 +11,7 @@ dune_add_test(NAME test_1p_compressible_instationary_tpfa ${CMAKE_CURRENT_BINARY_DIR}/test_1p_compressible_instationary_tpfa-00010.vtu --command "${CMAKE_CURRENT_BINARY_DIR}/test_1p_compressible_instationary_tpfa params.input -Problem.Name test_1p_compressible_instationary_tpfa") -dune_add_test(NAME test_1p_compressible_instationary_mpfa +dumux_add_test(NAME test_1p_compressible_instationary_mpfa LABELS porousmediumflow 1p SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=OnePCompressibleMpfa @@ -21,7 +21,7 @@ dune_add_test(NAME test_1p_compressible_instationary_mpfa ${CMAKE_CURRENT_BINARY_DIR}/test_1p_compressible_instationary_mpfa-00010.vtu --command "${CMAKE_CURRENT_BINARY_DIR}/test_1p_compressible_instationary_mpfa params.input -Problem.Name test_1p_compressible_instationary_mpfa") -dune_add_test(NAME test_1p_compressible_instationary_box +dumux_add_test(NAME test_1p_compressible_instationary_box LABELS porousmediumflow 1p SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=OnePCompressibleBox diff --git a/test/porousmediumflow/1p/implicit/compressible/stationary/CMakeLists.txt b/test/porousmediumflow/1p/implicit/compressible/stationary/CMakeLists.txt index 039a99519f..916c5679b9 100644 --- a/test/porousmediumflow/1p/implicit/compressible/stationary/CMakeLists.txt +++ b/test/porousmediumflow/1p/implicit/compressible/stationary/CMakeLists.txt @@ -1,7 +1,7 @@ dune_symlink_to_source_files(FILES "params.input") # compressible stationary -dune_add_test(NAME test_1p_compressible_stationary_tpfa +dumux_add_test(NAME test_1p_compressible_stationary_tpfa LABELS porousmediumflow 1p SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=OnePCompressibleTpfa @@ -11,7 +11,7 @@ dune_add_test(NAME test_1p_compressible_stationary_tpfa ${CMAKE_CURRENT_BINARY_DIR}/test_1p_compressible_stationary_tpfa-00001.vtu --command "${CMAKE_CURRENT_BINARY_DIR}/test_1p_compressible_stationary_tpfa params.input -Problem.Name test_1p_compressible_stationary_tpfa") -dune_add_test(NAME test_1p_compressible_stationary_mpfa +dumux_add_test(NAME test_1p_compressible_stationary_mpfa LABELS porousmediumflow 1p SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=OnePCompressibleMpfa @@ -21,7 +21,7 @@ dune_add_test(NAME test_1p_compressible_stationary_mpfa ${CMAKE_CURRENT_BINARY_DIR}/test_1p_compressible_stationary_mpfa-00001.vtu --command "${CMAKE_CURRENT_BINARY_DIR}/test_1p_compressible_stationary_mpfa params.input -Problem.Name test_1p_compressible_stationary_mpfa") -dune_add_test(NAME test_1p_compressible_stationary_box +dumux_add_test(NAME test_1p_compressible_stationary_box LABELS porousmediumflow 1p SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=OnePCompressibleBox diff --git a/test/porousmediumflow/1p/implicit/convergence/CMakeLists.txt b/test/porousmediumflow/1p/implicit/convergence/CMakeLists.txt index 620355cb05..578ab409c8 100644 --- a/test/porousmediumflow/1p/implicit/convergence/CMakeLists.txt +++ b/test/porousmediumflow/1p/implicit/convergence/CMakeLists.txt @@ -9,7 +9,7 @@ add_executable(test_1p_convergence_box EXCLUDE_FROM_ALL main.cc) target_compile_definitions(test_1p_convergence_box PUBLIC "TYPETAG=OnePIncompressibleBox") # using tpfa and conforming refinement -dune_add_test(NAME test_1p_convergence_tpfa_conforming +dumux_add_test(NAME test_1p_convergence_tpfa_conforming TARGET test_1p_convergence_tpfa CMAKE_GUARD "( dune-functions_FOUND )" LABELS porousmediumflow 1p @@ -17,7 +17,7 @@ dune_add_test(NAME test_1p_convergence_tpfa_conforming CMD_ARGS params.input -Problem.Name test_1p_convergence_tpfa_conforming) # using tpfa and nonconforming refinement -dune_add_test(NAME test_1p_convergence_tpfa_nonconforming +dumux_add_test(NAME test_1p_convergence_tpfa_nonconforming TARGET test_1p_convergence_tpfa CMAKE_GUARD "( dune-functions_FOUND )" LABELS porousmediumflow 1p @@ -25,7 +25,7 @@ dune_add_test(NAME test_1p_convergence_tpfa_nonconforming CMD_ARGS params.input -Problem.Name test_1p_convergence_tpfa_conforming) # using box and conforming refinement -dune_add_test(NAME test_1p_convergence_box_conforming +dumux_add_test(NAME test_1p_convergence_box_conforming TARGET test_1p_convergence_box CMAKE_GUARD "( dune-functions_FOUND )" LABELS porousmediumflow 1p @@ -33,7 +33,7 @@ dune_add_test(NAME test_1p_convergence_box_conforming CMD_ARGS params.input -Problem.Name test_1p_convergence_box_conforming) # using box and nonconforming refinement -dune_add_test(NAME test_1p_convergence_box_nonconforming +dumux_add_test(NAME test_1p_convergence_box_nonconforming TARGET test_1p_convergence_box CMAKE_GUARD "( dune-functions_FOUND )" LABELS porousmediumflow 1p diff --git a/test/porousmediumflow/1p/implicit/fracture2d3d/CMakeLists.txt b/test/porousmediumflow/1p/implicit/fracture2d3d/CMakeLists.txt index 850331e529..f4993b197f 100644 --- a/test/porousmediumflow/1p/implicit/fracture2d3d/CMakeLists.txt +++ b/test/porousmediumflow/1p/implicit/fracture2d3d/CMakeLists.txt @@ -3,7 +3,7 @@ add_input_file_links() dune_symlink_to_source_files(FILES grids) # dim < dimWorld tests with Dune::Foamgrid<2,3> -dune_add_test(NAME test_1p_fracture2d3d_box +dumux_add_test(NAME test_1p_fracture2d3d_box LABELS porousmediumflow 1p SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=FractureBox @@ -14,7 +14,7 @@ dune_add_test(NAME test_1p_fracture2d3d_box ${CMAKE_CURRENT_BINARY_DIR}/test_1p_fracture2d3d_box-00001.vtu --command "${CMAKE_CURRENT_BINARY_DIR}/test_1p_fracture2d3d_box params.input -Problem.Name test_1p_fracture2d3d_box") -dune_add_test(NAME test_1p_fracture2d3d_tpfa +dumux_add_test(NAME test_1p_fracture2d3d_tpfa LABELS porousmediumflow 1p SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=FractureCCTpfa @@ -25,7 +25,7 @@ dune_add_test(NAME test_1p_fracture2d3d_tpfa ${CMAKE_CURRENT_BINARY_DIR}/test_1p_fracture2d3d_tpfa-00001.vtu --command "${CMAKE_CURRENT_BINARY_DIR}/test_1p_fracture2d3d_tpfa params.input -Problem.Name test_1p_fracture2d3d_tpfa") -dune_add_test(NAME test_1p_fracture2d3d_mpfa +dumux_add_test(NAME test_1p_fracture2d3d_mpfa LABELS porousmediumflow 1p SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=FractureCCMpfa diff --git a/test/porousmediumflow/1p/implicit/incompressible/CMakeLists.txt b/test/porousmediumflow/1p/implicit/incompressible/CMakeLists.txt index aaa60aeea5..be15fd0694 100644 --- a/test/porousmediumflow/1p/implicit/incompressible/CMakeLists.txt +++ b/test/porousmediumflow/1p/implicit/incompressible/CMakeLists.txt @@ -14,7 +14,7 @@ add_executable(test_1p_incompressible_box_anadiff EXCLUDE_FROM_ALL main.cc) target_compile_definitions(test_1p_incompressible_box_anadiff PUBLIC "TYPETAG=OnePIncompressibleBox" "NUMDIFFMETHOD=DiffMethod::analytic") # using tpfa and analytical Jacobian -dune_add_test(NAME test_1p_incompressible_tpfa +dumux_add_test(NAME test_1p_incompressible_tpfa TARGET test_1p_incompressible_tpfa_anadiff LABELS porousmediumflow 1p COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py @@ -24,7 +24,7 @@ dune_add_test(NAME test_1p_incompressible_tpfa --command "${CMAKE_CURRENT_BINARY_DIR}/test_1p_incompressible_tpfa_anadiff params.input -Problem.Name test_1p_incompressible_tpfa") # using tpfa, analytical Jacobian and quad precision -dune_add_test(NAME test_1p_incompressible_tpfa_quad +dumux_add_test(NAME test_1p_incompressible_tpfa_quad LABELS porousmediumflow 1p SOURCES main.cc CMAKE_GUARD HAVE_QUAD @@ -37,7 +37,7 @@ dune_add_test(NAME test_1p_incompressible_tpfa_quad --command "${CMAKE_CURRENT_BINARY_DIR}/test_1p_incompressible_tpfa_quad params.input -Problem.Name test_1p_incompressible_tpfa_quad") # using mpfa and analytical Jacobian -dune_add_test(NAME test_1p_incompressible_mpfa +dumux_add_test(NAME test_1p_incompressible_mpfa TARGET test_1p_incompressible_mpfa_anadiff LABELS porousmediumflow 1p COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py @@ -49,7 +49,7 @@ dune_add_test(NAME test_1p_incompressible_mpfa --command "${CMAKE_CURRENT_BINARY_DIR}/test_1p_incompressible_mpfa_anadiff params.input -Problem.Name test_1p_incompressible_mpfa -IO.WriteMpfaVelocities true") # using box and analytical Jacobian -dune_add_test(NAME test_1p_incompressible_box +dumux_add_test(NAME test_1p_incompressible_box TARGET test_1p_incompressible_box_anadiff LABELS porousmediumflow 1p COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py @@ -59,7 +59,7 @@ dune_add_test(NAME test_1p_incompressible_box --command "${CMAKE_CURRENT_BINARY_DIR}/test_1p_incompressible_box_anadiff params.input -Problem.Name test_1p_incompressible_box") # using tpfa and numeric differentiation -dune_add_test(NAME test_1p_incompressible_tpfa_numdiff +dumux_add_test(NAME test_1p_incompressible_tpfa_numdiff LABELS porousmediumflow 1p SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=OnePIncompressibleTpfa NUMDIFFMETHOD=DiffMethod::numeric @@ -72,7 +72,7 @@ dune_add_test(NAME test_1p_incompressible_tpfa_numdiff -Assembly.NumericDifference.PriVarMagnitude 1e5") # using box and numeric differentiation -dune_add_test(NAME test_1p_incompressible_box_numdiff +dumux_add_test(NAME test_1p_incompressible_box_numdiff LABELS porousmediumflow 1p SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=OnePIncompressibleBox NUMDIFFMETHOD=DiffMethod::numeric @@ -85,7 +85,7 @@ dune_add_test(NAME test_1p_incompressible_box_numdiff -Assembly.NumericDifference.PriVarMagnitude 1e5") # using tpfa and analytical Jacobian with extrusion factor -dune_add_test(NAME test_1p_incompressible_tpfa_extrude +dumux_add_test(NAME test_1p_incompressible_tpfa_extrude TARGET test_1p_incompressible_tpfa_anadiff LABELS porousmediumflow 1p COMMAND ./test_1p_incompressible_tpfa_anadiff @@ -96,7 +96,7 @@ dune_add_test(NAME test_1p_incompressible_tpfa_extrude -Problem.EnableGravity false) # using mpfa and analytical Jacobian with extrusion factor -dune_add_test(NAME test_1p_incompressible_mpfa_extrude +dumux_add_test(NAME test_1p_incompressible_mpfa_extrude TARGET test_1p_incompressible_mpfa_anadiff LABELS porousmediumflow 1p COMMAND ./test_1p_incompressible_mpfa_anadiff @@ -107,7 +107,7 @@ dune_add_test(NAME test_1p_incompressible_mpfa_extrude -Problem.EnableGravity false) # using box and analytical Jacobian with extrusion factor -dune_add_test(NAME test_1p_incompressible_box_extrude +dumux_add_test(NAME test_1p_incompressible_box_extrude TARGET test_1p_incompressible_box_anadiff LABELS porousmediumflow 1p COMMAND ./test_1p_incompressible_box_anadiff @@ -118,7 +118,7 @@ dune_add_test(NAME test_1p_incompressible_box_extrude -Problem.EnableGravity false) # using box and analytical Jacobian with extrusion factor on distorted grid -dune_add_test(NAME test_1p_incompressible_box_extrude_distorted +dumux_add_test(NAME test_1p_incompressible_box_extrude_distorted LABELS porousmediumflow 1p SOURCES main.cc CMAKE_GUARD dune-uggrid_FOUND @@ -133,7 +133,7 @@ dune_add_test(NAME test_1p_incompressible_box_extrude_distorted -Grid.File ./grids/randomlydistorted.dgf) # using mpfa and analytical Jacobian with extrusion factor on distorted grid -dune_add_test(NAME test_1p_incompressible_mpfa_extrude_distorted +dumux_add_test(NAME test_1p_incompressible_mpfa_extrude_distorted LABELS porousmediumflow 1p SOURCES main.cc CMAKE_GUARD dune-uggrid_FOUND diff --git a/test/porousmediumflow/1p/implicit/internaldirichlet/CMakeLists.txt b/test/porousmediumflow/1p/implicit/internaldirichlet/CMakeLists.txt index 3c5254749d..1b5956b7ac 100644 --- a/test/porousmediumflow/1p/implicit/internaldirichlet/CMakeLists.txt +++ b/test/porousmediumflow/1p/implicit/internaldirichlet/CMakeLists.txt @@ -4,7 +4,7 @@ # Once its implemented replace OnePInternalDirichletBox by OnePInternalDirichletTpfa (and uncomment OnePInternalDirichletTpfa in the problem.hh) # and remove the EXPECT_COMPILE_FAIL flag -# dune_add_test(NAME test_1p_internaldirichlet_tpfa +# dumux_add_test(NAME test_1p_internaldirichlet_tpfa # EXPECT_COMPILE_FAIL # SOURCES ${CMAKE_SOURCE_DIR}/test/porousmediumflow/1p/implicit/incompressible/main.cc # LABELS porousmediumflow 1p @@ -16,7 +16,7 @@ # ${CMAKE_CURRENT_BINARY_DIR}/test_1p_internaldirichlet_tpfa-00001.vtu # --command "${CMAKE_CURRENT_BINARY_DIR}/test_1p_internaldirichlet_tpfa ${CMAKE_SOURCE_DIR}/test/porousmediumflow/1p/implicit/incompressible/params.input -Problem.Name test_1p_internaldirichlet_tpfa -Problem.EnableGravity false") -dune_add_test(NAME test_1p_internaldirichlet_box +dumux_add_test(NAME test_1p_internaldirichlet_box SOURCES ${CMAKE_SOURCE_DIR}/test/porousmediumflow/1p/implicit/incompressible/main.cc LABELS porousmediumflow 1p COMPILE_DEFINITIONS TYPETAG=OnePInternalDirichletBox diff --git a/test/porousmediumflow/1p/implicit/isothermal/CMakeLists.txt b/test/porousmediumflow/1p/implicit/isothermal/CMakeLists.txt index da2aa7369c..090267217b 100644 --- a/test/porousmediumflow/1p/implicit/isothermal/CMakeLists.txt +++ b/test/porousmediumflow/1p/implicit/isothermal/CMakeLists.txt @@ -3,7 +3,7 @@ add_input_file_links() add_gstat_file_links() # isothermal tests -dune_add_test(NAME test_1p_tpfa +dumux_add_test(NAME test_1p_tpfa LABELS porousmediumflow 1p SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=OnePTestCCTpfa @@ -13,7 +13,7 @@ dune_add_test(NAME test_1p_tpfa ${CMAKE_CURRENT_BINARY_DIR}/test_1p_tpfa-00001.vtu --command "${CMAKE_CURRENT_BINARY_DIR}/test_1p_tpfa params.input -Problem.Name test_1p_tpfa") -dune_add_test(NAME test_1p_mpfa +dumux_add_test(NAME test_1p_mpfa LABELS porousmediumflow 1p SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=OnePTestCCMpfa @@ -23,7 +23,7 @@ dune_add_test(NAME test_1p_mpfa ${CMAKE_CURRENT_BINARY_DIR}/test_1p_mpfa-00001.vtu --command "${CMAKE_CURRENT_BINARY_DIR}/test_1p_mpfa params.input -Problem.Name test_1p_mpfa") -dune_add_test(NAME test_1p_box +dumux_add_test(NAME test_1p_box LABELS porousmediumflow 1p SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=OnePTestBox @@ -33,7 +33,7 @@ dune_add_test(NAME test_1p_box ${CMAKE_CURRENT_BINARY_DIR}/test_1p_box-00001.vtu --command "${CMAKE_CURRENT_BINARY_DIR}/test_1p_box params.input -Problem.Name test_1p_box") -dune_add_test(NAME test_1p_forchheimer_tpfa +dumux_add_test(NAME test_1p_forchheimer_tpfa LABELS porousmediumflow 1p SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=OnePTestCCTpfa FORCHHEIMER=1 @@ -45,7 +45,7 @@ dune_add_test(NAME test_1p_forchheimer_tpfa --zeroThreshold {"velocity_liq \(m/s\)":1e-12}) # a gstat test (becaue it's a random permeability field we can't test against a reference solution) -dune_add_test(NAME test_1p_gstat +dumux_add_test(NAME test_1p_gstat LABELS porousmediumflow 1p SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=OnePTestCCTpfa diff --git a/test/porousmediumflow/1p/implicit/network1d3d/CMakeLists.txt b/test/porousmediumflow/1p/implicit/network1d3d/CMakeLists.txt index abe971e90e..4b09d46afe 100644 --- a/test/porousmediumflow/1p/implicit/network1d3d/CMakeLists.txt +++ b/test/porousmediumflow/1p/implicit/network1d3d/CMakeLists.txt @@ -5,7 +5,7 @@ dune_symlink_to_source_files(FILES grids) dune_symlink_to_source_files(FILES "convergencetest.py") # dim < dimWorld tests with Dune::Foamgrid<1,3> -dune_add_test(NAME test_1p_network1d3d_tpfa +dumux_add_test(NAME test_1p_network1d3d_tpfa LABELS porousmediumflow 1p SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=TubesTestCCTpfa @@ -13,7 +13,7 @@ dune_add_test(NAME test_1p_network1d3d_tpfa COMMAND ./convergencetest.py CMD_ARGS test_1p_network1d3d_tpfa params.input -Problem.Name test_1p_network1d3d_tpfa) -dune_add_test(NAME test_1p_network1d3d_box +dumux_add_test(NAME test_1p_network1d3d_box LABELS porousmediumflow 1p SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=TubesTestBox diff --git a/test/porousmediumflow/1p/implicit/nonisothermal/CMakeLists.txt b/test/porousmediumflow/1p/implicit/nonisothermal/CMakeLists.txt index 1f591c0699..9b2594e883 100644 --- a/test/porousmediumflow/1p/implicit/nonisothermal/CMakeLists.txt +++ b/test/porousmediumflow/1p/implicit/nonisothermal/CMakeLists.txt @@ -1,7 +1,7 @@ add_input_file_links() # non-isothermal tests -dune_add_test(NAME test_1pni_conduction_box +dumux_add_test(NAME test_1pni_conduction_box LABELS porousmediumflow 1p 1pni SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=OnePNIConductionBox @@ -15,7 +15,7 @@ dune_add_test(NAME test_1pni_conduction_box add_executable(test_1pni_convection_box EXCLUDE_FROM_ALL main.cc) target_compile_definitions(test_1pni_convection_box PUBLIC TYPETAG=OnePNIConvectionBox) -dune_add_test(NAME test_1pni_convection_box +dumux_add_test(NAME test_1pni_convection_box TARGET test_1pni_convection_box LABELS porousmediumflow 1p 1pni COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py @@ -25,7 +25,7 @@ dune_add_test(NAME test_1pni_convection_box --command "${CMAKE_CURRENT_BINARY_DIR}/test_1pni_convection_box params_convection.input -Problem.Name test_1pni_convection_box" --zeroThreshold {"velocity":1e-15}) -dune_add_test(NAME test_1pni_convection_box_restart +dumux_add_test(NAME test_1pni_convection_box_restart TARGET test_1pni_convection_box LABELS porousmediumflow 1p 1pni COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py @@ -38,7 +38,7 @@ dune_add_test(NAME test_1pni_convection_box_restart # the restart test has to run after the test that produces the corresponding vtu file set_tests_properties(test_1pni_convection_box_restart PROPERTIES DEPENDS test_1pni_convection_box) -dune_add_test(NAME test_1pni_conduction_tpfa +dumux_add_test(NAME test_1pni_conduction_tpfa LABELS porousmediumflow 1p 1pni SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=OnePNIConductionCCTpfa @@ -49,7 +49,7 @@ dune_add_test(NAME test_1pni_conduction_tpfa --command "${CMAKE_CURRENT_BINARY_DIR}/test_1pni_conduction_tpfa params_conduction.input -Problem.Name test_1pni_conduction_tpfa" --zeroThreshold {"velocity":1e-8}) -dune_add_test(NAME test_1pni_convection_tpfa +dumux_add_test(NAME test_1pni_convection_tpfa LABELS porousmediumflow 1p 1pni SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=OnePNIConvectionCCTpfa @@ -59,7 +59,7 @@ dune_add_test(NAME test_1pni_convection_tpfa ${CMAKE_CURRENT_BINARY_DIR}/test_1pni_convection_tpfa-00009.vtp --command "${CMAKE_CURRENT_BINARY_DIR}/test_1pni_convection_tpfa params_convection.input -Problem.Name test_1pni_convection_tpfa") -dune_add_test(NAME test_1pni_conduction_mpfa +dumux_add_test(NAME test_1pni_conduction_mpfa LABELS porousmediumflow 1p 1pni SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=OnePNIConductionCCMpfa diff --git a/test/porousmediumflow/1p/implicit/periodicbc/CMakeLists.txt b/test/porousmediumflow/1p/implicit/periodicbc/CMakeLists.txt index 36de824f99..a02c8ad775 100644 --- a/test/porousmediumflow/1p/implicit/periodicbc/CMakeLists.txt +++ b/test/porousmediumflow/1p/implicit/periodicbc/CMakeLists.txt @@ -1,14 +1,14 @@ dune_symlink_to_source_files(FILES "params.input" "periodic.dgf") # test using periodic boundary conditions -dune_add_test(NAME test_1p_periodic_tpfa +dumux_add_test(NAME test_1p_periodic_tpfa LABELS porousmediumflow 1p SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=OnePIncompressibleTpfa FVGEOMCACHING=false CMAKE_GUARD dune-spgrid_FOUND COMPILE_ONLY) -dune_add_test(NAME test_1p_periodic_tpfa_sequential +dumux_add_test(NAME test_1p_periodic_tpfa_sequential TARGET test_1p_periodic_tpfa LABELS porousmediumflow 1p CMAKE_GUARD dune-spgrid_FOUND @@ -18,7 +18,7 @@ dune_add_test(NAME test_1p_periodic_tpfa_sequential ${CMAKE_CURRENT_BINARY_DIR}/test_1p_periodic_tpfa_sequential-00001.vtu --command "${CMAKE_CURRENT_BINARY_DIR}/test_1p_periodic_tpfa params.input -Problem.Name test_1p_periodic_tpfa_sequential") -dune_add_test(NAME test_1p_periodic_tpfa_parallel +dumux_add_test(NAME test_1p_periodic_tpfa_parallel TARGET test_1p_periodic_tpfa LABELS porousmediumflow 1p parallel CMAKE_GUARD dune-spgrid_FOUND @@ -29,7 +29,7 @@ dune_add_test(NAME test_1p_periodic_tpfa_parallel ${CMAKE_CURRENT_BINARY_DIR}/s0002-test_1p_periodic_tpfa_parallel-00001.pvtu --command "${MPIEXEC} -np 2 ${CMAKE_CURRENT_BINARY_DIR}/test_1p_periodic_tpfa params.input -Problem.Name test_1p_periodic_tpfa_parallel") -dune_add_test(NAME test_1p_periodic_tpfa_caching +dumux_add_test(NAME test_1p_periodic_tpfa_caching LABELS porousmediumflow 1p SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=OnePIncompressibleTpfa FVGEOMCACHING=true @@ -40,7 +40,7 @@ dune_add_test(NAME test_1p_periodic_tpfa_caching ${CMAKE_CURRENT_BINARY_DIR}/test_1p_periodic_tpfa_caching-00001.vtu --command "${CMAKE_CURRENT_BINARY_DIR}/test_1p_periodic_tpfa params.input -Problem.Name test_1p_periodic_tpfa_caching") -dune_add_test(NAME test_1p_periodic_box +dumux_add_test(NAME test_1p_periodic_box LABELS porousmediumflow 1p SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=OnePIncompressibleBox diff --git a/test/porousmediumflow/1p/implicit/pointsources/timedependent/CMakeLists.txt b/test/porousmediumflow/1p/implicit/pointsources/timedependent/CMakeLists.txt index 303a4a87f5..0b0410c5c9 100644 --- a/test/porousmediumflow/1p/implicit/pointsources/timedependent/CMakeLists.txt +++ b/test/porousmediumflow/1p/implicit/pointsources/timedependent/CMakeLists.txt @@ -1,6 +1,6 @@ add_input_file_links("params.input") -dune_add_test(NAME test_1p_pointsources_timedependent_tpfa +dumux_add_test(NAME test_1p_pointsources_timedependent_tpfa LABELS porousmediumflow 1p SOURCES main.cc COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py diff --git a/test/porousmediumflow/1p/implicit/pointsources/timeindependent/CMakeLists.txt b/test/porousmediumflow/1p/implicit/pointsources/timeindependent/CMakeLists.txt index 3908a97f03..1d7ba985a2 100644 --- a/test/porousmediumflow/1p/implicit/pointsources/timeindependent/CMakeLists.txt +++ b/test/porousmediumflow/1p/implicit/pointsources/timeindependent/CMakeLists.txt @@ -1,7 +1,7 @@ add_input_file_links("params.input") dune_symlink_to_source_files(FILES grids) -dune_add_test(NAME test_1p_pointsources_timeindependent_tpfa +dumux_add_test(NAME test_1p_pointsources_timeindependent_tpfa LABELS porousmediumflow 1p SOURCES main.cc COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py @@ -11,7 +11,7 @@ dune_add_test(NAME test_1p_pointsources_timeindependent_tpfa ${CMAKE_CURRENT_BINARY_DIR}/test_1p_pointsources_timeindependent_tpfa-00001.vtu --command "${CMAKE_CURRENT_BINARY_DIR}/test_1p_pointsources_timeindependent_tpfa params.input -Problem.Name test_1p_pointsources_timeindependent_tpfa") -dune_add_test(NAME test_1p_pointsources_timeindependent_box +dumux_add_test(NAME test_1p_pointsources_timeindependent_box LABELS porousmediumflow 1p SOURCES main.cc COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py @@ -21,7 +21,7 @@ dune_add_test(NAME test_1p_pointsources_timeindependent_box ${CMAKE_CURRENT_BINARY_DIR}/test_1p_pointsources_timeindependent_box-00001.vtu --command "${CMAKE_CURRENT_BINARY_DIR}/test_1p_pointsources_timeindependent_box params.input -Problem.Name test_1p_pointsources_timeindependent_box") -dune_add_test(NAME test_1p_pointsources_timeindependent_tpfa_prism +dumux_add_test(NAME test_1p_pointsources_timeindependent_tpfa_prism LABELS porousmediumflow 1p SOURCES main.cc CMAKE_GUARD dune-uggrid_FOUND @@ -35,7 +35,7 @@ dune_add_test(NAME test_1p_pointsources_timeindependent_tpfa_prism -Problem.Name test_1p_pointsources_timeindependent_tpfa_prism -Grid.File ./grids/well_prism.msh") -dune_add_test(NAME test_1p_pointsources_timeindependent_box_prism +dumux_add_test(NAME test_1p_pointsources_timeindependent_box_prism LABELS porousmediumflow 1p SOURCES main.cc CMAKE_GUARD dune-uggrid_FOUND diff --git a/test/porousmediumflow/1p/sequential/CMakeLists.txt b/test/porousmediumflow/1p/sequential/CMakeLists.txt index 3931539ef4..2a763a1614 100644 --- a/test/porousmediumflow/1p/sequential/CMakeLists.txt +++ b/test/porousmediumflow/1p/sequential/CMakeLists.txt @@ -1,7 +1,7 @@ add_input_file_links() dune_symlink_to_source_files(FILES grids) -dune_add_test(NAME test_dec1p +dumux_add_test(NAME test_dec1p LABELS porousmediumflow 1p SOURCES test_1p.cc COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py @@ -10,7 +10,7 @@ dune_add_test(NAME test_dec1p ${CMAKE_CURRENT_BINARY_DIR}/test_1p-00000.vtu --command "${CMAKE_CURRENT_BINARY_DIR}/test_dec1p -ParameterFile ${CMAKE_CURRENT_SOURCE_DIR}/test_1p.input") -dune_add_test(NAME test_diffusion +dumux_add_test(NAME test_diffusion LABELS porousmediumflow 1p SOURCES test_diffusion.cc COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py @@ -19,7 +19,7 @@ dune_add_test(NAME test_diffusion ${CMAKE_CURRENT_BINARY_DIR}/mimeticdiffusion-00000.vtu --command "${CMAKE_CURRENT_BINARY_DIR}/test_diffusion") -dune_add_test(NAME test_diffusion3d +dumux_add_test(NAME test_diffusion3d LABELS porousmediumflow 1p SOURCES test_diffusion3d.cc COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py diff --git a/test/porousmediumflow/1pnc/implicit/1p2c/isothermal/CMakeLists.txt b/test/porousmediumflow/1pnc/implicit/1p2c/isothermal/CMakeLists.txt index 35e9adc658..7a06e249c9 100644 --- a/test/porousmediumflow/1pnc/implicit/1p2c/isothermal/CMakeLists.txt +++ b/test/porousmediumflow/1pnc/implicit/1p2c/isothermal/CMakeLists.txt @@ -2,7 +2,7 @@ add_subdirectory(saltwaterintrusion) add_input_file_links() -dune_add_test(NAME test_1p2c_transport_box +dumux_add_test(NAME test_1p2c_transport_box LABELS porousmediumflow 1p2c 1pnc SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=OnePTwoCTestBox @@ -13,7 +13,7 @@ dune_add_test(NAME test_1p2c_transport_box --command "${CMAKE_CURRENT_BINARY_DIR}/test_1p2c_transport_box params.input -Problem.Name test_1p2c_transport_box" --zeroThreshold {"velocity_liq \(m/s\)_1":1e-15}) -dune_add_test(NAME test_1p2c_transport_tpfa +dumux_add_test(NAME test_1p2c_transport_tpfa LABELS porousmediumflow 1p2c 1pnc SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=OnePTwoCTestCCTpfa @@ -24,7 +24,7 @@ dune_add_test(NAME test_1p2c_transport_tpfa --command "${CMAKE_CURRENT_BINARY_DIR}/test_1p2c_transport_tpfa params.input -Problem.Name test_1p2c_transport_tpfa" --zeroThreshold {"velocity_liq \(m/s\)_1":1e-15}) -dune_add_test(NAME test_1p2c_transport_mpfa +dumux_add_test(NAME test_1p2c_transport_mpfa LABELS porousmediumflow 1p2c 1pnc SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=OnePTwoCTestCCMpfa diff --git a/test/porousmediumflow/1pnc/implicit/1p2c/isothermal/saltwaterintrusion/CMakeLists.txt b/test/porousmediumflow/1pnc/implicit/1p2c/isothermal/saltwaterintrusion/CMakeLists.txt index 421ca75729..bab5486b2e 100644 --- a/test/porousmediumflow/1pnc/implicit/1p2c/isothermal/saltwaterintrusion/CMakeLists.txt +++ b/test/porousmediumflow/1pnc/implicit/1p2c/isothermal/saltwaterintrusion/CMakeLists.txt @@ -1,7 +1,7 @@ add_input_file_links() # salt-water intrusion test using the box model -dune_add_test(NAME test_1p2c_saltwaterintrusion_box +dumux_add_test(NAME test_1p2c_saltwaterintrusion_box LABELS porousmediumflow 1p2c SOURCES main.cc LABELS 1pnc diff --git a/test/porousmediumflow/1pnc/implicit/1p2c/nonisothermal/conduction/CMakeLists.txt b/test/porousmediumflow/1pnc/implicit/1p2c/nonisothermal/conduction/CMakeLists.txt index c1b2a48ae8..30fcb84cf4 100644 --- a/test/porousmediumflow/1pnc/implicit/1p2c/nonisothermal/conduction/CMakeLists.txt +++ b/test/porousmediumflow/1pnc/implicit/1p2c/nonisothermal/conduction/CMakeLists.txt @@ -2,7 +2,7 @@ add_input_file_links() # non-isothermal tests # conduction -dune_add_test(NAME test_1p2cni_conduction_box +dumux_add_test(NAME test_1p2cni_conduction_box LABELS porousmediumflow 1p2c 1p2cni SOURCES main.cc LABELS 1pnc @@ -14,7 +14,7 @@ dune_add_test(NAME test_1p2cni_conduction_box --command "${CMAKE_CURRENT_BINARY_DIR}/test_1p2cni_conduction_box params.input -Problem.Name test_1p2cni_conduction_box" --zeroThreshold {"velocity_liq \(m/s\)":1e-9}) -dune_add_test(NAME test_1p2cni_conduction_tpfa +dumux_add_test(NAME test_1p2cni_conduction_tpfa LABELS porousmediumflow 1p2c 1p2cni SOURCES main.cc LABELS 1pnc @@ -26,7 +26,7 @@ dune_add_test(NAME test_1p2cni_conduction_tpfa --command "${CMAKE_CURRENT_BINARY_DIR}/test_1p2cni_conduction_tpfa params.input -Problem.Name test_1p2cni_conduction_tpfa" --zeroThreshold {"velocity_liq \(m/s\)_0":1e-9}) -dune_add_test(NAME test_1p2cni_conduction_mpfa +dumux_add_test(NAME test_1p2cni_conduction_mpfa LABELS porousmediumflow 1p2c 1p2cni SOURCES main.cc LABELS 1pnc diff --git a/test/porousmediumflow/1pnc/implicit/1p2c/nonisothermal/convection/CMakeLists.txt b/test/porousmediumflow/1pnc/implicit/1p2c/nonisothermal/convection/CMakeLists.txt index 04c5f32837..d86012463a 100644 --- a/test/porousmediumflow/1pnc/implicit/1p2c/nonisothermal/convection/CMakeLists.txt +++ b/test/porousmediumflow/1pnc/implicit/1p2c/nonisothermal/convection/CMakeLists.txt @@ -2,7 +2,7 @@ add_input_file_links() # non-isothermal tests # convection -dune_add_test(NAME test_1p2cni_convection_box +dumux_add_test(NAME test_1p2cni_convection_box LABELS porousmediumflow 1p2c 1p2cni SOURCES main.cc LABELS 1pnc @@ -14,7 +14,7 @@ dune_add_test(NAME test_1p2cni_convection_box --command "${CMAKE_CURRENT_BINARY_DIR}/test_1p2cni_convection_box params.input -Problem.Name test_1p2cni_convection_box" --zeroThreshold {"velocity_liq \(m/s\)":1e-9}) -dune_add_test(NAME test_1p2cni_convection_tpfa +dumux_add_test(NAME test_1p2cni_convection_tpfa LABELS porousmediumflow 1p2c 1p2cni SOURCES main.cc LABELS 1pnc @@ -26,7 +26,7 @@ dune_add_test(NAME test_1p2cni_convection_tpfa --command "${CMAKE_CURRENT_BINARY_DIR}/test_1p2cni_convection_tpfa params.input -Problem.Name test_1p2cni_convection_tpfa" --zeroThreshold {"velocity_liq \(m/s\)_0":1e-9}) -dune_add_test(NAME test_1p2cni_convection_mpfa +dumux_add_test(NAME test_1p2cni_convection_mpfa LABELS porousmediumflow 1p2c 1p2cni SOURCES main.cc LABELS 1pnc diff --git a/test/porousmediumflow/1pnc/implicit/1p2c/nonisothermal/transientbc/CMakeLists.txt b/test/porousmediumflow/1pnc/implicit/1p2c/nonisothermal/transientbc/CMakeLists.txt index dba370d293..792fd3fffd 100644 --- a/test/porousmediumflow/1pnc/implicit/1p2c/nonisothermal/transientbc/CMakeLists.txt +++ b/test/porousmediumflow/1pnc/implicit/1p2c/nonisothermal/transientbc/CMakeLists.txt @@ -1,6 +1,6 @@ add_input_file_links() -dune_add_test(NAME test_1pncni_transientbc_box_caching +dumux_add_test(NAME test_1pncni_transientbc_box_caching LABELS porousmediumflow 1pnc 1pncni SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=OnePTwoCNITransientBCBox ENABLECACHING=1 @@ -12,7 +12,7 @@ dune_add_test(NAME test_1pncni_transientbc_box_caching ${CMAKE_CURRENT_BINARY_DIR}/test_1p2cni_transientbc_box_caching-00009.vtu --command "${CMAKE_CURRENT_BINARY_DIR}/test_1pncni_transientbc_box_caching params.input -Problem.Name test_1p2cni_transientbc_box_caching") -dune_add_test(NAME test_1pncni_transientbc_box +dumux_add_test(NAME test_1pncni_transientbc_box LABELS porousmediumflow 1pnc 1pncni SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=OnePTwoCNITransientBCBox ENABLECACHING=0 @@ -24,7 +24,7 @@ dune_add_test(NAME test_1pncni_transientbc_box ${CMAKE_CURRENT_BINARY_DIR}/test_1p2cni_transientbc_box-00009.vtu --command "${CMAKE_CURRENT_BINARY_DIR}/test_1pncni_transientbc_box params.input -Problem.Name test_1p2cni_transientbc_box") -dune_add_test(NAME test_1pncni_transientbc_tpfa_caching +dumux_add_test(NAME test_1pncni_transientbc_tpfa_caching LABELS porousmediumflow 1pnc 1pncni SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=OnePTwoCNITransientBCCCTpfa ENABLECACHING=1 @@ -36,7 +36,7 @@ dune_add_test(NAME test_1pncni_transientbc_tpfa_caching ${CMAKE_CURRENT_BINARY_DIR}/test_1p2cni_transientbc_tpfa_caching-00009.vtu --command "${CMAKE_CURRENT_BINARY_DIR}/test_1pncni_transientbc_tpfa_caching params.input -Problem.Name test_1p2cni_transientbc_tpfa_caching") -dune_add_test(NAME test_1pncni_transientbc_tpfa +dumux_add_test(NAME test_1pncni_transientbc_tpfa LABELS porousmediumflow 1pnc 1pncni SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=OnePTwoCNITransientBCCCTpfa ENABLECACHING=0 @@ -48,7 +48,7 @@ dune_add_test(NAME test_1pncni_transientbc_tpfa ${CMAKE_CURRENT_BINARY_DIR}/test_1p2cni_transientbc_tpfa-00009.vtu --command "${CMAKE_CURRENT_BINARY_DIR}/test_1pncni_transientbc_tpfa params.input -Problem.Name test_1p2cni_transientbc_tpfa") -dune_add_test(NAME test_1pncni_transientbc_mpfa_caching +dumux_add_test(NAME test_1pncni_transientbc_mpfa_caching LABELS porousmediumflow 1pnc 1pncni SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=OnePTwoCNITransientBCCCMpfa ENABLECACHING=1 @@ -60,7 +60,7 @@ dune_add_test(NAME test_1pncni_transientbc_mpfa_caching ${CMAKE_CURRENT_BINARY_DIR}/test_1p2cni_transientbc_mpfa_caching-00009.vtu --command "${CMAKE_CURRENT_BINARY_DIR}/test_1pncni_transientbc_mpfa_caching params.input -Problem.Name test_1p2cni_transientbc_mpfa_caching") -dune_add_test(NAME test_1pncni_transientbc_mpfa +dumux_add_test(NAME test_1pncni_transientbc_mpfa LABELS porousmediumflow 1pnc 1pncni SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=OnePTwoCNITransientBCCCMpfa ENABLECACHING=0 diff --git a/test/porousmediumflow/1pnc/implicit/1p3c/CMakeLists.txt b/test/porousmediumflow/1pnc/implicit/1p3c/CMakeLists.txt index 96f12cf244..76d057f30c 100644 --- a/test/porousmediumflow/1pnc/implicit/1p3c/CMakeLists.txt +++ b/test/porousmediumflow/1pnc/implicit/1p3c/CMakeLists.txt @@ -1,7 +1,7 @@ add_input_file_links() # 1pnc tests -dune_add_test(NAME test_1pnc_maxwellstefan_tpfa +dumux_add_test(NAME test_1pnc_maxwellstefan_tpfa LABELS porousmediumflow 1p2c SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=MaxwellStefanOnePThreeCTestCCTpfa @@ -11,7 +11,7 @@ dune_add_test(NAME test_1pnc_maxwellstefan_tpfa ${CMAKE_CURRENT_BINARY_DIR}/test_1pnc_maxwellstefan_tpfa-00019.vtu --command "${CMAKE_CURRENT_BINARY_DIR}/test_1pnc_maxwellstefan_tpfa params.input -Problem.Name test_1pnc_maxwellstefan_tpfa") -dune_add_test(NAME test_1pnc_maxwellstefan_box +dumux_add_test(NAME test_1pnc_maxwellstefan_box LABELS porousmediumflow 1p2c SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=MaxwellStefanOnePThreeCTestBox diff --git a/test/porousmediumflow/1pnc/implicit/nonequilibrium/CMakeLists.txt b/test/porousmediumflow/1pnc/implicit/nonequilibrium/CMakeLists.txt index 7086d76dc3..0ec097b849 100644 --- a/test/porousmediumflow/1pnc/implicit/nonequilibrium/CMakeLists.txt +++ b/test/porousmediumflow/1pnc/implicit/nonequilibrium/CMakeLists.txt @@ -2,7 +2,7 @@ add_input_file_links() # non-isothermal tests # conduction -dune_add_test(NAME test_1p2c_nonequilibrium_box +dumux_add_test(NAME test_1p2c_nonequilibrium_box LABELS porousmediumflow 1p2c SOURCES main.cc LABELS 1pnc @@ -14,7 +14,7 @@ dune_add_test(NAME test_1p2c_nonequilibrium_box --command "${CMAKE_CURRENT_BINARY_DIR}/test_1p2c_nonequilibrium_box params.input -Problem.Name test_1p2c_nonequilibrium_box" --zeroThreshold {"velocity_liq \(m/s\)_1":1e-15}) -dune_add_test(NAME test_1p2c_nonequilibrium_tpfa +dumux_add_test(NAME test_1p2c_nonequilibrium_tpfa LABELS porousmediumflow 1p2c SOURCES main.cc LABELS 1pnc diff --git a/test/porousmediumflow/1pncmin/implicit/nonisothermal/CMakeLists.txt b/test/porousmediumflow/1pncmin/implicit/nonisothermal/CMakeLists.txt index 6aa7f7de4b..174be9b5ed 100644 --- a/test/porousmediumflow/1pncmin/implicit/nonisothermal/CMakeLists.txt +++ b/test/porousmediumflow/1pncmin/implicit/nonisothermal/CMakeLists.txt @@ -1,6 +1,6 @@ add_input_file_links() -dune_add_test(NAME test_1pncminni_box +dumux_add_test(NAME test_1pncminni_box LABELS porousmediumflow 1pncmin 1pncminni SOURCES main.cc LABELS 1pnc diff --git a/test/porousmediumflow/2p/implicit/adaptive/CMakeLists.txt b/test/porousmediumflow/2p/implicit/adaptive/CMakeLists.txt index 31544af406..0b3a1b6c0a 100644 --- a/test/porousmediumflow/2p/implicit/adaptive/CMakeLists.txt +++ b/test/porousmediumflow/2p/implicit/adaptive/CMakeLists.txt @@ -3,7 +3,7 @@ dune_symlink_to_source_files(FILES "initialsolutioncc.txt") dune_symlink_to_source_files(FILES "initialsolutionbox.txt") # using tpfa -dune_add_test(NAME test_2p_adaptive_tpfa +dumux_add_test(NAME test_2p_adaptive_tpfa LABELS porousmediumflow 2p SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=TwoPIncompressibleAdaptiveTpfa @@ -15,7 +15,7 @@ dune_add_test(NAME test_2p_adaptive_tpfa --command "${CMAKE_CURRENT_BINARY_DIR}/test_2p_adaptive_tpfa params.input -Problem.Name test_2p_adaptive_tpfa") # using tpfa and point source -dune_add_test(NAME test_2p_pointsource_adaptive_tpfa +dumux_add_test(NAME test_2p_pointsource_adaptive_tpfa LABELS porousmediumflow 2p SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=TwoPAdaptivePointSource @@ -27,7 +27,7 @@ dune_add_test(NAME test_2p_pointsource_adaptive_tpfa --command "${CMAKE_CURRENT_BINARY_DIR}/test_2p_pointsource_adaptive_tpfa params.input -Problem.Name test_2p_pointsource_adaptive_tpfa") # using mpfa -dune_add_test(NAME test_2p_adaptive_mpfa +dumux_add_test(NAME test_2p_adaptive_mpfa LABELS porousmediumflow 2p SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=TwoPIncompressibleAdaptiveMpfa @@ -39,7 +39,7 @@ dune_add_test(NAME test_2p_adaptive_mpfa --command "${CMAKE_CURRENT_BINARY_DIR}/test_2p_adaptive_mpfa params.input -Problem.Name test_2p_adaptive_mpfa") # using box -dune_add_test(NAME test_2p_adaptive_box +dumux_add_test(NAME test_2p_adaptive_box LABELS porousmediumflow 2p SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=TwoPIncompressibleAdaptiveBox diff --git a/test/porousmediumflow/2p/implicit/boxdfm/CMakeLists.txt b/test/porousmediumflow/2p/implicit/boxdfm/CMakeLists.txt index cd8c94eaa5..8384582b8d 100644 --- a/test/porousmediumflow/2p/implicit/boxdfm/CMakeLists.txt +++ b/test/porousmediumflow/2p/implicit/boxdfm/CMakeLists.txt @@ -1,7 +1,7 @@ dune_symlink_to_source_files(FILES "params.input" "grids") # quadrilaterals alu grid -dune_add_test(NAME test_2p_boxdfm_quads_alu +dumux_add_test(NAME test_2p_boxdfm_quads_alu LABELS porousmediumflow 2p SOURCES main.cc CMAKE_GUARD dune-alugrid_FOUND @@ -15,7 +15,7 @@ dune_add_test(NAME test_2p_boxdfm_quads_alu --command "${CMAKE_CURRENT_BINARY_DIR}/test_2p_boxdfm_quads_alu params.input -Problem.Name test_2p_boxdfm_quads_alu -Grid.File grids/quads_2d.msh") # quadrilaterals ug grid -dune_add_test(NAME test_2p_boxdfm_quads_ug +dumux_add_test(NAME test_2p_boxdfm_quads_ug LABELS porousmediumflow 2p SOURCES main.cc CMAKE_GUARD dune-uggrid_FOUND @@ -29,7 +29,7 @@ dune_add_test(NAME test_2p_boxdfm_quads_ug --command "${CMAKE_CURRENT_BINARY_DIR}/test_2p_boxdfm_quads_ug params.input -Problem.Name test_2p_boxdfm_quads_ug -Grid.File grids/quads_2d.msh") # triangles alu -dune_add_test(NAME test_2p_boxdfm_trias_alu +dumux_add_test(NAME test_2p_boxdfm_trias_alu LABELS porousmediumflow 2p TIMEOUT 1500 SOURCES main.cc @@ -44,7 +44,7 @@ dune_add_test(NAME test_2p_boxdfm_trias_alu --command "${CMAKE_CURRENT_BINARY_DIR}/test_2p_boxdfm_trias_alu params.input -Problem.Name test_2p_boxdfm_trias_alu -Grid.File grids/durlofsky.msh") # triangles ug -dune_add_test(NAME test_2p_boxdfm_trias_ug +dumux_add_test(NAME test_2p_boxdfm_trias_ug LABELS porousmediumflow 2p TIMEOUT 1500 SOURCES main.cc @@ -59,7 +59,7 @@ dune_add_test(NAME test_2p_boxdfm_trias_ug --command "${CMAKE_CURRENT_BINARY_DIR}/test_2p_boxdfm_trias_ug params.input -Problem.Name test_2p_boxdfm_trias_ug -Grid.File grids/durlofsky.msh") # tetrahedra alu -dune_add_test(NAME test_2p_boxdfm_tets_alu +dumux_add_test(NAME test_2p_boxdfm_tets_alu LABELS porousmediumflow 2p SOURCES main.cc CMAKE_GUARD dune-foamgrid_FOUND @@ -73,7 +73,7 @@ dune_add_test(NAME test_2p_boxdfm_tets_alu --command "${CMAKE_CURRENT_BINARY_DIR}/test_2p_boxdfm_tets_alu params.input -Problem.Name test_2p_boxdfm_tets_alu -Grid.File grids/tets_3d.msh -TimeLoop.TEnd 450") # tetrahedra ug -dune_add_test(NAME test_2p_boxdfm_tets_ug +dumux_add_test(NAME test_2p_boxdfm_tets_ug LABELS porousmediumflow 2p SOURCES main.cc CMAKE_GUARD dune-uggrid_FOUND diff --git a/test/porousmediumflow/2p/implicit/cornerpoint/CMakeLists.txt b/test/porousmediumflow/2p/implicit/cornerpoint/CMakeLists.txt index 3e6095f550..9c8dbf8a04 100644 --- a/test/porousmediumflow/2p/implicit/cornerpoint/CMakeLists.txt +++ b/test/porousmediumflow/2p/implicit/cornerpoint/CMakeLists.txt @@ -1,7 +1,7 @@ dune_symlink_to_source_files(FILES "params.input") dune_symlink_to_source_files(FILES grids) -dune_add_test(NAME test_2p_cornerpoint +dumux_add_test(NAME test_2p_cornerpoint LABELS porousmediumflow 2p SOURCES main.cc CMAKE_GUARD HAVE_OPM_GRID diff --git a/test/porousmediumflow/2p/implicit/fracture/CMakeLists.txt b/test/porousmediumflow/2p/implicit/fracture/CMakeLists.txt index 53ca55e3eb..8fbd853d65 100644 --- a/test/porousmediumflow/2p/implicit/fracture/CMakeLists.txt +++ b/test/porousmediumflow/2p/implicit/fracture/CMakeLists.txt @@ -1,7 +1,7 @@ dune_symlink_to_source_files(FILES "params.input" "grids") # tests without gravity -dune_add_test(NAME test_2p_fracture_box +dumux_add_test(NAME test_2p_fracture_box LABELS porousmediumflow 2p SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=FractureBox @@ -12,7 +12,7 @@ dune_add_test(NAME test_2p_fracture_box ${CMAKE_CURRENT_BINARY_DIR}/test_2p_fracture_box-00001.vtu --command "${CMAKE_CURRENT_BINARY_DIR}/test_2p_fracture_box params.input -Problem.Name test_2p_fracture_box") -dune_add_test(NAME test_2p_fracture_tpfa +dumux_add_test(NAME test_2p_fracture_tpfa LABELS porousmediumflow 2p SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=FractureCCTpfa @@ -23,7 +23,7 @@ dune_add_test(NAME test_2p_fracture_tpfa ${CMAKE_CURRENT_BINARY_DIR}/test_2p_fracture_tpfa-00001.vtu --command "${CMAKE_CURRENT_BINARY_DIR}/test_2p_fracture_tpfa params.input -Problem.Name test_2p_fracture_tpfa") -dune_add_test(NAME test_2p_fracture_mpfa +dumux_add_test(NAME test_2p_fracture_mpfa LABELS porousmediumflow 2p SOURCES main.cc TIMEOUT 1500 @@ -36,7 +36,7 @@ dune_add_test(NAME test_2p_fracture_mpfa --command "${CMAKE_CURRENT_BINARY_DIR}/test_2p_fracture_mpfa params.input -Problem.Name test_2p_fracture_mpfa") # tests with gravity -dune_add_test(NAME test_2p_fracture_gravity_box +dumux_add_test(NAME test_2p_fracture_gravity_box TARGET test_2p_fracture_box LABELS porousmediumflow 2p CMAKE_GUARD dune-foamgrid_FOUND @@ -46,7 +46,7 @@ dune_add_test(NAME test_2p_fracture_gravity_box ${CMAKE_CURRENT_BINARY_DIR}/test_2p_fracture_gravity_box-00001.vtu --command "${CMAKE_CURRENT_BINARY_DIR}/test_2p_fracture_box params.input -Problem.Name test_2p_fracture_gravity_box -Problem.EnableGravity true") -dune_add_test(NAME test_2p_fracture_gravity_tpfa +dumux_add_test(NAME test_2p_fracture_gravity_tpfa TARGET test_2p_fracture_tpfa LABELS porousmediumflow 2p CMAKE_GUARD dune-foamgrid_FOUND @@ -56,7 +56,7 @@ dune_add_test(NAME test_2p_fracture_gravity_tpfa ${CMAKE_CURRENT_BINARY_DIR}/test_2p_fracture_gravity_tpfa-00001.vtu --command "${CMAKE_CURRENT_BINARY_DIR}/test_2p_fracture_tpfa params.input -Problem.Name test_2p_fracture_gravity_tpfa -Problem.EnableGravity true") -dune_add_test(NAME test_2p_fracture_gravity_mpfa +dumux_add_test(NAME test_2p_fracture_gravity_mpfa TARGET test_2p_fracture_mpfa LABELS porousmediumflow 2p TIMEOUT 1500 diff --git a/test/porousmediumflow/2p/implicit/incompressible/CMakeLists.txt b/test/porousmediumflow/2p/implicit/incompressible/CMakeLists.txt index 9cf5b05189..42f790e2e4 100644 --- a/test/porousmediumflow/2p/implicit/incompressible/CMakeLists.txt +++ b/test/porousmediumflow/2p/implicit/incompressible/CMakeLists.txt @@ -4,7 +4,7 @@ dune_symlink_to_source_files(FILES "params.input") add_executable(test_2p_incompressible_tpfa EXCLUDE_FROM_ALL main.cc) target_compile_definitions(test_2p_incompressible_tpfa PUBLIC TYPETAG=TwoPIncompressibleTpfa) -dune_add_test(NAME test_2p_incompressible_tpfa +dumux_add_test(NAME test_2p_incompressible_tpfa TARGET test_2p_incompressible_tpfa LABELS porousmediumflow 2p COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py @@ -14,7 +14,7 @@ dune_add_test(NAME test_2p_incompressible_tpfa --command "${CMAKE_CURRENT_BINARY_DIR}/test_2p_incompressible_tpfa params.input -Problem.Name test_2p_incompressible_tpfa") # using tpfa -dune_add_test(NAME test_2p_incompressible_tpfa_restart +dumux_add_test(NAME test_2p_incompressible_tpfa_restart TARGET test_2p_incompressible_tpfa LABELS porousmediumflow 2p COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py @@ -27,7 +27,7 @@ dune_add_test(NAME test_2p_incompressible_tpfa_restart set_tests_properties(test_2p_incompressible_tpfa_restart PROPERTIES DEPENDS test_2p_incompressible_tpfa) # using box -dune_add_test(NAME test_2p_incompressible_box +dumux_add_test(NAME test_2p_incompressible_box LABELS porousmediumflow 2p SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=TwoPIncompressibleBox @@ -38,7 +38,7 @@ dune_add_test(NAME test_2p_incompressible_box --command "${CMAKE_CURRENT_BINARY_DIR}/test_2p_incompressible_box params.input -Problem.Name test_2p_incompressible_box") # using box with interface solver -dune_add_test(NAME test_2p_incompressible_box_ifsolver +dumux_add_test(NAME test_2p_incompressible_box_ifsolver LABELS porousmediumflow 2p SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=TwoPIncompressibleBox @@ -52,7 +52,7 @@ dune_add_test(NAME test_2p_incompressible_box_ifsolver -Problem.UseNonConformingOutput true") # using tpfa with an oil-wet lens -dune_add_test(NAME test_2p_incompressible_tpfa_oilwet +dumux_add_test(NAME test_2p_incompressible_tpfa_oilwet LABELS porousmediumflow 2p SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=TwoPIncompressibleTpfa @@ -67,7 +67,7 @@ dune_add_test(NAME test_2p_incompressible_tpfa_oilwet -TimeLoop.DtInitial 130") # using mpfa -dune_add_test(NAME test_2p_incompressible_mpfa +dumux_add_test(NAME test_2p_incompressible_mpfa LABELS porousmediumflow 2p SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=TwoPIncompressibleMpfa diff --git a/test/porousmediumflow/2p/implicit/nonisothermal/CMakeLists.txt b/test/porousmediumflow/2p/implicit/nonisothermal/CMakeLists.txt index e31b201261..2b77d806ea 100644 --- a/test/porousmediumflow/2p/implicit/nonisothermal/CMakeLists.txt +++ b/test/porousmediumflow/2p/implicit/nonisothermal/CMakeLists.txt @@ -1,6 +1,6 @@ dune_symlink_to_source_files(FILES "params.input") -dune_add_test(NAME test_2pni_box_simplex +dumux_add_test(NAME test_2pni_box_simplex LABELS porousmediumflow 2p 2pni SOURCES main.cc CMAKE_GUARD dune-uggrid_FOUND @@ -12,7 +12,7 @@ dune_add_test(NAME test_2pni_box_simplex ${CMAKE_CURRENT_BINARY_DIR}/test_2pni_box_simplex-00007.vtu --command "${CMAKE_CURRENT_BINARY_DIR}/test_2pni_box_simplex params.input -Problem.Name test_2pni_box_simplex -Grid.CellType Simplex") -dune_add_test(NAME test_2pni_box_cube +dumux_add_test(NAME test_2pni_box_cube LABELS porousmediumflow 2p 2pni SOURCES main.cc COMPILE_DEFINITIONS GRIDTYPE=Dune::YaspGrid<2> @@ -23,7 +23,7 @@ dune_add_test(NAME test_2pni_box_cube ${CMAKE_CURRENT_BINARY_DIR}/test_2pni_box_cube-00008.vtu --command "${CMAKE_CURRENT_BINARY_DIR}/test_2pni_box_cube params.input -Problem.Name test_2pni_box_cube") -dune_add_test(NAME test_2pni_tpfa_simplex +dumux_add_test(NAME test_2pni_tpfa_simplex LABELS porousmediumflow 2p 2pni SOURCES main.cc CMAKE_GUARD dune-alugrid_FOUND @@ -35,7 +35,7 @@ dune_add_test(NAME test_2pni_tpfa_simplex ${CMAKE_CURRENT_BINARY_DIR}/test_2pni_tpfa_simplex-00008.vtu --command "${CMAKE_CURRENT_BINARY_DIR}/test_2pni_tpfa_simplex params.input -Problem.Name test_2pni_tpfa_simplex -Grid.CellType Simplex") -dune_add_test(NAME test_2pni_tpfa_cube +dumux_add_test(NAME test_2pni_tpfa_cube LABELS porousmediumflow 2p 2pni SOURCES main.cc COMPILE_DEFINITIONS GRIDTYPE=Dune::YaspGrid<2> diff --git a/test/porousmediumflow/2p/sequential/CMakeLists.txt b/test/porousmediumflow/2p/sequential/CMakeLists.txt index a5282b4394..fc1e419b8c 100644 --- a/test/porousmediumflow/2p/sequential/CMakeLists.txt +++ b/test/porousmediumflow/2p/sequential/CMakeLists.txt @@ -1,7 +1,7 @@ add_input_file_links() dune_symlink_to_source_files(FILES grids) -dune_add_test(NAME test_impes +dumux_add_test(NAME test_impes LABELS porousmediumflow 2p SOURCES test_impes.cc COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py @@ -10,7 +10,7 @@ dune_add_test(NAME test_impes ${CMAKE_CURRENT_BINARY_DIR}/test_impes-00008.vtu --command "${CMAKE_CURRENT_BINARY_DIR}/test_impes") -dune_add_test(NAME test_impesadaptive +dumux_add_test(NAME test_impesadaptive LABELS porousmediumflow 2p SOURCES test_impesadaptive.cc COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py @@ -19,7 +19,7 @@ dune_add_test(NAME test_impesadaptive ${CMAKE_CURRENT_BINARY_DIR}/test_2padaptive-00006.vtu --command "${CMAKE_CURRENT_BINARY_DIR}/test_impesadaptive") -dune_add_test(NAME test_impesadaptiverestart +dumux_add_test(NAME test_impesadaptiverestart LABELS porousmediumflow 2p SOURCES test_impesadaptiverestart.cc COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py @@ -32,7 +32,7 @@ dune_add_test(NAME test_impesadaptiverestart set_tests_properties(test_impesadaptiverestart PROPERTIES DEPENDS test_impesadaptive) if(MPI_FOUND) - dune_add_test(NAME test_impeswithamg + dumux_add_test(NAME test_impeswithamg LABELS porousmediumflow 2p parallel SOURCES test_impeswithamg.cc COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py @@ -41,7 +41,7 @@ if(MPI_FOUND) ${CMAKE_CURRENT_BINARY_DIR}/s0002-p0001-test_impeswithamg-00093.vtu --command "${MPIEXEC} -np 2 ${CMAKE_CURRENT_BINARY_DIR}/test_impeswithamg -ParameterFile ${CMAKE_CURRENT_SOURCE_DIR}/test_impeswithamg.input -TimeManager.TEnd 7e7") else() - dune_add_test(NAME test_impeswithamg + dumux_add_test(NAME test_impeswithamg LABELS porousmediumflow 2p SOURCES test_impeswithamg.cc COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py @@ -51,7 +51,7 @@ else() --command "${CMAKE_CURRENT_BINARY_DIR}/test_impeswithamg") endif() -dune_add_test(NAME test_transport +dumux_add_test(NAME test_transport LABELS porousmediumflow 2p SOURCES test_transport.cc COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py @@ -62,7 +62,7 @@ dune_add_test(NAME test_transport # mpfa tests add_executable(test_mpfa2p test_mpfa2p.cc) -dune_add_test(NAME test_mpfao2p +dumux_add_test(NAME test_mpfao2p TARGET test_mpfa2p LABELS porousmediumflow 2p COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py @@ -71,7 +71,7 @@ dune_add_test(NAME test_mpfao2p ${CMAKE_CURRENT_BINARY_DIR}/test_mpfao2p-00006.vtu --command "${CMAKE_CURRENT_BINARY_DIR}/test_mpfa2p -ParameterFile ${CMAKE_CURRENT_SOURCE_DIR}/test_mpfa2p.input -Problem.Name test_mpfao2p -ModelType MPFAO") -dune_add_test(NAME test_mpfal2p +dumux_add_test(NAME test_mpfal2p TARGET test_mpfa2p LABELS porousmediumflow 2p COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py @@ -80,7 +80,7 @@ dune_add_test(NAME test_mpfal2p ${CMAKE_CURRENT_BINARY_DIR}/test_mpfal2p-00006.vtu --command "${CMAKE_CURRENT_BINARY_DIR}/test_mpfa2p -ParameterFile ${CMAKE_CURRENT_SOURCE_DIR}/test_mpfa2p.input -Problem.Name test_mpfal2p -ModelType MPFAL") -dune_add_test(NAME test_mpfal2padaptive +dumux_add_test(NAME test_mpfal2padaptive TARGET test_mpfa2p LABELS porousmediumflow 2p COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py @@ -90,7 +90,7 @@ dune_add_test(NAME test_mpfal2padaptive --command "${CMAKE_CURRENT_BINARY_DIR}/test_mpfa2p -ParameterFile ${CMAKE_CURRENT_SOURCE_DIR}/test_mpfa2p.input -Problem.Name test_mpfal2padaptive -ModelType MPFALAdaptive") # 3d tests -dune_add_test(NAME test_3d2pfv +dumux_add_test(NAME test_3d2pfv LABELS porousmediumflow 2p SOURCES test_3d2p.cc COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py @@ -99,7 +99,7 @@ dune_add_test(NAME test_3d2pfv ${CMAKE_CURRENT_BINARY_DIR}/test_3d2pfv-00011.vtu --command "${CMAKE_CURRENT_BINARY_DIR}/test_3d2pfv -ParameterFile ${CMAKE_CURRENT_SOURCE_DIR}/test_3d2p.input -Problem.OutputName test_3d2pfv -ModelType FV") -dune_add_test(NAME test_3d2pfvadaptive +dumux_add_test(NAME test_3d2pfvadaptive LABELS porousmediumflow 2p SOURCES test_3d2p.cc COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py @@ -108,7 +108,7 @@ dune_add_test(NAME test_3d2pfvadaptive ${CMAKE_CURRENT_BINARY_DIR}/test_3d2pfvadaptive-00011.vtu --command "${CMAKE_CURRENT_BINARY_DIR}/test_3d2pfvadaptive -ParameterFile ${CMAKE_CURRENT_SOURCE_DIR}/test_3d2p.input -Problem.OutputName test_3d2pfvadaptive -ModelType FVAdaptive") -dune_add_test(NAME test_3d2pmimetic +dumux_add_test(NAME test_3d2pmimetic LABELS porousmediumflow 2p SOURCES test_3d2p.cc COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py @@ -117,7 +117,7 @@ dune_add_test(NAME test_3d2pmimetic ${CMAKE_CURRENT_BINARY_DIR}/test_3d2pmimetic-00011.vtu --command "${CMAKE_CURRENT_BINARY_DIR}/test_3d2pmimetic -ParameterFile ${CMAKE_CURRENT_SOURCE_DIR}/test_3d2p.input -Problem.OutputName test_3d2pmimetic -ModelType Mimetic") -dune_add_test(NAME test_3d2pmimeticadaptive +dumux_add_test(NAME test_3d2pmimeticadaptive LABELS porousmediumflow 2p SOURCES test_3d2p.cc COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py @@ -126,7 +126,7 @@ dune_add_test(NAME test_3d2pmimeticadaptive ${CMAKE_CURRENT_BINARY_DIR}/test_3d2pmimeticadaptive-00011.vtu --command "${CMAKE_CURRENT_BINARY_DIR}/test_3d2pmimeticadaptive -ParameterFile ${CMAKE_CURRENT_SOURCE_DIR}/test_3d2p.input -Problem.OutputName test_3d2pmimeticadaptive -ModelType MimeticAdaptive") -dune_add_test(NAME test_3d2pmpfal +dumux_add_test(NAME test_3d2pmpfal LABELS porousmediumflow 2p SOURCES test_3d2p.cc TIMEOUT 1500 @@ -136,7 +136,7 @@ dune_add_test(NAME test_3d2pmpfal ${CMAKE_CURRENT_BINARY_DIR}/test_3d2pmpfal-00011.vtu --command "${CMAKE_CURRENT_BINARY_DIR}/test_3d2pmpfal -ParameterFile ${CMAKE_CURRENT_SOURCE_DIR}/test_3d2p.input -Problem.OutputName test_3d2pmpfal -ModelType MPFAL") -dune_add_test(NAME test_3d2pmpfaladaptive +dumux_add_test(NAME test_3d2pmpfaladaptive LABELS porousmediumflow 2p SOURCES test_3d2p.cc COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py diff --git a/test/porousmediumflow/2p1c/implicit/CMakeLists.txt b/test/porousmediumflow/2p1c/implicit/CMakeLists.txt index d1fd72aeef..c0c79aeec0 100644 --- a/test/porousmediumflow/2p1c/implicit/CMakeLists.txt +++ b/test/porousmediumflow/2p1c/implicit/CMakeLists.txt @@ -7,7 +7,7 @@ target_compile_definitions(test_2p1cni_steaminjection_tpfa PUBLIC "TYPETAG=TwoPO add_executable(test_2p1cni_steaminjection_box EXCLUDE_FROM_ALL main.cc) target_compile_definitions(test_2p1cni_steaminjection_box PUBLIC "TYPETAG=TwoPOneCNIBox") -dune_add_test(NAME test_2p1cni_steaminjection_waterwet_box +dumux_add_test(NAME test_2p1cni_steaminjection_waterwet_box LABELS porousmediumflow 2p1c 2p1cni TARGET test_2p1cni_steaminjection_box COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py @@ -16,7 +16,7 @@ dune_add_test(NAME test_2p1cni_steaminjection_waterwet_box ${CMAKE_CURRENT_BINARY_DIR}/test_2p1cni_steaminjection_waterwet_box-00007.vtu --command "${CMAKE_CURRENT_BINARY_DIR}/test_2p1cni_steaminjection_box params_box.input -Problem.Name test_2p1cni_steaminjection_waterwet_box") -dune_add_test(NAME test_2p1cni_steaminjection_waterwet_tpfa +dumux_add_test(NAME test_2p1cni_steaminjection_waterwet_tpfa LABELS porousmediumflow 2p1c 2p1cni TARGET test_2p1cni_steaminjection_tpfa COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py @@ -25,7 +25,7 @@ dune_add_test(NAME test_2p1cni_steaminjection_waterwet_tpfa ${CMAKE_CURRENT_BINARY_DIR}/test_2p1cni_steaminjection_waterwet_tpfa-00009.vtu --command "${CMAKE_CURRENT_BINARY_DIR}/test_2p1cni_steaminjection_tpfa params_tpfa.input -Problem.Name test_2p1cni_steaminjection_waterwet_tpfa") -dune_add_test(NAME test_2p1cni_steaminjection_gaswet_box +dumux_add_test(NAME test_2p1cni_steaminjection_gaswet_box LABELS porousmediumflow 2p1c 2p1cni TARGET test_2p1cni_steaminjection_box COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py @@ -36,7 +36,7 @@ dune_add_test(NAME test_2p1cni_steaminjection_gaswet_box -Problem.Name test_2p1cni_steaminjection_gaswet_box -SpatialParams.GasWetting true") -dune_add_test(NAME test_2p1cni_steaminjection_gaswet_tpfa +dumux_add_test(NAME test_2p1cni_steaminjection_gaswet_tpfa LABELS porousmediumflow 2p1c 2p1cni TARGET test_2p1cni_steaminjection_tpfa COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py diff --git a/test/porousmediumflow/2p2c/implicit/chemicalnonequilibrium/CMakeLists.txt b/test/porousmediumflow/2p2c/implicit/chemicalnonequilibrium/CMakeLists.txt index c45f4321b4..ac0c17c8bc 100644 --- a/test/porousmediumflow/2p2c/implicit/chemicalnonequilibrium/CMakeLists.txt +++ b/test/porousmediumflow/2p2c/implicit/chemicalnonequilibrium/CMakeLists.txt @@ -1,6 +1,6 @@ add_input_file_links() -dune_add_test(NAME test_2p2c_nonequilibrium_box +dumux_add_test(NAME test_2p2c_nonequilibrium_box LABELS porousmediumflow 2p2c SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=TwoPTwoCChemicalNonequilibriumBox @@ -10,7 +10,7 @@ dune_add_test(NAME test_2p2c_nonequilibrium_box ${CMAKE_CURRENT_BINARY_DIR}/test_2p2c_nonequilibrium_box-00005.vtu --command "${CMAKE_CURRENT_BINARY_DIR}/test_2p2c_nonequilibrium_box params.input -Problem.Name test_2p2c_nonequilibrium_box") -dune_add_test(NAME test_2p2c_nonequilibrium_tpfa +dumux_add_test(NAME test_2p2c_nonequilibrium_tpfa LABELS porousmediumflow 2p2c SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=TwoPTwoCChemicalNonequilibriumCC diff --git a/test/porousmediumflow/2p2c/implicit/injection/CMakeLists.txt b/test/porousmediumflow/2p2c/implicit/injection/CMakeLists.txt index 03a3b28168..1be3f3f699 100644 --- a/test/porousmediumflow/2p2c/implicit/injection/CMakeLists.txt +++ b/test/porousmediumflow/2p2c/implicit/injection/CMakeLists.txt @@ -1,6 +1,6 @@ add_input_file_links(FILES params.input) -dune_add_test(NAME test_2p2c_injection_box +dumux_add_test(NAME test_2p2c_injection_box LABELS porousmediumflow 2p2c SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=InjectionBox ENABLECACHING=0 @@ -10,7 +10,7 @@ dune_add_test(NAME test_2p2c_injection_box ${CMAKE_CURRENT_BINARY_DIR}/test_2p2c_injection_box-00008.vtu --command "${CMAKE_CURRENT_BINARY_DIR}/test_2p2c_injection_box params.input -Problem.Name test_2p2c_injection_box") -dune_add_test(NAME test_2p2c_injection_box_restart +dumux_add_test(NAME test_2p2c_injection_box_restart TARGET test_2p2c_injection_box LABELS porousmediumflow 2p2c COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py @@ -22,7 +22,7 @@ dune_add_test(NAME test_2p2c_injection_box_restart # the restart test has to run after the test that produces the corresponding vtu file set_tests_properties(test_2p2c_injection_box_restart PROPERTIES DEPENDS test_2p2c_injection_box) -dune_add_test(NAME test_2p2c_injection_tpfa +dumux_add_test(NAME test_2p2c_injection_tpfa LABELS porousmediumflow 2p2c SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=InjectionCCTpfa ENABLECACHING=0 @@ -32,7 +32,7 @@ dune_add_test(NAME test_2p2c_injection_tpfa ${CMAKE_CURRENT_BINARY_DIR}/test_2p2c_injection_tpfa-00008.vtu --command "${CMAKE_CURRENT_BINARY_DIR}/test_2p2c_injection_tpfa params.input -Problem.Name test_2p2c_injection_tpfa") -dune_add_test(NAME test_2p2c_injection_mpfa +dumux_add_test(NAME test_2p2c_injection_mpfa LABELS porousmediumflow 2p2c SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=InjectionCCMpfa ENABLECACHING=0 @@ -43,7 +43,7 @@ dune_add_test(NAME test_2p2c_injection_mpfa --command "${CMAKE_CURRENT_BINARY_DIR}/test_2p2c_injection_mpfa params.input -Problem.Name test_2p2c_injection_mpfa") # isothermal tests with caching -dune_add_test(NAME test_2p2c_injection_box_caching +dumux_add_test(NAME test_2p2c_injection_box_caching LABELS porousmediumflow 2p2c SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=InjectionBox ENABLECACHING=1 @@ -53,7 +53,7 @@ dune_add_test(NAME test_2p2c_injection_box_caching ${CMAKE_CURRENT_BINARY_DIR}/test_2p2c_injection_box_caching-00008.vtu --command "${CMAKE_CURRENT_BINARY_DIR}/test_2p2c_injection_box_caching params.input -Problem.Name test_2p2c_injection_box_caching") -dune_add_test(NAME test_2p2c_injection_tpfa_caching +dumux_add_test(NAME test_2p2c_injection_tpfa_caching LABELS porousmediumflow 2p2c SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=InjectionCCTpfa ENABLECACHING=1 @@ -63,7 +63,7 @@ dune_add_test(NAME test_2p2c_injection_tpfa_caching ${CMAKE_CURRENT_BINARY_DIR}/test_2p2c_injection_tpfa_caching-00008.vtu --command "${CMAKE_CURRENT_BINARY_DIR}/test_2p2c_injection_tpfa_caching params.input -Problem.Name test_2p2c_injection_tpfa_caching") -dune_add_test(NAME test_2p2c_injection_mpfa_caching +dumux_add_test(NAME test_2p2c_injection_mpfa_caching LABELS porousmediumflow 2p2c SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=InjectionCCMpfa ENABLECACHING=1 diff --git a/test/porousmediumflow/2p2c/implicit/mpnccomparison/CMakeLists.txt b/test/porousmediumflow/2p2c/implicit/mpnccomparison/CMakeLists.txt index fa0fc24558..0f633be817 100644 --- a/test/porousmediumflow/2p2c/implicit/mpnccomparison/CMakeLists.txt +++ b/test/porousmediumflow/2p2c/implicit/mpnccomparison/CMakeLists.txt @@ -1,6 +1,6 @@ add_input_file_links() -dune_add_test(NAME test_2p2c_mpnc_comparison_box +dumux_add_test(NAME test_2p2c_mpnc_comparison_box LABELS porousmediumflow 2p2c SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=TwoPTwoCComparisonBox @@ -10,7 +10,7 @@ dune_add_test(NAME test_2p2c_mpnc_comparison_box ${CMAKE_CURRENT_BINARY_DIR}/test_2p2c_mpnc_comparison_box-00009.vtu --command "${CMAKE_CURRENT_BINARY_DIR}/test_2p2c_mpnc_comparison_box params.input -Problem.Name test_2p2c_mpnc_comparison_box") -dune_add_test(NAME test_2p2c_mpnc_comparison_tpfa +dumux_add_test(NAME test_2p2c_mpnc_comparison_tpfa LABELS porousmediumflow 2p2c SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=TwoPTwoCComparisonCC diff --git a/test/porousmediumflow/2p2c/implicit/waterair/CMakeLists.txt b/test/porousmediumflow/2p2c/implicit/waterair/CMakeLists.txt index 43879a3884..5d0706975f 100644 --- a/test/porousmediumflow/2p2c/implicit/waterair/CMakeLists.txt +++ b/test/porousmediumflow/2p2c/implicit/waterair/CMakeLists.txt @@ -1,7 +1,7 @@ add_input_file_links(FILES params.input) # non-isothermal tests -dune_add_test(NAME test_2p2cni_waterair_box +dumux_add_test(NAME test_2p2cni_waterair_box LABELS porousmediumflow 2p2c 2p2cni SOURCES main.cc TIMEOUT 1500 @@ -12,7 +12,7 @@ dune_add_test(NAME test_2p2cni_waterair_box ${CMAKE_CURRENT_BINARY_DIR}/test_2p2cni_waterair_box-00013.vtu --command "${CMAKE_CURRENT_BINARY_DIR}/test_2p2cni_waterair_box params.input -Problem.Name test_2p2cni_waterair_box") -dune_add_test(NAME test_2p2cni_waterair_buoyancy_box +dumux_add_test(NAME test_2p2cni_waterair_buoyancy_box LABELS porousmediumflow 2p2c 2p2cni TARGET test_2p2cni_waterair_box TIMEOUT 1500 @@ -23,7 +23,7 @@ dune_add_test(NAME test_2p2cni_waterair_buoyancy_box ${CMAKE_CURRENT_BINARY_DIR}/test_2p2cni_waterair_buoyancy_box-00015.vtu --command "${CMAKE_CURRENT_BINARY_DIR}/test_2p2cni_waterair_box params.input -Problem.Name test_2p2cni_waterair_buoyancy_box -TimeLoop.DtInitial 150") -dune_add_test(NAME test_2p2cni_waterair_tpfa +dumux_add_test(NAME test_2p2cni_waterair_tpfa LABELS porousmediumflow 2p2c 2p2cni SOURCES main.cc TIMEOUT 1500 diff --git a/test/porousmediumflow/2p2c/sequential/CMakeLists.txt b/test/porousmediumflow/2p2c/sequential/CMakeLists.txt index d13fe0bac2..1837bcee01 100644 --- a/test/porousmediumflow/2p2c/sequential/CMakeLists.txt +++ b/test/porousmediumflow/2p2c/sequential/CMakeLists.txt @@ -1,14 +1,14 @@ add_input_file_links() -dune_add_test(NAME test_adaptive2p2c2d +dumux_add_test(NAME test_adaptive2p2c2d LABELS porousmediumflow 2p2c SOURCES test_adaptive2p2c2d.cc) -dune_add_test(NAME test_adaptive2p2c3d +dumux_add_test(NAME test_adaptive2p2c3d LABELS porousmediumflow 2p2c SOURCES test_adaptive2p2c3d.cc) -dune_add_test(NAME test_dec2p2c +dumux_add_test(NAME test_dec2p2c LABELS porousmediumflow 2p2c SOURCES test_dec2p2c.cc COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py @@ -17,7 +17,7 @@ dune_add_test(NAME test_dec2p2c ${CMAKE_CURRENT_BINARY_DIR}/test_dec2p2c-00020.vtu --command "${CMAKE_CURRENT_BINARY_DIR}/test_dec2p2c") -dune_add_test(NAME test_multiphysics2p2c +dumux_add_test(NAME test_multiphysics2p2c LABELS porousmediumflow 2p2c SOURCES test_multiphysics2p2c.cc COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py diff --git a/test/porousmediumflow/2pnc/implicit/diffusion/CMakeLists.txt b/test/porousmediumflow/2pnc/implicit/diffusion/CMakeLists.txt index 491d372ffc..2c67eb98cb 100644 --- a/test/porousmediumflow/2pnc/implicit/diffusion/CMakeLists.txt +++ b/test/porousmediumflow/2pnc/implicit/diffusion/CMakeLists.txt @@ -1,6 +1,6 @@ dune_symlink_to_source_files(FILES params.input) -dune_add_test(NAME test_2pnc_maxwellstefan_tpfa +dumux_add_test(NAME test_2pnc_maxwellstefan_tpfa LABELS porousmediumflow 2pnc SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=TwoPNCDiffusion DIFFUSIONTYPE=MaxwellStefansLaw<TypeTag> @@ -10,7 +10,7 @@ dune_add_test(NAME test_2pnc_maxwellstefan_tpfa ${CMAKE_CURRENT_BINARY_DIR}/test_2pnc_maxwellstefan_tpfa-00027.vtu --command "${CMAKE_CURRENT_BINARY_DIR}/test_2pnc_maxwellstefan_tpfa params.input -Problem.Name test_2pnc_maxwellstefan_tpfa") -dune_add_test(NAME test_2pnc_fickslaw_tpfa +dumux_add_test(NAME test_2pnc_fickslaw_tpfa LABELS porousmediumflow 2pnc SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=TwoPNCDiffusion DIFFUSIONTYPE=FicksLaw<TypeTag> diff --git a/test/porousmediumflow/2pnc/implicit/fuelcell/CMakeLists.txt b/test/porousmediumflow/2pnc/implicit/fuelcell/CMakeLists.txt index b5a982f5a0..61023b4793 100644 --- a/test/porousmediumflow/2pnc/implicit/fuelcell/CMakeLists.txt +++ b/test/porousmediumflow/2pnc/implicit/fuelcell/CMakeLists.txt @@ -1,7 +1,7 @@ dune_symlink_to_source_files(FILES params.input) # isothermal tests -dune_add_test(NAME test_2pnc_fuelcell_box +dumux_add_test(NAME test_2pnc_fuelcell_box LABELS porousmediumflow 2pnc SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=FuelCellBox @@ -11,7 +11,7 @@ dune_add_test(NAME test_2pnc_fuelcell_box ${CMAKE_CURRENT_BINARY_DIR}/test_2pnc_fuelcell_box-00015.vtu --command "${CMAKE_CURRENT_BINARY_DIR}/test_2pnc_fuelcell_box -ParameterFile params.input -Problem.Name test_2pnc_fuelcell_box") -dune_add_test(NAME test_2pnc_fuelcell_tpfa +dumux_add_test(NAME test_2pnc_fuelcell_tpfa LABELS porousmediumflow 2pnc SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=FuelCellCCTpfa @@ -22,7 +22,7 @@ dune_add_test(NAME test_2pnc_fuelcell_tpfa --command "${CMAKE_CURRENT_BINARY_DIR}/test_2pnc_fuelcell_tpfa -ParameterFile params.input -Problem.Name test_2pnc_fuelcell_tpfa") -dune_add_test(NAME test_2pncni_fuelcell_box +dumux_add_test(NAME test_2pncni_fuelcell_box LABELS porousmediumflow 2pnc 2pncni SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=FuelCellNIBox NONISOTHERMAL=1 diff --git a/test/porousmediumflow/2pncmin/implicit/isothermal/CMakeLists.txt b/test/porousmediumflow/2pncmin/implicit/isothermal/CMakeLists.txt index 2f67e4f635..754b01c4f8 100644 --- a/test/porousmediumflow/2pncmin/implicit/isothermal/CMakeLists.txt +++ b/test/porousmediumflow/2pncmin/implicit/isothermal/CMakeLists.txt @@ -1,7 +1,7 @@ dune_symlink_to_source_files(FILES params.input) # isothermal tests -dune_add_test(NAME test_2pncmin_dissolution_box +dumux_add_test(NAME test_2pncmin_dissolution_box LABELS porousmediumflow 2pncmin SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=DissolutionBox @@ -11,7 +11,7 @@ dune_add_test(NAME test_2pncmin_dissolution_box ${CMAKE_CURRENT_BINARY_DIR}/test_2pncmin_dissolution_box-00043.vtu --command "${CMAKE_CURRENT_BINARY_DIR}/test_2pncmin_dissolution_box -ParameterFile params.input -Problem.Name test_2pncmin_dissolution_box") -dune_add_test(NAME test_2pncmin_dissolution_box_restart +dumux_add_test(NAME test_2pncmin_dissolution_box_restart LABELS porousmediumflow 2pncmin TARGET test_2pncmin_dissolution_box COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py @@ -23,7 +23,7 @@ dune_add_test(NAME test_2pncmin_dissolution_box_restart # the restart test has to run after the test that produces the corresponding vtu file set_tests_properties(test_2pncmin_dissolution_box_restart PROPERTIES DEPENDS test_2pncmin_dissolution_box) -dune_add_test(NAME test_2pncmin_dissolution_tpfa +dumux_add_test(NAME test_2pncmin_dissolution_tpfa LABELS porousmediumflow 2pncmin SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=DissolutionCCTpfa diff --git a/test/porousmediumflow/2pncmin/implicit/nonisothermal/CMakeLists.txt b/test/porousmediumflow/2pncmin/implicit/nonisothermal/CMakeLists.txt index d6733f38bb..1acb84172c 100644 --- a/test/porousmediumflow/2pncmin/implicit/nonisothermal/CMakeLists.txt +++ b/test/porousmediumflow/2pncmin/implicit/nonisothermal/CMakeLists.txt @@ -1,7 +1,7 @@ dune_symlink_to_source_files(FILES params.input) # isothermal tests -dune_add_test(NAME test_2pncminni_salinization_box +dumux_add_test(NAME test_2pncminni_salinization_box LABELS porousmediumflow 2pncmin SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=SalinizationBox @@ -12,7 +12,7 @@ dune_add_test(NAME test_2pncminni_salinization_box --zeroThreshold {"velocity_liq \(m/s\)_0":1e-18,"velocity_gas \(m/s\)_0":1e-14} --command "${CMAKE_CURRENT_BINARY_DIR}/test_2pncminni_salinization_box -ParameterFile params.input -Problem.Name test_2pncminni_salinization_box") -dune_add_test(NAME test_2pncminni_salinization_tpfa +dumux_add_test(NAME test_2pncminni_salinization_tpfa LABELS porousmediumflow 2pncmin SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=SalinizationCCTpfa diff --git a/test/porousmediumflow/3p/implicit/conduction/CMakeLists.txt b/test/porousmediumflow/3p/implicit/conduction/CMakeLists.txt index 3b7d455759..777fc49344 100644 --- a/test/porousmediumflow/3p/implicit/conduction/CMakeLists.txt +++ b/test/porousmediumflow/3p/implicit/conduction/CMakeLists.txt @@ -1,6 +1,6 @@ add_input_file_links(FILES params.input) -dune_add_test(NAME test_3pni_conduction_box +dumux_add_test(NAME test_3pni_conduction_box LABELS porousmediumflow 3p 3pni SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=ThreePNIConductionBox @@ -11,7 +11,7 @@ dune_add_test(NAME test_3pni_conduction_box --command "${CMAKE_CURRENT_BINARY_DIR}/test_3pni_conduction_box params.input -Problem.Name test_3pni_conduction_box" --zeroThreshold {"velocity_aq \(m/s\)_1":1e-8}) -dune_add_test(NAME test_3pni_conduction_tpfa +dumux_add_test(NAME test_3pni_conduction_tpfa LABELS porousmediumflow 3p 3pni SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=ThreePNIConductionCCTpfa diff --git a/test/porousmediumflow/3p/implicit/convection/CMakeLists.txt b/test/porousmediumflow/3p/implicit/convection/CMakeLists.txt index 1a1b15d060..ac4c852e9c 100644 --- a/test/porousmediumflow/3p/implicit/convection/CMakeLists.txt +++ b/test/porousmediumflow/3p/implicit/convection/CMakeLists.txt @@ -1,6 +1,6 @@ add_input_file_links(FILES params.input) -dune_add_test(NAME test_3pni_convection_box +dumux_add_test(NAME test_3pni_convection_box LABELS porousmediumflow 3p 3pni SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=ThreePNIConvectionBox @@ -11,7 +11,7 @@ dune_add_test(NAME test_3pni_convection_box --command "${CMAKE_CURRENT_BINARY_DIR}/test_3pni_convection_box params.input -Problem.Name test_3pni_convection_box" --zeroThreshold {"velocity_aq \(m/s\)_1":1e-8}) -dune_add_test(NAME test_3pni_convection_tpfa +dumux_add_test(NAME test_3pni_convection_tpfa LABELS porousmediumflow 3p 3pni SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=ThreePNIConvectionCCTpfa diff --git a/test/porousmediumflow/3p/implicit/infiltration/CMakeLists.txt b/test/porousmediumflow/3p/implicit/infiltration/CMakeLists.txt index b10d963fef..daf533bb1b 100644 --- a/test/porousmediumflow/3p/implicit/infiltration/CMakeLists.txt +++ b/test/porousmediumflow/3p/implicit/infiltration/CMakeLists.txt @@ -1,7 +1,7 @@ add_input_file_links(FILES params.input) # isothermal tests -dune_add_test(NAME test_3p_infiltration_box +dumux_add_test(NAME test_3p_infiltration_box LABELS porousmediumflow 3p SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=InfiltrationThreePBox @@ -11,7 +11,7 @@ dune_add_test(NAME test_3p_infiltration_box ${CMAKE_CURRENT_BINARY_DIR}/test_3p_infiltration_box-00008.vtu --command "${CMAKE_CURRENT_BINARY_DIR}/test_3p_infiltration_box params.input -Problem.Name test_3p_infiltration_box") -dune_add_test(NAME test_3p_infiltration_tpfa +dumux_add_test(NAME test_3p_infiltration_tpfa LABELS porousmediumflow 3p SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=InfiltrationThreePCCTpfa diff --git a/test/porousmediumflow/3p3c/implicit/columnxylol/CMakeLists.txt b/test/porousmediumflow/3p3c/implicit/columnxylol/CMakeLists.txt index fa42d5a0d4..faa487f119 100644 --- a/test/porousmediumflow/3p3c/implicit/columnxylol/CMakeLists.txt +++ b/test/porousmediumflow/3p3c/implicit/columnxylol/CMakeLists.txt @@ -1,7 +1,7 @@ add_input_file_links(FILES params.input) # non-isothermal tests -dune_add_test(NAME test_3p3cni_columnxylol_box +dumux_add_test(NAME test_3p3cni_columnxylol_box LABELS porousmediumflow 3p3c 3p3cni SOURCES main.cc TIMEOUT 1500 @@ -12,7 +12,7 @@ dune_add_test(NAME test_3p3cni_columnxylol_box ${CMAKE_CURRENT_BINARY_DIR}/test_3p3cni_columnxylol_box-00061.vtu --command "${CMAKE_CURRENT_BINARY_DIR}/test_3p3cni_columnxylol_box params.input -Problem.Name test_3p3cni_columnxylol_box") -dune_add_test(NAME test_3p3cni_columnxylol_tpfa +dumux_add_test(NAME test_3p3cni_columnxylol_tpfa LABELS porousmediumflow 3p3c 3p3cni SOURCES main.cc TIMEOUT 1500 diff --git a/test/porousmediumflow/3p3c/implicit/infiltration/CMakeLists.txt b/test/porousmediumflow/3p3c/implicit/infiltration/CMakeLists.txt index 379da7cbcc..bdf4573ed4 100644 --- a/test/porousmediumflow/3p3c/implicit/infiltration/CMakeLists.txt +++ b/test/porousmediumflow/3p3c/implicit/infiltration/CMakeLists.txt @@ -1,7 +1,7 @@ add_input_file_links(FILES params.input) # isothermal tests -dune_add_test(NAME test_3p3c_infiltration_box +dumux_add_test(NAME test_3p3c_infiltration_box LABELS porousmediumflow 3p3c SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=InfiltrationThreePThreeCBox @@ -11,7 +11,7 @@ dune_add_test(NAME test_3p3c_infiltration_box ${CMAKE_CURRENT_BINARY_DIR}/test_3p3c_infiltration_box-00005.vtu --command "${CMAKE_CURRENT_BINARY_DIR}/test_3p3c_infiltration_box params.input -Problem.Name test_3p3c_infiltration_box") -dune_add_test(NAME test_3p3c_infiltration_tpfa +dumux_add_test(NAME test_3p3c_infiltration_tpfa LABELS porousmediumflow 3p3c SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=InfiltrationThreePThreeCCCTpfa diff --git a/test/porousmediumflow/3p3c/implicit/kuevette/CMakeLists.txt b/test/porousmediumflow/3p3c/implicit/kuevette/CMakeLists.txt index 2af313da9e..164dacfea1 100644 --- a/test/porousmediumflow/3p3c/implicit/kuevette/CMakeLists.txt +++ b/test/porousmediumflow/3p3c/implicit/kuevette/CMakeLists.txt @@ -1,6 +1,6 @@ add_input_file_links(FILES params.input) -dune_add_test(NAME test_3p3cni_kuevette_box +dumux_add_test(NAME test_3p3cni_kuevette_box LABELS porousmediumflow 3p3c 3p3cni SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=KuevetteBox @@ -10,7 +10,7 @@ dune_add_test(NAME test_3p3cni_kuevette_box ${CMAKE_CURRENT_BINARY_DIR}/test_3p3cni_kuevette_box-00004.vtu --command "${CMAKE_CURRENT_BINARY_DIR}/test_3p3cni_kuevette_box params.input -Problem.Name test_3p3cni_kuevette_box") -dune_add_test(NAME test_3p3cni_kuevette_tpfa +dumux_add_test(NAME test_3p3cni_kuevette_tpfa LABELS porousmediumflow 3p3c 3p3cni SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=KuevetteCCTpfa diff --git a/test/porousmediumflow/3pwateroil/implicit/CMakeLists.txt b/test/porousmediumflow/3pwateroil/implicit/CMakeLists.txt index cd423a18b5..fa3f044cd1 100644 --- a/test/porousmediumflow/3pwateroil/implicit/CMakeLists.txt +++ b/test/porousmediumflow/3pwateroil/implicit/CMakeLists.txt @@ -1,6 +1,6 @@ add_input_file_links(FILES params.input) -dune_add_test(NAME test_3pwateroil_sagd_box +dumux_add_test(NAME test_3pwateroil_sagd_box LABELS porousmediumflow 3pwateroil SOURCES main.cc TIMEOUT 1500 diff --git a/test/porousmediumflow/co2/implicit/CMakeLists.txt b/test/porousmediumflow/co2/implicit/CMakeLists.txt index b228f53965..5bc6de316f 100644 --- a/test/porousmediumflow/co2/implicit/CMakeLists.txt +++ b/test/porousmediumflow/co2/implicit/CMakeLists.txt @@ -5,7 +5,7 @@ dune_symlink_to_source_files(FILES grids) # Ignore the porosity for all box models since it is defined element-wise in these test # but the default 2p2c implementation outputs porosity per vertex. # Depending on the order of the elements, the porosity would differ in these cases. -dune_add_test(NAME test_co2_box +dumux_add_test(NAME test_co2_box LABELS porousmediumflow co2 SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=HeterogeneousBox @@ -17,7 +17,7 @@ dune_add_test(NAME test_co2_box --command "${CMAKE_CURRENT_BINARY_DIR}/test_co2_box params.input -Problem.Name test_co2_box" --zeroThreshold {"porosity":1}) -dune_add_test(NAME test_co2_tpfa +dumux_add_test(NAME test_co2_tpfa LABELS porousmediumflow co2 SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=HeterogeneousCCTpfa @@ -29,7 +29,7 @@ dune_add_test(NAME test_co2_tpfa --command "${CMAKE_CURRENT_BINARY_DIR}/test_co2_tpfa params.input -Problem.Name test_co2_tpfa") # build target for the CO2 non-isothermal test problem -dune_add_test(NAME test_co2ni_box +dumux_add_test(NAME test_co2ni_box LABELS porousmediumflow co2 co2ni SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=HeterogeneousNIBox @@ -42,7 +42,7 @@ dune_add_test(NAME test_co2ni_box --command "${CMAKE_CURRENT_BINARY_DIR}/test_co2ni_box paramsni.input -Problem.Name test_co2ni_box" --zeroThreshold {"porosity":1}) -dune_add_test(NAME test_co2ni_tpfa +dumux_add_test(NAME test_co2ni_tpfa LABELS porousmediumflow co2 co2ni SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=HeterogeneousNICCTpfa diff --git a/test/porousmediumflow/mpnc/implicit/2p2ccomparison/CMakeLists.txt b/test/porousmediumflow/mpnc/implicit/2p2ccomparison/CMakeLists.txt index d1b73d131d..b83258640c 100644 --- a/test/porousmediumflow/mpnc/implicit/2p2ccomparison/CMakeLists.txt +++ b/test/porousmediumflow/mpnc/implicit/2p2ccomparison/CMakeLists.txt @@ -1,6 +1,6 @@ add_input_file_links() -dune_add_test(NAME test_mpnc_2p2c_comparison_box +dumux_add_test(NAME test_mpnc_2p2c_comparison_box LABELS porousmediumflow mpnc SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=MPNCComparisonBox @@ -10,7 +10,7 @@ dune_add_test(NAME test_mpnc_2p2c_comparison_box ${CMAKE_CURRENT_BINARY_DIR}/test_mpnc_2p2c_comparison_box-00009.vtu --command "${CMAKE_CURRENT_BINARY_DIR}/test_mpnc_2p2c_comparison_box params.input -Problem.Name test_mpnc_2p2c_comparison_box") -dune_add_test(NAME test_mpnc_2p2c_comparison_tpfa +dumux_add_test(NAME test_mpnc_2p2c_comparison_tpfa LABELS porousmediumflow mpnc SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=MPNCComparisonCC diff --git a/test/porousmediumflow/mpnc/implicit/kinetic/CMakeLists.txt b/test/porousmediumflow/mpnc/implicit/kinetic/CMakeLists.txt index e767af623d..73a9ae68ff 100644 --- a/test/porousmediumflow/mpnc/implicit/kinetic/CMakeLists.txt +++ b/test/porousmediumflow/mpnc/implicit/kinetic/CMakeLists.txt @@ -1,7 +1,7 @@ add_input_file_links() # build target for the full kinetic test problem -dune_add_test(NAME test_mpnc_kinetic_box +dumux_add_test(NAME test_mpnc_kinetic_box LABELS porousmediumflow mpnc SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=EvaporationAtmosphereBox diff --git a/test/porousmediumflow/mpnc/implicit/obstacle/CMakeLists.txt b/test/porousmediumflow/mpnc/implicit/obstacle/CMakeLists.txt index 6ed82bab49..deaa1847d9 100644 --- a/test/porousmediumflow/mpnc/implicit/obstacle/CMakeLists.txt +++ b/test/porousmediumflow/mpnc/implicit/obstacle/CMakeLists.txt @@ -1,7 +1,7 @@ add_input_file_links() dune_symlink_to_source_files(FILES grids) -dune_add_test(NAME test_mpnc_obstacle_box +dumux_add_test(NAME test_mpnc_obstacle_box LABELS porousmediumflow mpnc SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=ObstacleBox @@ -11,7 +11,7 @@ dune_add_test(NAME test_mpnc_obstacle_box ${CMAKE_CURRENT_BINARY_DIR}/test_mpnc_obstacle_box-00009.vtu --command "${CMAKE_CURRENT_BINARY_DIR}/test_mpnc_obstacle_box params.input -Problem.Name test_mpnc_obstacle_box") -dune_add_test(NAME test_mpnc_obstacle_tpfa +dumux_add_test(NAME test_mpnc_obstacle_tpfa LABELS porousmediumflow mpnc SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=ObstacleCC diff --git a/test/porousmediumflow/mpnc/implicit/thermalnonequilibrium/CMakeLists.txt b/test/porousmediumflow/mpnc/implicit/thermalnonequilibrium/CMakeLists.txt index 885586d20f..c4de65d1a5 100644 --- a/test/porousmediumflow/mpnc/implicit/thermalnonequilibrium/CMakeLists.txt +++ b/test/porousmediumflow/mpnc/implicit/thermalnonequilibrium/CMakeLists.txt @@ -2,7 +2,7 @@ add_input_file_links() dune_symlink_to_source_files(FILES grids) # build target for the energy kinetic test problem, two energy balance equations -dune_add_test(COMPILE_ONLY # since it currently fails miserably with very different results on different machines +dumux_add_test(COMPILE_ONLY # since it currently fails miserably with very different results on different machines NAME test_mpnc_thermalnonequil_box LABELS porousmediumflow mpnc SOURCES main.cc diff --git a/test/porousmediumflow/richards/implicit/analytical/CMakeLists.txt b/test/porousmediumflow/richards/implicit/analytical/CMakeLists.txt index bca5c6115f..e87043711e 100644 --- a/test/porousmediumflow/richards/implicit/analytical/CMakeLists.txt +++ b/test/porousmediumflow/richards/implicit/analytical/CMakeLists.txt @@ -1,7 +1,7 @@ add_input_file_links(FILES params.input) # comparison to analytical solution - only with tpfa -dune_add_test(NAME test_richards_analytical_tpfa +dumux_add_test(NAME test_richards_analytical_tpfa LABELS porousmediumflow richards SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=RichardsAnalyticalCC diff --git a/test/porousmediumflow/richards/implicit/lens/CMakeLists.txt b/test/porousmediumflow/richards/implicit/lens/CMakeLists.txt index 79ad4cb188..d1e3a01434 100644 --- a/test/porousmediumflow/richards/implicit/lens/CMakeLists.txt +++ b/test/porousmediumflow/richards/implicit/lens/CMakeLists.txt @@ -10,7 +10,7 @@ target_compile_definitions(test_richards_lens_mpfa PUBLIC TYPETAG=RichardsLensCC add_executable(test_richards_lens_box EXCLUDE_FROM_ALL main.cc) target_compile_definitions(test_richards_lens_box PUBLIC TYPETAG=RichardsLensBox PUBLIC DIFFMETHOD=DiffMethod::numeric) -dune_add_test(TARGET test_richards_lens_box +dumux_add_test(TARGET test_richards_lens_box LABELS porousmediumflow richards COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py CMD_ARGS --script fuzzy @@ -18,7 +18,7 @@ dune_add_test(TARGET test_richards_lens_box ${CMAKE_CURRENT_BINARY_DIR}/test_richards_lens_box-00007.vtu --command "${CMAKE_CURRENT_BINARY_DIR}/test_richards_lens_box params.input -Problem.Name test_richards_lens_box") -dune_add_test(NAME test_richards_lens_box_analyticdiff +dumux_add_test(NAME test_richards_lens_box_analyticdiff SOURCES main.cc LABELS porousmediumflow richards COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py @@ -29,7 +29,7 @@ dune_add_test(NAME test_richards_lens_box_analyticdiff ${CMAKE_CURRENT_BINARY_DIR}/test_richards_lens_box_analyticdiff-00007.vtu --command "${CMAKE_CURRENT_BINARY_DIR}/test_richards_lens_box_analyticdiff params.input -Problem.Name test_richards_lens_box_analyticdiff") -dune_add_test(TARGET test_richards_lens_tpfa +dumux_add_test(TARGET test_richards_lens_tpfa LABELS porousmediumflow richards COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py CMD_ARGS --script fuzzy @@ -37,7 +37,7 @@ dune_add_test(TARGET test_richards_lens_tpfa ${CMAKE_CURRENT_BINARY_DIR}/test_richards_lens_tpfa-00007.vtu --command "${CMAKE_CURRENT_BINARY_DIR}/test_richards_lens_tpfa params.input -Problem.Name test_richards_lens_tpfa") -dune_add_test(NAME test_richards_lens_tpfa_analyticdiff +dumux_add_test(NAME test_richards_lens_tpfa_analyticdiff SOURCES main.cc LABELS porousmediumflow richards COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py @@ -48,7 +48,7 @@ dune_add_test(NAME test_richards_lens_tpfa_analyticdiff ${CMAKE_CURRENT_BINARY_DIR}/test_richards_lens_tpfa_analyticdiff-00007.vtu --command "${CMAKE_CURRENT_BINARY_DIR}/test_richards_lens_tpfa_analyticdiff params.input -Problem.Name test_richards_lens_tpfa_analyticdiff") -dune_add_test(NAME test_richards_lens_box_parallel_yasp +dumux_add_test(NAME test_richards_lens_box_parallel_yasp TARGET test_richards_lens_box LABELS porousmediumflow richards parallel CMAKE_GUARD MPI_FOUND @@ -60,7 +60,7 @@ dune_add_test(NAME test_richards_lens_box_parallel_yasp ${CMAKE_CURRENT_BINARY_DIR}/s0002-test_richards_lens_box_parallel_yasp-00007.pvtu --command "${MPIEXEC} -np 2 ${CMAKE_CURRENT_BINARY_DIR}/test_richards_lens_box params.input -Problem.Name test_richards_lens_box_parallel_yasp -Grid.Overlap 0") -dune_add_test(NAME test_richards_lens_tpfa_parallel_yasp +dumux_add_test(NAME test_richards_lens_tpfa_parallel_yasp TARGET test_richards_lens_tpfa LABELS porousmediumflow richards parallel CMAKE_GUARD MPI_FOUND @@ -72,7 +72,7 @@ dune_add_test(NAME test_richards_lens_tpfa_parallel_yasp ${CMAKE_CURRENT_BINARY_DIR}/s0002-test_richards_lens_tpfa_parallel_yasp-00007.pvtu --command "${MPIEXEC} -np 2 ${CMAKE_CURRENT_BINARY_DIR}/test_richards_lens_tpfa params.input -Problem.Name test_richards_lens_tpfa_parallel_yasp -Grid.Overlap 1") -dune_add_test(NAME test_richards_lens_mpfa_parallel_yasp +dumux_add_test(NAME test_richards_lens_mpfa_parallel_yasp TARGET test_richards_lens_mpfa LABELS porousmediumflow richards parallel CMAKE_GUARD MPI_FOUND @@ -86,7 +86,7 @@ dune_add_test(NAME test_richards_lens_mpfa_parallel_yasp # TODO: there is a small difference because of the precision loss when writing and reading to and from vtk with single precision # This is why we need a bit higher saturation threshold since pc-sw is very sensitive to pressure for saturations close to 0 -dune_add_test(NAME test_richards_lens_tpfa_parallel_yasp_restart +dumux_add_test(NAME test_richards_lens_tpfa_parallel_yasp_restart TARGET test_richards_lens_tpfa LABELS porousmediumflow richards parallel CMAKE_GUARD MPI_FOUND @@ -101,7 +101,7 @@ dune_add_test(NAME test_richards_lens_tpfa_parallel_yasp_restart # the restart test has to run after the test that produces the corresponding vtu file set_tests_properties(test_richards_lens_tpfa_parallel_yasp_restart PROPERTIES DEPENDS test_richards_lens_tpfa_parallel_yasp) -dune_add_test(NAME test_richards_lens_box_parallel_ug +dumux_add_test(NAME test_richards_lens_box_parallel_ug LABELS porousmediumflow richards parallel SOURCES main.cc CMAKE_GUARD "( MPI_FOUND AND HAVE_UG )" @@ -112,7 +112,7 @@ dune_add_test(NAME test_richards_lens_box_parallel_ug ${CMAKE_CURRENT_BINARY_DIR}/s0002-test_richards_lens_box_parallel_ug-00007.pvtu --command "${MPIEXEC} -np 2 ${CMAKE_CURRENT_BINARY_DIR}/test_richards_lens_box_parallel_ug params.input -Problem.Name test_richards_lens_box_parallel_ug") -dune_add_test(NAME test_richards_lens_tpfa_parallel_ug +dumux_add_test(NAME test_richards_lens_tpfa_parallel_ug LABELS porousmediumflow richards parallel SOURCES main.cc CMAKE_GUARD "( MPI_FOUND AND HAVE_UG )" @@ -123,7 +123,7 @@ dune_add_test(NAME test_richards_lens_tpfa_parallel_ug ${CMAKE_CURRENT_BINARY_DIR}/s0002-test_richards_lens_tpfa_parallel_ug-00007.pvtu --command "${MPIEXEC} -np 2 ${CMAKE_CURRENT_BINARY_DIR}/test_richards_lens_tpfa_parallel_ug params.input -Problem.Name test_richards_lens_tpfa_parallel_ug") -dune_add_test(NAME test_richards_lens_box_parallel_alu +dumux_add_test(NAME test_richards_lens_box_parallel_alu LABELS porousmediumflow richards parallel SOURCES main.cc CMAKE_GUARD "( MPI_FOUND AND dune-alugrid_FOUND )" @@ -134,7 +134,7 @@ dune_add_test(NAME test_richards_lens_box_parallel_alu ${CMAKE_CURRENT_BINARY_DIR}/s0002-test_richards_lens_box_parallel_alu-00007.pvtu --command "${MPIEXEC} -np 2 ${CMAKE_CURRENT_BINARY_DIR}/test_richards_lens_box_parallel_alu params.input -Problem.Name test_richards_lens_box_parallel_alu") -dune_add_test(NAME test_richards_lens_tpfa_parallel_alu +dumux_add_test(NAME test_richards_lens_tpfa_parallel_alu LABELS porousmediumflow richards parallel SOURCES main.cc CMAKE_GUARD "( MPI_FOUND AND dune-alugrid_FOUND )" diff --git a/test/porousmediumflow/richards/implicit/nonisothermal/conduction/CMakeLists.txt b/test/porousmediumflow/richards/implicit/nonisothermal/conduction/CMakeLists.txt index 2986737159..916672671f 100644 --- a/test/porousmediumflow/richards/implicit/nonisothermal/conduction/CMakeLists.txt +++ b/test/porousmediumflow/richards/implicit/nonisothermal/conduction/CMakeLists.txt @@ -1,7 +1,7 @@ add_input_file_links(FILES params.input) # non-isothermal tests -dune_add_test(NAME test_richardsni_conduction_box +dumux_add_test(NAME test_richardsni_conduction_box LABELS porousmediumflow richards richardsni SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=RichardsNIConductionBox @@ -11,7 +11,7 @@ dune_add_test(NAME test_richardsni_conduction_box ${CMAKE_CURRENT_BINARY_DIR}/test_richardsni_conduction_box-00024.vtu --command "${CMAKE_CURRENT_BINARY_DIR}/test_richardsni_conduction_box params.input -Problem.Name test_richardsni_conduction_box") -dune_add_test(NAME test_richardsni_conduction_tpfa +dumux_add_test(NAME test_richardsni_conduction_tpfa LABELS porousmediumflow richards richardsni SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=RichardsNIConductionCC diff --git a/test/porousmediumflow/richards/implicit/nonisothermal/convection/CMakeLists.txt b/test/porousmediumflow/richards/implicit/nonisothermal/convection/CMakeLists.txt index 0212ad9595..7f535dabcd 100644 --- a/test/porousmediumflow/richards/implicit/nonisothermal/convection/CMakeLists.txt +++ b/test/porousmediumflow/richards/implicit/nonisothermal/convection/CMakeLists.txt @@ -1,7 +1,7 @@ add_input_file_links(FILES params.input) # non-isothermal tests -dune_add_test(NAME test_richardsni_convection_box +dumux_add_test(NAME test_richardsni_convection_box LABELS porousmediumflow richards richardsni SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=RichardsNIConvectionBox @@ -11,7 +11,7 @@ dune_add_test(NAME test_richardsni_convection_box ${CMAKE_CURRENT_BINARY_DIR}/test_richardsni_convection_box-00044.vtu --command "${CMAKE_CURRENT_BINARY_DIR}/test_richardsni_convection_box params.input -Problem.Name test_richardsni_convection_box") -dune_add_test(NAME test_richardsni_convection_tpfa +dumux_add_test(NAME test_richardsni_convection_tpfa LABELS porousmediumflow richards richardsni SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=RichardsNIConvectionCC diff --git a/test/porousmediumflow/richards/implicit/nonisothermal/evaporation/CMakeLists.txt b/test/porousmediumflow/richards/implicit/nonisothermal/evaporation/CMakeLists.txt index 14372faa12..8750b8cbdf 100644 --- a/test/porousmediumflow/richards/implicit/nonisothermal/evaporation/CMakeLists.txt +++ b/test/porousmediumflow/richards/implicit/nonisothermal/evaporation/CMakeLists.txt @@ -1,7 +1,7 @@ add_input_file_links(FILES params.input) # non-isothermal tests -dune_add_test(NAME test_richardsni_evaporation_tpfa +dumux_add_test(NAME test_richardsni_evaporation_tpfa LABELS porousmediumflow richards richardsni SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=RichardsNIEvaporationCC @@ -12,7 +12,7 @@ dune_add_test(NAME test_richardsni_evaporation_tpfa ${CMAKE_CURRENT_BINARY_DIR}/test_richardsni_evaporation_tpfa-00043.vtu --command "${CMAKE_CURRENT_BINARY_DIR}/test_richardsni_evaporation_tpfa params.input -Problem.Name test_richardsni_evaporation_tpfa") -dune_add_test(NAME test_richardsni_evaporation_box +dumux_add_test(NAME test_richardsni_evaporation_box LABELS porousmediumflow richards richardsni SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=RichardsNIEvaporationBox diff --git a/test/porousmediumflow/richardsnc/implicit/CMakeLists.txt b/test/porousmediumflow/richardsnc/implicit/CMakeLists.txt index 9e2e31a8a1..b3762f2a14 100644 --- a/test/porousmediumflow/richardsnc/implicit/CMakeLists.txt +++ b/test/porousmediumflow/richardsnc/implicit/CMakeLists.txt @@ -1,6 +1,6 @@ add_input_file_links(FILES params.input) -dune_add_test(NAME test_richardsnc_box +dumux_add_test(NAME test_richardsnc_box LABELS porousmediumflow richardsnc SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=RichardsWellTracerBox @@ -10,7 +10,7 @@ dune_add_test(NAME test_richardsnc_box ${CMAKE_CURRENT_BINARY_DIR}/test_richardsnc_box-00035.vtu --command "${CMAKE_CURRENT_BINARY_DIR}/test_richardsnc_box params.input -Problem.Name test_richardsnc_box") -dune_add_test(NAME test_richardsnc_tpfa +dumux_add_test(NAME test_richardsnc_tpfa LABELS porousmediumflow richardsnc SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=RichardsWellTracerCC diff --git a/test/porousmediumflow/solidenergy/CMakeLists.txt b/test/porousmediumflow/solidenergy/CMakeLists.txt index 85e5b735ab..00c0e4228a 100644 --- a/test/porousmediumflow/solidenergy/CMakeLists.txt +++ b/test/porousmediumflow/solidenergy/CMakeLists.txt @@ -1,7 +1,7 @@ add_input_file_links() # non-isothermal tests -dune_add_test(NAME test_solidenergy_tpfa +dumux_add_test(NAME test_solidenergy_tpfa LABELS porousmediumflow solidenergy SOURCES main.cc COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py diff --git a/test/porousmediumflow/tracer/1ptracer/CMakeLists.txt b/test/porousmediumflow/tracer/1ptracer/CMakeLists.txt index 87d53d5880..22a5417f14 100644 --- a/test/porousmediumflow/tracer/1ptracer/CMakeLists.txt +++ b/test/porousmediumflow/tracer/1ptracer/CMakeLists.txt @@ -1,6 +1,6 @@ dune_symlink_to_source_files(FILES "params.input") -dune_add_test(NAME test_1ptracer +dumux_add_test(NAME test_1ptracer LABELS porousmediumflow tracer SOURCES main.cc CMAKE_GUARD HAVE_UMFPACK diff --git a/test/porousmediumflow/tracer/2ptracer/CMakeLists.txt b/test/porousmediumflow/tracer/2ptracer/CMakeLists.txt index 2bb9bcf66a..6785007239 100644 --- a/test/porousmediumflow/tracer/2ptracer/CMakeLists.txt +++ b/test/porousmediumflow/tracer/2ptracer/CMakeLists.txt @@ -1,6 +1,6 @@ dune_symlink_to_source_files(FILES "params.input") -dune_add_test(NAME test_2ptracer_lens_tpfa +dumux_add_test(NAME test_2ptracer_lens_tpfa LABELS porousmediumflow tracer SOURCES main.cc CMAKE_GUARD HAVE_UMFPACK diff --git a/test/porousmediumflow/tracer/constvel/CMakeLists.txt b/test/porousmediumflow/tracer/constvel/CMakeLists.txt index 4eec6bed15..701f308b90 100644 --- a/test/porousmediumflow/tracer/constvel/CMakeLists.txt +++ b/test/porousmediumflow/tracer/constvel/CMakeLists.txt @@ -1,7 +1,7 @@ dune_symlink_to_source_files(FILES "params.input") # explicit tracer tests (mass fractions) -dune_add_test(NAME test_tracer_explicit_tpfa +dumux_add_test(NAME test_tracer_explicit_tpfa LABELS porousmediumflow tracer SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=TracerTestTpfa IMPLICIT=false USEMOLES=false @@ -12,7 +12,7 @@ dune_add_test(NAME test_tracer_explicit_tpfa ${CMAKE_CURRENT_BINARY_DIR}/test_tracer_explicit_tpfa-00010.vtu --command "${CMAKE_CURRENT_BINARY_DIR}/test_tracer_explicit_tpfa params.input -Problem.Name test_tracer_explicit_tpfa") -dune_add_test(NAME test_tracer_explicit_box +dumux_add_test(NAME test_tracer_explicit_box LABELS porousmediumflow tracer SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=TracerTestBox IMPLICIT=false USEMOLES=false @@ -24,7 +24,7 @@ dune_add_test(NAME test_tracer_explicit_box --command "${CMAKE_CURRENT_BINARY_DIR}/test_tracer_explicit_box params.input -Problem.Name test_tracer_explicit_box") # explicit tracer tests (mole fractions, should yield same result) -dune_add_test(NAME test_tracer_explicit_tpfa_mol +dumux_add_test(NAME test_tracer_explicit_tpfa_mol LABELS porousmediumflow tracer SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=TracerTestTpfa IMPLICIT=false USEMOLES=true @@ -35,7 +35,7 @@ dune_add_test(NAME test_tracer_explicit_tpfa_mol ${CMAKE_CURRENT_BINARY_DIR}/test_tracer_explicit_tpfa_mol-00010.vtu --command "${CMAKE_CURRENT_BINARY_DIR}/test_tracer_explicit_tpfa_mol params.input -Problem.Name test_tracer_explicit_tpfa_mol") -dune_add_test(NAME test_tracer_explicit_box_mol +dumux_add_test(NAME test_tracer_explicit_box_mol LABELS porousmediumflow tracer SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=TracerTestBox IMPLICIT=false USEMOLES=true @@ -47,7 +47,7 @@ dune_add_test(NAME test_tracer_explicit_box_mol --command "${CMAKE_CURRENT_BINARY_DIR}/test_tracer_explicit_box_mol params.input -Problem.Name test_tracer_explicit_box_mol") # implicit tracer tests -dune_add_test(NAME test_tracer_implicit_tpfa +dumux_add_test(NAME test_tracer_implicit_tpfa LABELS porousmediumflow tracer SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=TracerTestTpfa IMPLICIT=true USEMOLES=false @@ -58,7 +58,7 @@ dune_add_test(NAME test_tracer_implicit_tpfa ${CMAKE_CURRENT_BINARY_DIR}/test_tracer_implicit_tpfa-00010.vtu --command "${CMAKE_CURRENT_BINARY_DIR}/test_tracer_implicit_tpfa params.input -Problem.Name test_tracer_implicit_tpfa") -dune_add_test(NAME test_tracer_implicit_box +dumux_add_test(NAME test_tracer_implicit_box LABELS porousmediumflow tracer SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=TracerTestBox IMPLICIT=true USEMOLES=false diff --git a/test/porousmediumflow/tracer/multicomp/CMakeLists.txt b/test/porousmediumflow/tracer/multicomp/CMakeLists.txt index bbba1bf767..fcaf6e4062 100644 --- a/test/porousmediumflow/tracer/multicomp/CMakeLists.txt +++ b/test/porousmediumflow/tracer/multicomp/CMakeLists.txt @@ -1,7 +1,7 @@ add_input_file_links() # tracer tests -dune_add_test(NAME test_tracer_maxwellstefan_tpfa +dumux_add_test(NAME test_tracer_maxwellstefan_tpfa LABELS porousmediumflow tracer SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=MaxwellStefanTestCC @@ -11,7 +11,7 @@ dune_add_test(NAME test_tracer_maxwellstefan_tpfa ${CMAKE_CURRENT_BINARY_DIR}/test_tracer_maxwellstefan_tpfa-00026.vtu --command "${CMAKE_CURRENT_BINARY_DIR}/test_tracer_maxwellstefan_tpfa params.input -Problem.Name test_tracer_maxwellstefan_tpfa") -dune_add_test(NAME test_tracer_maxwellstefan_box +dumux_add_test(NAME test_tracer_maxwellstefan_box LABELS porousmediumflow tracer SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=MaxwellStefanTestBox -- GitLab