From 2f9e25bdd4494bd562c8deb74615d89fd9d3056f Mon Sep 17 00:00:00 2001 From: Timo Koch Date: Fri, 18 Oct 2019 11:59:36 +0200 Subject: [PATCH 1/3] [cmake] Implement Dune 2.6 backwards-compatible dumux_add_test --- cmake/modules/DumuxTestMacros.cmake | 329 +++++++++++++++++++++++++++- 1 file changed, 327 insertions(+), 2 deletions(-) diff --git a/cmake/modules/DumuxTestMacros.cmake b/cmake/modules/DumuxTestMacros.cmake index fd437823f1..adc99917e2 100644 --- a/cmake/modules/DumuxTestMacros.cmake +++ b/cmake/modules/DumuxTestMacros.cmake @@ -14,7 +14,7 @@ ### macro(add_dumux_test dumux_test dumux_test_executable dumux_test_executable_source) - message(WARNING "add_dumux_test is deprecated. Use dune_add_test directly now that we require dune 2.6") + message(WARNING "add_dumux_test is deprecated. Use dumux_add_test now that we require dune 2.6") # if present, symlink the grids folder set(grids_directory ${CMAKE_CURRENT_SOURCE_DIR}/grids) @@ -48,10 +48,335 @@ macro(add_dumux_test dumux_test dumux_test_executable dumux_test_executable_sour # add test list(GET dumux_test_args 0 dumux_test_command) list(REMOVE_AT dumux_test_args 0) - dune_add_test(NAME ${dumux_test} + dumux_add_test(NAME ${dumux_test} TARGET ${dumux_test_executable} COMMAND ${dumux_test_command} CMD_ARGS ${dumux_test_args}) # tests always require the executable to run set_tests_properties(${dumux_test} PROPERTIES REQUIRED_FILES ${dumux_test_executable}) endmacro() + +# Dumux wrapper for the module that provides tools for testing the Dune way. +# We have a wrapper to have to possibily of supporting multiple Dune versions. +# +# .. cmake_function:: dumux_declare_test_label +# +# .. cmake_brief:: +# +# Declare labels for :ref:`dumux_add_test`. +# +# .. cmake_param:: LABELS +# :multi: +# +# The names of labels to declare. Label names must be nonempty and +# consist only of alphanumeric characters plus :code:`-` and :code:`_` +# to make sure it is easy to construct regular expressions from them for +# :code:`ctest -L ${label_regex}`. +# +# Labels need to be declared to ensure that the target +# :code:`build_${label}_tests` exists. They will normally be declared +# on-demand by :ref:`dumux_add_test`. But sometimes it is useful to be able to +# run :code:`make build_${label}_tests` whether or not any tests with that +# label exists in a module. For these cases :ref:`dune_declare_test_label` can +# be called explicitly. +# +# The label :code:`quick` is always predeclared. +# +# .. cmake_function:: dumux_add_test +# +# .. cmake_brief:: +# +# Adds a test to the Dumux testing suite! +# +# .. cmake_param:: NAME +# :single: +# +# The name of the test that should be added. If an executable +# is also added (by specifying SOURCES), the executable is also +# named accordingly. If omitted, the name will be deduced from +# the (single) sources parameter or from the given target. Note +# that this requires you to take care, that you only use a target +# or source file for but one such test. +# +# .. cmake_param:: SOURCES +# :multi: +# +# The source files that this test depends on. These are the +# sources that will be passed to :ref:`add_executable`. +# +# You *must* specify either :code:`SOURCES` or :code:`TARGET`. +# +# .. cmake_param:: TARGET +# :single: +# +# An executable target which should be used for the test. Use +# this option over the :code:`SOURCES` parameter if you want to +# reuse already added targets. +# +# You *must* specify either :code:`SOURCES` or :code:`TARGET`. +# +# .. cmake_param:: COMPILE_DEFINITIONS +# :multi: +# :argname: def +# +# A set of compile definitions to add to the target. +# Only definitions beyond the application of :ref:`add_dune_all_flags` +# have to be stated. +# This is only used, if :code:`dumux_add_test` adds the executable itself. +# +# .. cmake_param:: COMPILE_FLAGS +# :multi: +# :argname: flag +# +# A set of non-definition compile flags to add to the target. +# Only flags beyond the application of :ref:`add_dune_all_flags` +# have to be stated. +# This is only used, if :code:`dumux_add_test` adds the executable itself. +# +# .. cmake_param:: LINK_LIBRARIES +# :multi: +# :argname: lib +# +# A list of libraries to link the target to. +# Only libraries beyond the application of :ref:`add_dune_all_flags` +# have to be stated. +# This is only used, if :code:`dumux_add_test` adds the executable itself. +# +# .. cmake_param:: EXPECT_COMPILE_FAIL +# :option: +# +# If given, the test is expected to not compile successfully! +# +# .. cmake_param:: EXPECT_FAIL +# :option: +# +# If given, this test is expected to compile, but fail to run. +# +# .. cmake_param:: CMD_ARGS +# :multi: +# :argname: arg +# +# Command line arguments that should be passed to this test. +# +# .. cmake_param:: MPI_RANKS +# :multi: +# :argname: ranks +# +# The numbers of cores that this test should be executed with. +# Note that one test (in the ctest sense) is created for each number +# given here. Any number exceeding the user-specified processor maximum +# :ref:`DUNE_MAX_TEST_CORES` will be ignored. Tests with a +# processor number :code:`n` higher than one will have the suffix +# :code:`-mpi-n` appended to their name. You need to specify the +# TIMEOUT option when specifying the MPI_RANKS option. +# +# .. cmake_param:: CMAKE_GUARD +# :multi: +# :argname: condition +# +# A number of conditions that CMake should evaluate before adding this +# test. If one of the conditions fails, the test should be shown +# as skipped in the test summary. Use this feature instead of guarding +# the call to :code:`dumux_add_test` with an :code:`if` clause. +# +# The passed condition can be a complex expression like +# `( A OR B ) AND ( C OR D )`. Mind the spaces around the parentheses. +# +# Example: Write CMAKE_GUARD dune-foo_FOUND if you want your test to only +# build and run when the dune-foo module is present. +# +# .. cmake_param:: COMMAND +# :multi: +# :argname: cmd +# +# You may specify the COMMAND option to give the exact command line to be +# executed when running the test. This defaults to the name of the executable +# added by dumux_add_test for this test. Note that if you specify both CMD_ARGS +# and COMMAND, the given CMD_ARGS will be put behind your COMMAND. If you use +# this in combination with the MPI_RANKS parameter, the call to mpi will still be +# wrapped around the given commands. +# +# .. cmake_param:: COMPILE_ONLY +# :option: +# +# Set if the given test should only be compiled during :code:`make build_tests`, +# but not run during :code:`make test`. This is useful if you compile the same +# executable twice, but with different compile flags, where you want to assure that +# it compiles with both sets of flags, but you already know they will produce the +# same result. +# +# .. cmake_param:: TIMEOUT +# :single: +# +# If set, the test will time out after the given number of seconds. This supersedes +# any timeout setting in ctest (see `cmake --help-property TIMEOUT`). If you +# specify the MPI_RANKS option, you need to specify a TIMEOUT. +# +# .. cmake_param:: LABELS +# :multi: +# +# A list of labels to add to the test. This has two effects: it sets +# the LABELS property on the test so :code:`ctest -L ${label_regex}` can +# be used to run all tests with certain labels. It also adds any +# targets created as dependencies to a custom target, so you can build +# all tests with a particular label by doing :code:`make +# build_${label}_tests` without having to build all the other tests as +# well. +# +# The :code:`build_${label}_tests` targets are created on-demand the +# first time a test with that label is added. In some situations it can +# depend on the values of cmake cache variables whether a test is added, +# and then it can happen that the :code:`build_${target}_tests` target +# exists only sometimes. If your workflow relies on the existance of +# these targets, even if building them just returns successfully without +# doing anything, you can ensure they exist by calling +# :ref:`dune_declare_test_label` unconditionally. The label +# :code:`quick` is always predeclared in this way. +# +# The label names must be non-empty, and must only contain alphanumeric +# characters other than :code:`-` or :code:`_`. This restriction is in +# place to make it easy to construct regular expressions from the label +# names for :code:`ctest -L ${label_regex}`. +# +# This function defines the Dune way of adding a test to the testing suite. +# You may either add the executable yourself through :ref:`add_executable` +# and pass it to the :code:`TARGET` option, or you may rely on :ref:`dumux_add_test` +# to do so. +# +# .. cmake_variable:: DUNE_REENABLE_ADD_TEST +# +# You may set this variable to True either through your opts file or in your module +# (before the call to :code:`include(DuneMacros)`) to suppress the error that is thrown if +# :code:`add_test` is used. You should only do that if you have proper reason to do so. +# +# .. cmake_variable:: DUNE_MAX_TEST_CORES +# +# You may set this variable to give an upperbound to the number of processors, that +# a single test may use. Defaults to 2, when MPI is found and to 1 otherwise. +# +# .. cmake_variable:: DUNE_BUILD_TESTS_ON_MAKE_ALL +# +# You may set this variable through your opts file or on a per module level (in the toplevel +# :code:`CMakeLists.txt` before :code:`include(DuneMacros)`) to have the Dune build system +# build all tests during `make all`. Note, that this may take quite some time for some modules. +# If not in use, you have to build tests through the target :code:`build_tests`. +# + +# Note: This is a copy of dune_declare_test_label to be backwards compatible with Dune 2.6 but enable labels +function(dumux_declare_test_label) + include(CMakeParseArguments) + set(OPTIONS) + set(SINGLEARGS) + set(MULTIARGS LABELS) + cmake_parse_arguments(arg "${OPTIONS}" "${SINGLEARGS}" "${MULTIARGS}" ${ARGN}) + + if( (DEFINED arg_UNPARSED_ARGUMENTS) AND NOT ( arg_UNPARSED_ARGUMENTS STREQUAL "" ) ) + message(FATAL_ERROR "Unhandled extra arguments given to dumux_declare_test_label(): " + "<${arg_UNPARSED_ARGUMENTS}>") + endif() + + foreach(label IN LISTS arg_LABELS) + # Make sure the label is not empty, and does not contain any funny + # characters, in particular regex characters + if(NOT (label MATCHES "[-_0-9a-zA-Z]+")) + message(FATAL_ERROR "Refusing to add label \"${label}\" since it is " + "empty or contains funny characters (characters other than " + "alphanumeric ones and \"-\" or \"_\"; the intent of this restriction " + "is to make construction of the argument to \"ctest -L\" easier") + endif() + set(target "build_${label}_tests") + if(NOT TARGET "${target}") + add_custom_target("${target}") + endif() + endforeach() +endfunction(dumux_declare_test_label) + +# predefine "quick" test label so build_quick_tests can be built +# unconditionally +dumux_declare_test_label(LABELS quick) + +# Note: This is a copy of dune_declare_test_label to be backwards compatible with Dune 2.6 but enable labels +# After labels are available on a release branch this can simply forward to dune_add_test +function(dumux_add_test) + # for new versions just forward to dune_add_test + if(DUNE_COMMON_VERSION VERSION_GREATER 2.6.0) + dune_add_test(${ARGV}) + + # otherwise deal with labels separately (backwards-compatibilty layer with Dune 2.6.0) + else() + include(CMakeParseArguments) + set(OPTIONS EXPECT_COMPILE_FAIL EXPECT_FAIL SKIP_ON_77 COMPILE_ONLY) + set(SINGLEARGS NAME TARGET TIMEOUT) + set(MULTIARGS SOURCES COMPILE_DEFINITIONS COMPILE_FLAGS LINK_LIBRARIES CMD_ARGS MPI_RANKS COMMAND CMAKE_GUARD LABELS) + cmake_parse_arguments(ADDTEST "${OPTIONS}" "${SINGLEARGS}" "${MULTIARGS}" ${ARGN}) + + # Check whether the parser produced any errors + if(ADDTEST_UNPARSED_ARGUMENTS) + message(WARNING "Unrecognized arguments ('${ADDTEST_UNPARSED_ARGUMENTS}') for dumux_add_test!") + endif() + + # remove labels from the argument list + set(FORWARD_ARGS ${ARGV}) + if(ADDTEST_LABELS) + string(REPLACE "LABELS;${ADDTEST_LABELS}" "" FORWARD_ARGS "${FORWARD_ARGS}") + # replace head or trailing ";" + string(REGEX REPLACE ";^" "" FORWARD_ARGS "${FORWARD_ARGS}") + string(REGEX REPLACE ";$" "" FORWARD_ARGS "${FORWARD_ARGS}") + endif() + + # foward to dune function + dune_add_test(${FORWARD_ARGS}) + + # take care of labels afterwards + if(NOT ADDTEST_NAME) + # try deducing the test name from the executable name + if(ADDTEST_TARGET) + set(ADDTEST_NAME ${ADDTEST_TARGET}) + endif() + # try deducing the test name form the source name + if(ADDTEST_SOURCES) + list(LENGTH ADDTEST_SOURCES len) + get_filename_component(ADDTEST_NAME ${ADDTEST_SOURCES} NAME_WE) + endif() + endif() + + if(ADDTEST_SOURCES) + set(ADDTEST_TARGET ${ADDTEST_NAME}) + endif() + + # possibly set default for mpi ranks + if(NOT ADDTEST_MPI_RANKS) + set(ADDTEST_MPI_RANKS 1) + endif() + + # Discard all parallel tests if MPI was not found + if(NOT MPI_FOUND) + set(DUNE_MAX_TEST_CORES 1) + endif() + + # make sure each label exists and its name is acceptable + dumux_declare_test_label(LABELS ${ADDTEST_LABELS}) + + # Have build_${label}_tests depend on the given target in + # order to trigger the build correctly + if(NOT ADDTEST_EXPECT_COMPILE_FAIL) + foreach(label IN LISTS ADDTEST_LABELS) + add_dependencies(build_${label}_tests ${ADDTEST_TARGET}) + endforeach() + endif() + + # Add one test for each specified processor number + foreach(procnum ${ADDTEST_MPI_RANKS}) + if((NOT "${procnum}" GREATER "${DUNE_MAX_TEST_CORES}") AND (NOT ADDTEST_COMPILE_ONLY)) + set(ACTUAL_NAME ${ADDTEST_NAME}) + + if(NOT ${procnum} STREQUAL "1") + set(ACTUAL_NAME "${ACTUAL_NAME}-mpi-${procnum}") + endif() + + # Set the labels on the test + set_tests_properties(${ACTUAL_NAME} PROPERTIES LABELS "${ADDTEST_LABELS}") + endif() + endforeach() + endif() +endfunction() -- GitLab From d134bf1dbb1f0e6c90f2eede1e0958df096c4308 Mon Sep 17 00:00:00 2001 From: Timo Koch Date: Fri, 18 Oct 2019 12:14:25 +0200 Subject: [PATCH 2/3] [cmake] Use dumux_add_test for backwards-compatibility with dune 2.6.0 --- test/common/CMakeLists.txt | 2 +- test/common/boundingboxtree/CMakeLists.txt | 8 ++-- test/common/geometry/CMakeLists.txt | 8 ++-- test/common/math/CMakeLists.txt | 2 +- test/common/parameters/CMakeLists.txt | 2 +- test/common/propertysystem/CMakeLists.txt | 4 +- test/common/spline/CMakeLists.txt | 2 +- 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/staggered/CMakeLists.txt | 4 +- .../navierstokes/angeli/CMakeLists.txt | 2 +- .../navierstokes/channel/1d/CMakeLists.txt | 2 +- .../navierstokes/channel/2d/CMakeLists.txt | 8 ++-- .../navierstokes/channel/3d/CMakeLists.txt | 4 +- .../navierstokes/closedsystem/CMakeLists.txt | 6 +-- .../navierstokes/donea/CMakeLists.txt | 4 +- .../navierstokes/kovasznay/CMakeLists.txt | 2 +- .../navierstokesnc/channel/CMakeLists.txt | 12 +++--- .../densitydrivenflow/CMakeLists.txt | 2 +- .../maxwellstefan/CMakeLists.txt | 2 +- test/freeflow/rans/CMakeLists.txt | 14 +++---- test/freeflow/ransnc/CMakeLists.txt | 22 +++++----- 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 | 30 ++++++------- test/io/vtk/CMakeLists.txt | 12 +++--- test/material/components/CMakeLists.txt | 42 +++++++++---------- .../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 | 4 +- .../facet/1p_1p/linearprofile/CMakeLists.txt | 8 ++-- .../facet/1p_1p/threedomain/CMakeLists.txt | 2 +- test/multidomain/facet/CMakeLists.txt | 20 ++++----- .../facet/tracer_tracer/CMakeLists.txt | 4 +- .../poromechanics/el1p/CMakeLists.txt | 2 +- .../poromechanics/el2p/CMakeLists.txt | 2 +- .../compressible/instationary/CMakeLists.txt | 6 +-- .../compressible/stationary/CMakeLists.txt | 6 +-- .../1p/implicit/fracture2d3d/CMakeLists.txt | 6 +-- .../1p/implicit/incompressible/CMakeLists.txt | 22 +++++----- .../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 | 4 +- .../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 +++--- .../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 ++-- .../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 +-- .../2pncmin/implicit/CMakeLists.txt | 6 +-- .../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 | 18 ++++---- .../nonisothermal/conduction/CMakeLists.txt | 4 +- .../nonisothermal/convection/CMakeLists.txt | 4 +- .../nonisothermal/evaporation/CMakeLists.txt | 4 +- .../richardsnc/implicit/CMakeLists.txt | 4 +- .../tracer/1ptracer/CMakeLists.txt | 2 +- .../tracer/constvel/CMakeLists.txt | 12 +++--- .../tracer/multicomp/CMakeLists.txt | 4 +- 113 files changed, 352 insertions(+), 352 deletions(-) diff --git a/test/common/CMakeLists.txt b/test/common/CMakeLists.txt index 6670d7e49d..9265beddf0 100644 --- a/test/common/CMakeLists.txt +++ b/test/common/CMakeLists.txt @@ -7,4 +7,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/geometry/CMakeLists.txt b/test/common/geometry/CMakeLists.txt index ac824ae957..74b4a4be14 100644 --- a/test/common/geometry/CMakeLists.txt +++ b/test/common/geometry/CMakeLists.txt @@ -1,4 +1,4 @@ -dune_add_test(SOURCES test_1d3d_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_1d3d_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 004a95c4e2..e1f2a847d7 100644 --- a/test/common/spline/CMakeLists.txt +++ b/test/common/spline/CMakeLists.txt @@ -1,2 +1,2 @@ -dune_add_test(SOURCES test_spline.cc +dumux_add_test(SOURCES test_spline.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/staggered/CMakeLists.txt b/test/discretization/staggered/CMakeLists.txt index 6543839c23..555882a498 100644 --- a/test/discretization/staggered/CMakeLists.txt +++ b/test/discretization/staggered/CMakeLists.txt @@ -1,7 +1,7 @@ -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 0d009f0ba1..b023ee3f42 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 SOURCES main.cc LABELS freeflow CMAKE_GUARD HAVE_UMFPACK diff --git a/test/freeflow/navierstokes/channel/1d/CMakeLists.txt b/test/freeflow/navierstokes/channel/1d/CMakeLists.txt index 039eab0b43..2bd33df78e 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 SOURCES main.cc LABELS freeflow CMAKE_GUARD HAVE_UMFPACK diff --git a/test/freeflow/navierstokes/channel/2d/CMakeLists.txt b/test/freeflow/navierstokes/channel/2d/CMakeLists.txt index cdb8a2f05c..0e157337cd 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 +dumux_add_test(NAME test_ff_stokes_channel TARGET test_ff_channel LABELS freeflow CMAKE_GUARD HAVE_UMFPACK @@ -13,7 +13,7 @@ dune_add_test(NAME test_ff_stokes_channel --command "${CMAKE_CURRENT_BINARY_DIR}/test_ff_channel params.input -Problem.Name test_ff_stokes_channel") -dune_add_test(NAME test_ff_navierstokes_channel +dumux_add_test(NAME test_ff_navierstokes_channel TARGET test_ff_channel LABELS freeflow CMAKE_GUARD HAVE_UMFPACK @@ -28,7 +28,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 CMAKE_GUARD HAVE_UMFPACK @@ -39,7 +39,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 CMAKE_GUARD HAVE_UMFPACK diff --git a/test/freeflow/navierstokes/channel/3d/CMakeLists.txt b/test/freeflow/navierstokes/channel/3d/CMakeLists.txt index 771f84986b..08d90e4539 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 SOURCES main.cc LABELS freeflow COMPILE_DEFINITIONS DIM_3D=1 @@ -11,7 +11,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 SOURCES main.cc LABELS freeflow COMPILE_DEFINITIONS DIM_3D=0 diff --git a/test/freeflow/navierstokes/closedsystem/CMakeLists.txt b/test/freeflow/navierstokes/closedsystem/CMakeLists.txt index bfc3911a00..67045179af 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 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 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 CMAKE_GUARD HAVE_UMFPACK diff --git a/test/freeflow/navierstokes/donea/CMakeLists.txt b/test/freeflow/navierstokes/donea/CMakeLists.txt index 2e96fd605a..d699cf015a 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 SOURCES main.cc LABELS freeflow 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 SOURCES main.cc LABELS freeflow CMAKE_GUARD HAVE_UMFPACK diff --git a/test/freeflow/navierstokes/kovasznay/CMakeLists.txt b/test/freeflow/navierstokes/kovasznay/CMakeLists.txt index 01b5e3b1ad..1b20fbc248 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 SOURCES main.cc LABELS freeflow CMAKE_GUARD HAVE_UMFPACK diff --git a/test/freeflow/navierstokesnc/channel/CMakeLists.txt b/test/freeflow/navierstokesnc/channel/CMakeLists.txt index 379fa0066a..5e56736253 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 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 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 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 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 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 CMAKE_GUARD HAVE_UMFPACK diff --git a/test/freeflow/navierstokesnc/densitydrivenflow/CMakeLists.txt b/test/freeflow/navierstokesnc/densitydrivenflow/CMakeLists.txt index 62574cdd45..1dc07d3505 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 SOURCES main.cc LABELS freeflow CMAKE_GUARD HAVE_UMFPACK diff --git a/test/freeflow/navierstokesnc/maxwellstefan/CMakeLists.txt b/test/freeflow/navierstokesnc/maxwellstefan/CMakeLists.txt index ea08a973d6..360ecad72c 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 SOURCES main.cc LABELS freeflow CMAKE_GUARD HAVE_UMFPACK diff --git a/test/freeflow/rans/CMakeLists.txt b/test/freeflow/rans/CMakeLists.txt index 0f1cbb58b4..583009f537 100644 --- a/test/freeflow/rans/CMakeLists.txt +++ b/test/freeflow/rans/CMakeLists.txt @@ -4,7 +4,7 @@ dune_symlink_to_source_files(FILES laufer_re50000.csv laufer_re50000_u+y+.csv) add_executable(test_ff_rans_lauferpipe_kepsilon EXCLUDE_FROM_ALL main.cc) target_compile_definitions(test_ff_rans_lauferpipe_kepsilon PUBLIC "KEPSILON=1") -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 CMAKE_GUARD HAVE_UMFPACK COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py @@ -14,7 +14,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 CMAKE_GUARD HAVE_UMFPACK LABELS freeflow rans @@ -25,7 +25,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 LABELS freeflow rans CMAKE_GUARD HAVE_UMFPACK @@ -37,7 +37,7 @@ dune_add_test(NAME test_ff_rans_lauferpipe_lowrekepsilon -Problem.Name test_ff_rans_lauferpipe_lowrekepsilon") target_compile_definitions(test_ff_rans_lauferpipe_lowrekepsilon PUBLIC "LOWREKEPSILON=1") -dune_add_test(NAME test_ff_rans_lauferpipe_komega +dumux_add_test(NAME test_ff_rans_lauferpipe_komega SOURCES main.cc LABELS freeflow rans CMAKE_GUARD HAVE_UMFPACK @@ -49,7 +49,7 @@ dune_add_test(NAME test_ff_rans_lauferpipe_komega -Problem.Name test_ff_rans_lauferpipe_komega") target_compile_definitions(test_ff_rans_lauferpipe_komega PUBLIC "KOMEGA=1") -dune_add_test(NAME test_ff_rans_lauferpipe_oneeq +dumux_add_test(NAME test_ff_rans_lauferpipe_oneeq SOURCES main.cc LABELS freeflow rans CMAKE_GUARD HAVE_UMFPACK @@ -61,7 +61,7 @@ dune_add_test(NAME test_ff_rans_lauferpipe_oneeq -Problem.Name test_ff_rans_lauferpipe_oneeq") target_compile_definitions(test_ff_rans_lauferpipe_oneeq PUBLIC "ONEEQ=1") -dune_add_test(NAME test_ff_rans_lauferpipe_zeroeq +dumux_add_test(NAME test_ff_rans_lauferpipe_zeroeq SOURCES main.cc LABELS freeflow rans CMAKE_GUARD HAVE_UMFPACK @@ -72,7 +72,7 @@ dune_add_test(NAME test_ff_rans_lauferpipe_zeroeq --command "${CMAKE_CURRENT_BINARY_DIR}/test_ff_rans_lauferpipe_zeroeq params.input -Problem.Name test_ff_rans_lauferpipe_zeroeq") -dune_add_test(NAME test_ff_ransni_zeroeq +dumux_add_test(NAME test_ff_ransni_zeroeq SOURCES main.cc LABELS freeflow rans CMAKE_GUARD HAVE_UMFPACK diff --git a/test/freeflow/ransnc/CMakeLists.txt b/test/freeflow/ransnc/CMakeLists.txt index 2035baa933..8392c28315 100644 --- a/test/freeflow/ransnc/CMakeLists.txt +++ b/test/freeflow/ransnc/CMakeLists.txt @@ -1,6 +1,6 @@ add_input_file_links() -dune_add_test(NAME test_ff_rans2c_kepsilon +dumux_add_test(NAME test_ff_rans2c_kepsilon SOURCES main.cc LABELS freeflow rans COMPILE_ONLY CMAKE_GUARD HAVE_UMFPACK) @@ -9,7 +9,7 @@ target_compile_definitions(test_ff_rans2c_kepsilon PUBLIC "KEPSILON=1") add_executable(test_ff_rans2cni_kepsilon EXCLUDE_FROM_ALL main.cc) target_compile_definitions(test_ff_rans2cni_kepsilon PUBLIC "KEPSILON=1" "NONISOTHERMAL=1") -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 @@ -20,7 +20,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 @@ -31,13 +31,13 @@ dune_add_test(NAME test_ff_rans2cni_kepsilon_wallfunction --command "${CMAKE_CURRENT_BINARY_DIR}/test_ff_rans2cni_kepsilon params_niwallfunction.input -Problem.Name test_ff_rans2cni_kepsilon_wallfunction") -dune_add_test(NAME test_ff_rans2c_komega +dumux_add_test(NAME test_ff_rans2c_komega SOURCES main.cc LABELS freeflow rans COMPILE_ONLY CMAKE_GUARD HAVE_UMFPACK) target_compile_definitions(test_ff_rans2c_komega PUBLIC "KOMEGA=1") -dune_add_test(NAME test_ff_rans2cni_komega +dumux_add_test(NAME test_ff_rans2cni_komega SOURCES main.cc LABELS freeflow rans CMAKE_GUARD HAVE_UMFPACK @@ -50,13 +50,13 @@ dune_add_test(NAME test_ff_rans2cni_komega -Newton.TargetSteps 12") target_compile_definitions(test_ff_rans2cni_komega PUBLIC "KOMEGA=1" "NONISOTHERMAL=1") -dune_add_test(NAME test_ff_rans2c_lowrekepsilon +dumux_add_test(NAME test_ff_rans2c_lowrekepsilon SOURCES main.cc LABELS freeflow rans COMPILE_ONLY CMAKE_GUARD HAVE_UMFPACK) target_compile_definitions(test_ff_rans2c_lowrekepsilon PUBLIC "LOWREKEPSILON=1") -dune_add_test(NAME test_ff_rans2cni_lowrekepsilon +dumux_add_test(NAME test_ff_rans2cni_lowrekepsilon SOURCES main.cc LABELS freeflow rans CMAKE_GUARD HAVE_UMFPACK @@ -68,13 +68,13 @@ dune_add_test(NAME test_ff_rans2cni_lowrekepsilon -Problem.Name test_ff_rans2cni_lowrekepsilon") target_compile_definitions(test_ff_rans2cni_lowrekepsilon PUBLIC "LOWREKEPSILON=1" "NONISOTHERMAL=1") -dune_add_test(NAME test_ff_rans2c_oneeq +dumux_add_test(NAME test_ff_rans2c_oneeq SOURCES main.cc LABELS freeflow rans COMPILE_ONLY CMAKE_GUARD HAVE_UMFPACK) target_compile_definitions(test_ff_rans2c_oneeq PUBLIC "ONEEQ=1") -dune_add_test(NAME test_ff_rans2cni_oneeq +dumux_add_test(NAME test_ff_rans2cni_oneeq SOURCES main.cc LABELS freeflow rans CMAKE_GUARD HAVE_UMFPACK @@ -86,7 +86,7 @@ dune_add_test(NAME test_ff_rans2cni_oneeq -Problem.Name test_ff_rans2cni_oneeq") target_compile_definitions(test_ff_rans2cni_oneeq PUBLIC "ONEEQ=1" "NONISOTHERMAL=1") -dune_add_test(NAME test_ff_rans2c_zeroeq +dumux_add_test(NAME test_ff_rans2c_zeroeq SOURCES main.cc LABELS freeflow rans CMAKE_GUARD HAVE_UMFPACK @@ -97,7 +97,7 @@ dune_add_test(NAME test_ff_rans2c_zeroeq --command "${CMAKE_CURRENT_BINARY_DIR}/test_ff_rans2c_zeroeq params.input -Problem.Name test_ff_rans2c_zeroeq") -dune_add_test(NAME test_ff_rans2cni_zeroeq +dumux_add_test(NAME test_ff_rans2cni_zeroeq SOURCES main.cc LABELS freeflow rans CMAKE_GUARD HAVE_UMFPACK diff --git a/test/geomechanics/elastic/CMakeLists.txt b/test/geomechanics/elastic/CMakeLists.txt index a7b5a3501c..9c5dc2621f 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 SOURCES main.cc COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py CMD_ARGS --script fuzzy diff --git a/test/geomechanics/poroelastic/CMakeLists.txt b/test/geomechanics/poroelastic/CMakeLists.txt index b842bcd4e1..f576c90598 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 SOURCES main.cc COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py CMD_ARGS --script fuzzy diff --git a/test/io/container/CMakeLists.txt b/test/io/container/CMakeLists.txt index 2ce265eedc..8324c96b41 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) diff --git a/test/io/gnuplotinterface/CMakeLists.txt b/test/io/gnuplotinterface/CMakeLists.txt index 4339856ebe..2d76daf4dd 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) diff --git a/test/io/gridmanager/CMakeLists.txt b/test/io/gridmanager/CMakeLists.txt index d89013d04b..d5a24c9e27 100644 --- a/test/io/gridmanager/CMakeLists.txt +++ b/test/io/gridmanager/CMakeLists.txt @@ -3,7 +3,7 @@ dune_symlink_to_source_files(FILES grids) add_executable(test_gridmanager_cake EXCLUDE_FROM_ALL test_gridmanager_cake.cc) -dune_add_test(NAME test_gridmanager_cake_360 +dumux_add_test(NAME test_gridmanager_cake_360 TARGET test_gridmanager_cake LABELS unit CMAKE_GUARD "( dune-uggrid_FOUND OR dune-alugrid_FOUND )" @@ -15,7 +15,7 @@ dune_add_test(NAME test_gridmanager_cake_360 ${CMAKE_SOURCE_DIR}/test/references/test_gridmanager_cake_2d_360-reference.vtu ${CMAKE_CURRENT_BINARY_DIR}/cake-2d-360.vtu) -dune_add_test(NAME test_gridmanager_cake_210 +dumux_add_test(NAME test_gridmanager_cake_210 TARGET test_gridmanager_cake LABELS unit CMAKE_GUARD "( dune-uggrid_FOUND OR dune-alugrid_FOUND )" @@ -27,7 +27,7 @@ dune_add_test(NAME test_gridmanager_cake_210 ${CMAKE_SOURCE_DIR}/test/references/test_gridmanager_cake_2d_210-reference.vtu ${CMAKE_CURRENT_BINARY_DIR}/cake-2d-210.vtu) -dune_add_test(NAME test_gridmanager_subgrid +dumux_add_test(NAME test_gridmanager_subgrid SOURCES test_gridmanager_subgrid.cc LABELS unit CMAKE_GUARD dune-subgrid_FOUND @@ -44,7 +44,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 CMAKE_GUARD dune-alugrid_FOUND @@ -54,7 +54,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 CMAKE_GUARD dune-alugrid_FOUND @@ -67,7 +67,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 CMAKE_GUARD dune-uggrid_FOUND @@ -79,7 +79,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 CMAKE_GUARD dune-uggrid_FOUND @@ -92,7 +92,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 CMAKE_GUARD dune-alugrid_FOUND @@ -104,7 +104,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 CMAKE_GUARD "( dune-alugrid_FOUND AND MPI_FOUND )" @@ -119,7 +119,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 CMAKE_GUARD dune-uggrid_FOUND @@ -131,7 +131,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 CMAKE_GUARD "( dune-uggrid_FOUND AND MPI_FOUND )" @@ -146,7 +146,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 CMAKE_GUARD dune-alugrid_FOUND @@ -160,7 +160,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 CMAKE_GUARD "( dune-alugrid_FOUND AND MPI_FOUND )" @@ -177,7 +177,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 CMAKE_GUARD dune-uggrid_FOUND @@ -191,7 +191,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 CMAKE_GUARD "( dune-uggrid_FOUND AND MPI_FOUND )" diff --git a/test/io/vtk/CMakeLists.txt b/test/io/vtk/CMakeLists.txt index b4344da7ed..0104a928fd 100644 --- a/test/io/vtk/CMakeLists.txt +++ b/test/io/vtk/CMakeLists.txt @@ -1,6 +1,6 @@ add_input_file_links() -dune_add_test(NAME test_vtkreader_3d +dumux_add_test(NAME test_vtkreader_3d SOURCES test_vtkreader.cc LABELS unit CMAKE_GUARD dune-alugrid_FOUND @@ -12,12 +12,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> # EXPECT_COMPILE_FAIL) -dune_add_test(NAME test_vtkreader_2d +dumux_add_test(NAME test_vtkreader_2d SOURCES test_vtkreader.cc LABELS unit CMAKE_GUARD dune-alugrid_FOUND @@ -29,7 +29,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 CMAKE_GUARD dune-foamgrid_FOUND @@ -41,7 +41,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 CMAKE_GUARD dune-foamgrid_FOUND @@ -53,6 +53,6 @@ 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_vtk_staggeredfreeflowpvnames +dumux_add_test(NAME test_vtk_staggeredfreeflowpvnames SOURCES test_vtk_staggeredfreeflowpvnames.cc LABELS unit) diff --git a/test/material/components/CMakeLists.txt b/test/material/components/CMakeLists.txt index 682a95a382..1eb8f02b9e 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) 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) -dune_add_test(NAME plot_benzene +dumux_add_test(NAME plot_benzene TARGET plot_component COMMAND ./plot_component CMD_ARGS "Benzene" LABELS unit) -dune_add_test(NAME plot_brine +dumux_add_test(NAME plot_brine TARGET plot_component COMMAND ./plot_component CMD_ARGS "Brine" LABELS unit) -dune_add_test(NAME plot_calcite +dumux_add_test(NAME plot_calcite TARGET plot_component COMMAND ./plot_component CMD_ARGS "Calcite" LABELS unit) -dune_add_test(NAME plot_calciumion +dumux_add_test(NAME plot_calciumion TARGET plot_component COMMAND ./plot_component CMD_ARGS "CalciumIon" LABELS unit) -dune_add_test(NAME plot_cao +dumux_add_test(NAME plot_cao TARGET plot_component COMMAND ./plot_component CMD_ARGS "CaO" LABELS unit) -dune_add_test(NAME plot_cao2h2 +dumux_add_test(NAME plot_cao2h2 TARGET plot_component COMMAND ./plot_component CMD_ARGS "CaO2H2" LABELS unit) -dune_add_test(NAME plot_carbonateion +dumux_add_test(NAME plot_carbonateion TARGET plot_component COMMAND ./plot_component CMD_ARGS "CarbonateIon" LABELS unit) -dune_add_test(NAME plot_ch4 +dumux_add_test(NAME plot_ch4 TARGET plot_component COMMAND ./plot_component CMD_ARGS "CH4" LABELS unit) -dune_add_test(NAME plot_granite +dumux_add_test(NAME plot_granite TARGET plot_component COMMAND ./plot_component CMD_ARGS "Granite" LABELS unit) -dune_add_test(NAME plot_h2 +dumux_add_test(NAME plot_h2 TARGET plot_component COMMAND ./plot_component CMD_ARGS "H2" LABELS unit) -dune_add_test(NAME plot_h2o +dumux_add_test(NAME plot_h2o TARGET plot_component COMMAND ./plot_component CMD_ARGS "H2O" LABELS unit) -dune_add_test(NAME plot_heavyoil +dumux_add_test(NAME plot_heavyoil TARGET plot_component COMMAND ./plot_component CMD_ARGS "HeavyOil" LABELS unit) -dune_add_test(NAME plot_mesitylene +dumux_add_test(NAME plot_mesitylene TARGET plot_component COMMAND ./plot_component CMD_ARGS "Mesitylene" LABELS unit) -dune_add_test(NAME plot_n2 +dumux_add_test(NAME plot_n2 TARGET plot_component COMMAND ./plot_component CMD_ARGS "N2" LABELS unit) -dune_add_test(NAME plot_nacl +dumux_add_test(NAME plot_nacl TARGET plot_component COMMAND ./plot_component CMD_ARGS "NaCl" LABELS unit) -dune_add_test(NAME plot_o2 +dumux_add_test(NAME plot_o2 TARGET plot_component COMMAND ./plot_component CMD_ARGS "O2" LABELS unit) -dune_add_test(NAME plot_simpleh2o +dumux_add_test(NAME plot_simpleh2o TARGET plot_component COMMAND ./plot_component CMD_ARGS "SimpleH2O" LABELS unit) -dune_add_test(NAME plot_trichloroethene +dumux_add_test(NAME plot_trichloroethene TARGET plot_component COMMAND ./plot_component CMD_ARGS "Trichloroethene" LABELS unit) -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/fluidmatrixinteractions/2p/CMakeLists.txt b/test/material/fluidmatrixinteractions/2p/CMakeLists.txt index 0865389cb6..1398aa0a44 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 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 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 06e695f7e5..fa1b30585e 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 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 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 f471ca738f..f5a9fd1d75 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) diff --git a/test/material/immiscibleflash/CMakeLists.txt b/test/material/immiscibleflash/CMakeLists.txt index 4c955a241f..c7d6621e0b 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) diff --git a/test/material/ncpflash/CMakeLists.txt b/test/material/ncpflash/CMakeLists.txt index eb6e36a0ed..8c692bd8a5 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) diff --git a/test/material/pengrobinson/CMakeLists.txt b/test/material/pengrobinson/CMakeLists.txt index 54bfbe047b..32bd14feb0 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) diff --git a/test/material/solidsystems/CMakeLists.txt b/test/material/solidsystems/CMakeLists.txt index 5ba057cfae..60de8fdf15 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) diff --git a/test/material/tabulation/CMakeLists.txt b/test/material/tabulation/CMakeLists.txt index 554102e524..fba676f943 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) diff --git a/test/multidomain/boundary/darcydarcy/1p_1p/CMakeLists.txt b/test/multidomain/boundary/darcydarcy/1p_1p/CMakeLists.txt index d38e8c9653..59d3cbb1f7 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 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 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 9de88ef366..5016a2a470 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 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 ea50de05e3..0c02f6bf38 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 freeflow 1pnc 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 freeflow 1pnc 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 freeflow 1pnc 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 2ef7d1d187..576f496c7d 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 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 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 5079e4eced..501e403a8f 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 freeflow 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 freeflow 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 f668fd1c3f..d9b829fdc2 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 freeflow 1pnc 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 021f50dad7..edc80c5167 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 freeflow 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 freeflow 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 5dc4a86091..cd048af1db 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 freeflow 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 4a0d836504..14fea425f2 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 1pnc 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 cba840d801..e601e2d087 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 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 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 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 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 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 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 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 77b3b06fb7..33c5e46cf3 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 SOURCES main.cc COMPILE_DEFINITIONS SOILTYPETAG=SoilCC @@ -12,7 +12,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 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 e099e92981..bdd72367bc 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 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 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 1411b11f98..752c69210e 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 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 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 50a1bded8f..4597b4bbc7 100644 --- a/test/multidomain/facet/1p_1p/gravity/CMakeLists.txt +++ b/test/multidomain/facet/1p_1p/gravity/CMakeLists.txt @@ -8,7 +8,7 @@ target_compile_definitions(test_md_facet_1p1p_gravity_tpfa 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 CMAKE_GUARD "( dune-foamgrid_FOUND AND dune-alugrid_FOUND )" TARGET test_md_facet_1p1p_gravity_tpfa @@ -20,7 +20,7 @@ dune_add_test(NAME test_md_facet_1p1p_gravity_xi1_tpfa ${CMAKE_CURRENT_BINARY_DIR}/test_md_facet_1p1p_gravity_xi1_lowdim-00001.vtp --command "${CMAKE_CURRENT_BINARY_DIR}/test_md_facet_1p1p_gravity_tpfa params.input") -dune_add_test(NAME test_facet_1p1p_gravity_xi066_tpfa +dumux_add_test(NAME test_facet_1p1p_gravity_xi066_tpfa LABELS multidomain CMAKE_GUARD "( dune-foamgrid_FOUND AND dune-alugrid_FOUND )" TARGET test_md_facet_1p1p_gravity_tpfa diff --git a/test/multidomain/facet/1p_1p/linearprofile/CMakeLists.txt b/test/multidomain/facet/1p_1p/linearprofile/CMakeLists.txt index 251a1dc764..b9444eb94c 100644 --- a/test/multidomain/facet/1p_1p/linearprofile/CMakeLists.txt +++ b/test/multidomain/facet/1p_1p/linearprofile/CMakeLists.txt @@ -14,7 +14,7 @@ target_compile_definitions(test_md_facet_1p1p_linearprofile_surface_tpfa 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 CMAKE_GUARD "( dune-foamgrid_FOUND AND dune-alugrid_FOUND )" TARGET test_md_facet_1p1p_linearprofile_tpfa @@ -26,7 +26,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 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_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 CMAKE_GUARD "( dune-foamgrid_FOUND AND dune-alugrid_FOUND )" TARGET test_md_facet_1p1p_linearprofile_surface_tpfa @@ -53,7 +53,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_surface_xi066_tpfa +dumux_add_test(NAME test_md_facet_1p1p_linearprofile_surface_xi066_tpfa LABELS multidomain CMAKE_GUARD "( dune-foamgrid_FOUND AND dune-alugrid_FOUND )" TARGET test_md_facet_1p1p_linearprofile_surface_tpfa diff --git a/test/multidomain/facet/1p_1p/threedomain/CMakeLists.txt b/test/multidomain/facet/1p_1p/threedomain/CMakeLists.txt index 5485864944..79d8d61100 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 SOURCES main.cc CMAKE_GUARD "( dune-foamgrid_FOUND AND dune-alugrid_FOUND )" diff --git a/test/multidomain/facet/CMakeLists.txt b/test/multidomain/facet/CMakeLists.txt index fab4a712a6..0666ac5239 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 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 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 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 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_box_alu +dumux_add_test(NAME test_facetcouplingmapper_box_alu LABELS multidomain 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_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 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_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 CMAKE_GUARD "( dune-foamgrid_FOUND AND dune-alugrid_FOUND )" COMPILE_DEFINITIONS BULKGRIDTYPE=Dune::ALUGrid<2,2,Dune::simplex,Dune::conforming> @@ -61,7 +61,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 CMAKE_GUARD "( dune-foamgrid_FOUND AND dune-uggrid_FOUND )" COMPILE_DEFINITIONS BULKGRIDTYPE=Dune::UGGrid<2> @@ -69,7 +69,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 CMAKE_GUARD "( dune-foamgrid_FOUND AND dune-alugrid_FOUND )" COMPILE_DEFINITIONS BULKGRIDTYPE=Dune::ALUGrid<3,3,Dune::simplex,Dune::conforming> @@ -78,7 +78,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 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 7a47170bd1..e85abb8d0b 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 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_box +dumux_add_test(NAME test_md_facet_tracertracer_box LABELS multidomain SOURCES main.cc COMPILE_DEFINITIONS ONEPBULKTYPETAG=OnePBulkBox diff --git a/test/multidomain/poromechanics/el1p/CMakeLists.txt b/test/multidomain/poromechanics/el1p/CMakeLists.txt index 254d68d1e3..c2f6e9bc05 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 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 840e147da8..df4c00b951 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 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 16854c65f4..1f885d06d7 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 SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=OnePCompressibleTpfa COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py @@ -10,7 +10,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 SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=OnePCompressibleMpfa COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py @@ -19,7 +19,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 SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=OnePCompressibleBox COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py diff --git a/test/porousmediumflow/1p/implicit/compressible/stationary/CMakeLists.txt b/test/porousmediumflow/1p/implicit/compressible/stationary/CMakeLists.txt index 360552bfdb..18829d9261 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 SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=OnePCompressibleTpfa COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py @@ -10,7 +10,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 SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=OnePCompressibleMpfa COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py @@ -19,7 +19,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 SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=OnePCompressibleBox COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py diff --git a/test/porousmediumflow/1p/implicit/fracture2d3d/CMakeLists.txt b/test/porousmediumflow/1p/implicit/fracture2d3d/CMakeLists.txt index af08a1590a..a2e7093fe5 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 SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=FractureBox CMAKE_GUARD dune-foamgrid_FOUND @@ -13,7 +13,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 SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=FractureCCTpfa CMAKE_GUARD dune-foamgrid_FOUND @@ -23,7 +23,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 SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=FractureCCMpfa CMAKE_GUARD dune-foamgrid_FOUND diff --git a/test/porousmediumflow/1p/implicit/incompressible/CMakeLists.txt b/test/porousmediumflow/1p/implicit/incompressible/CMakeLists.txt index 793b31ac32..fa40b6a19f 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 COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py CMD_ARGS --script fuzzy @@ -23,7 +23,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 SOURCES main.cc CMAKE_GUARD HAVE_QUAD COMPILE_DEFINITIONS TYPETAG=OnePIncompressibleTpfaQuad NUMDIFFMETHOD=DiffMethod::analytic @@ -35,7 +35,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 COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py CMD_ARGS --script fuzzy @@ -46,7 +46,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 COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py CMD_ARGS --script fuzzy @@ -55,7 +55,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 SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=OnePIncompressibleTpfa NUMDIFFMETHOD=DiffMethod::numeric COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py @@ -67,7 +67,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 SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=OnePIncompressibleBox NUMDIFFMETHOD=DiffMethod::numeric COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py @@ -79,7 +79,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 COMMAND ./test_1p_incompressible_tpfa_anadiff CMD_ARGS params.input -Problem.Name test_1p_incompressible_tpfa_extrude @@ -89,7 +89,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 COMMAND ./test_1p_incompressible_mpfa_anadiff CMD_ARGS params.input -Problem.Name test_1p_incompressible_mpfa_extrude @@ -99,7 +99,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 COMMAND ./test_1p_incompressible_box_anadiff CMD_ARGS params.input -Problem.Name test_1p_incompressible_box_extrude @@ -109,7 +109,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 SOURCES main.cc CMAKE_GUARD dune-uggrid_FOUND COMPILE_DEFINITIONS GRIDTYPE=Dune::UGGrid<2> @@ -123,7 +123,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 SOURCES main.cc CMAKE_GUARD dune-uggrid_FOUND COMPILE_DEFINITIONS GRIDTYPE=Dune::UGGrid<2> diff --git a/test/porousmediumflow/1p/implicit/isothermal/CMakeLists.txt b/test/porousmediumflow/1p/implicit/isothermal/CMakeLists.txt index d128954ef7..8e0abe8c84 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 SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=OnePTestCCTpfa COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py @@ -12,7 +12,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 SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=OnePTestCCMpfa COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py @@ -21,7 +21,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 SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=OnePTestBox COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py @@ -30,7 +30,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 SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=OnePTestCCTpfa FORCHHEIMER=1 COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py @@ -41,7 +41,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 SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=OnePTestCCTpfa CMAKE_GUARD HAVE_GSTAT diff --git a/test/porousmediumflow/1p/implicit/network1d3d/CMakeLists.txt b/test/porousmediumflow/1p/implicit/network1d3d/CMakeLists.txt index 12485a4167..eff5d675ed 100644 --- a/test/porousmediumflow/1p/implicit/network1d3d/CMakeLists.txt +++ b/test/porousmediumflow/1p/implicit/network1d3d/CMakeLists.txt @@ -5,14 +5,14 @@ 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 SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=TubesTestCCTpfa CMAKE_GUARD dune-foamgrid_FOUND 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 SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=TubesTestBox CMAKE_GUARD dune-foamgrid_FOUND diff --git a/test/porousmediumflow/1p/implicit/nonisothermal/CMakeLists.txt b/test/porousmediumflow/1p/implicit/nonisothermal/CMakeLists.txt index c36d8c27ac..4419f18860 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 SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=OnePNIConductionBox COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py @@ -14,7 +14,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 COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py CMD_ARGS --script fuzzy @@ -23,7 +23,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 COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py CMD_ARGS --script fuzzy @@ -35,7 +35,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 SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=OnePNIConductionCCTpfa COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py @@ -45,7 +45,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 SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=OnePNIConvectionCCTpfa COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py @@ -54,7 +54,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 SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=OnePNIConductionCCMpfa COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py diff --git a/test/porousmediumflow/1p/implicit/periodicbc/CMakeLists.txt b/test/porousmediumflow/1p/implicit/periodicbc/CMakeLists.txt index 570aadb543..40afe2fb35 100644 --- a/test/porousmediumflow/1p/implicit/periodicbc/CMakeLists.txt +++ b/test/porousmediumflow/1p/implicit/periodicbc/CMakeLists.txt @@ -1,13 +1,13 @@ 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 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 CMAKE_GUARD dune-spgrid_FOUND COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py @@ -16,7 +16,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 CMAKE_GUARD dune-spgrid_FOUND COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py @@ -26,7 +26,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 SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=OnePIncompressibleTpfa FVGEOMCACHING=true CMAKE_GUARD dune-spgrid_FOUND @@ -36,7 +36,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 SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=OnePIncompressibleBox CMAKE_GUARD dune-spgrid_FOUND diff --git a/test/porousmediumflow/1p/implicit/pointsources/timedependent/CMakeLists.txt b/test/porousmediumflow/1p/implicit/pointsources/timedependent/CMakeLists.txt index 4b775ca8cc..f36a0ac39f 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 SOURCES main.cc COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py COMPILE_DEFINITIONS TYPETAG=OnePSingularityTimeDependentCCTpfa diff --git a/test/porousmediumflow/1p/implicit/pointsources/timeindependent/CMakeLists.txt b/test/porousmediumflow/1p/implicit/pointsources/timeindependent/CMakeLists.txt index 4360055d0d..4540f7faf2 100644 --- a/test/porousmediumflow/1p/implicit/pointsources/timeindependent/CMakeLists.txt +++ b/test/porousmediumflow/1p/implicit/pointsources/timeindependent/CMakeLists.txt @@ -1,6 +1,6 @@ add_input_file_links("params.input") -dune_add_test(NAME test_1p_pointsources_timeindependent_tpfa +dumux_add_test(NAME test_1p_pointsources_timeindependent_tpfa SOURCES main.cc COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py COMPILE_DEFINITIONS TYPETAG=OnePSingularityCCTpfa @@ -9,7 +9,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 SOURCES main.cc COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py COMPILE_DEFINITIONS TYPETAG=OnePSingularityBox diff --git a/test/porousmediumflow/1p/sequential/CMakeLists.txt b/test/porousmediumflow/1p/sequential/CMakeLists.txt index 4c141e9b0c..a44d004b25 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 SOURCES test_1p.cc COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py CMD_ARGS --script fuzzy @@ -9,7 +9,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 SOURCES test_diffusion.cc COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py CMD_ARGS --script fuzzy @@ -17,7 +17,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 SOURCES test_diffusion3d.cc COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py CMD_ARGS --script fuzzy diff --git a/test/porousmediumflow/1pnc/implicit/1p2c/isothermal/CMakeLists.txt b/test/porousmediumflow/1pnc/implicit/1p2c/isothermal/CMakeLists.txt index d24a7c4264..6ab262a834 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 SOURCES main.cc LABELS 1pnc 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 SOURCES main.cc LABELS 1pnc 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 SOURCES main.cc LABELS 1pnc 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 d55b3f3ad6..7003aeac00 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 SOURCES main.cc LABELS 1pnc COMPILE_DEFINITIONS TYPETAG=SaltWaterIntrusionTest diff --git a/test/porousmediumflow/1pnc/implicit/1p2c/nonisothermal/conduction/CMakeLists.txt b/test/porousmediumflow/1pnc/implicit/1p2c/nonisothermal/conduction/CMakeLists.txt index e0ec87a645..1c64ac4b57 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 SOURCES main.cc LABELS 1pnc COMPILE_DEFINITIONS TYPETAG=OnePTwoCNIConductionBox @@ -13,7 +13,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 SOURCES main.cc LABELS 1pnc COMPILE_DEFINITIONS TYPETAG=OnePTwoCNIConductionCCTpfa @@ -24,7 +24,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 SOURCES main.cc LABELS 1pnc COMPILE_DEFINITIONS TYPETAG=OnePTwoCNIConductionCCMpfa diff --git a/test/porousmediumflow/1pnc/implicit/1p2c/nonisothermal/convection/CMakeLists.txt b/test/porousmediumflow/1pnc/implicit/1p2c/nonisothermal/convection/CMakeLists.txt index 59c631957f..d49da4a05c 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 SOURCES main.cc LABELS 1pnc COMPILE_DEFINITIONS TYPETAG=OnePTwoCNIConvectionBox @@ -13,7 +13,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 SOURCES main.cc LABELS 1pnc COMPILE_DEFINITIONS TYPETAG=OnePTwoCNIConvectionCCTpfa @@ -24,7 +24,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 SOURCES main.cc LABELS 1pnc COMPILE_DEFINITIONS TYPETAG=OnePTwoCNIConvectionCCMpfa diff --git a/test/porousmediumflow/1pnc/implicit/1p2c/nonisothermal/transientbc/CMakeLists.txt b/test/porousmediumflow/1pnc/implicit/1p2c/nonisothermal/transientbc/CMakeLists.txt index 49b26a67f8..71749316b7 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 SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=OnePTwoCNITransientBCBox ENABLECACHING=1 LABELS caching @@ -11,7 +11,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 SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=OnePTwoCNITransientBCBox ENABLECACHING=0 LABELS caching @@ -22,7 +22,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 SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=OnePTwoCNITransientBCCCTpfa ENABLECACHING=1 LABELS caching @@ -33,7 +33,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 SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=OnePTwoCNITransientBCCCTpfa ENABLECACHING=0 LABELS caching @@ -44,7 +44,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 SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=OnePTwoCNITransientBCCCMpfa ENABLECACHING=1 LABELS caching @@ -55,7 +55,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 SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=OnePTwoCNITransientBCCCMpfa ENABLECACHING=0 LABELS caching diff --git a/test/porousmediumflow/1pnc/implicit/nonequilibrium/CMakeLists.txt b/test/porousmediumflow/1pnc/implicit/nonequilibrium/CMakeLists.txt index 9e1955b124..3c57709588 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 SOURCES main.cc LABELS 1pnc COMPILE_DEFINITIONS TYPETAG=OnePTwoCThermalNonequilibriumBox @@ -13,7 +13,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 SOURCES main.cc LABELS 1pnc COMPILE_DEFINITIONS TYPETAG=OnePTwoCThermalNonequilibriumCCTpfa diff --git a/test/porousmediumflow/1pncmin/implicit/nonisothermal/CMakeLists.txt b/test/porousmediumflow/1pncmin/implicit/nonisothermal/CMakeLists.txt index bba6b2da9f..3ac2e3f038 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 SOURCES main.cc LABELS 1pnc COMPILE_DEFINITIONS TYPETAG=ThermoChemBox diff --git a/test/porousmediumflow/2p/implicit/adaptive/CMakeLists.txt b/test/porousmediumflow/2p/implicit/adaptive/CMakeLists.txt index b28dbbb996..0984b1c235 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 SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=TwoPIncompressibleAdaptiveTpfa CMAKE_GUARD dune-alugrid_FOUND @@ -14,7 +14,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 SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=TwoPAdaptivePointSource CMAKE_GUARD dune-alugrid_FOUND @@ -25,7 +25,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 SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=TwoPIncompressibleAdaptiveMpfa CMAKE_GUARD dune-alugrid_FOUND @@ -36,7 +36,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 SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=TwoPIncompressibleAdaptiveBox CMAKE_GUARD dune-uggrid_FOUND diff --git a/test/porousmediumflow/2p/implicit/boxdfm/CMakeLists.txt b/test/porousmediumflow/2p/implicit/boxdfm/CMakeLists.txt index f5d11b4864..529f50694b 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 SOURCES main.cc CMAKE_GUARD dune-alugrid_FOUND CMAKE_GUARD dune-foamgrid_FOUND @@ -14,7 +14,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 SOURCES main.cc CMAKE_GUARD dune-uggrid_FOUND CMAKE_GUARD dune-foamgrid_FOUND @@ -27,7 +27,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 SOURCES main.cc CMAKE_GUARD dune-foamgrid_FOUND CMAKE_GUARD dune-alugrid_FOUND @@ -40,7 +40,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 SOURCES main.cc CMAKE_GUARD dune-uggrid_FOUND CMAKE_GUARD dune-foamgrid_FOUND @@ -53,7 +53,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 SOURCES main.cc CMAKE_GUARD dune-foamgrid_FOUND CMAKE_GUARD dune-alugrid_FOUND @@ -66,7 +66,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 SOURCES main.cc CMAKE_GUARD dune-uggrid_FOUND CMAKE_GUARD dune-foamgrid_FOUND diff --git a/test/porousmediumflow/2p/implicit/cornerpoint/CMakeLists.txt b/test/porousmediumflow/2p/implicit/cornerpoint/CMakeLists.txt index 9396ab5c70..65e9d0b03a 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 SOURCES main.cc CMAKE_GUARD HAVE_OPM_GRID COMPILE_DEFINITIONS HAVE_ECL_INPUT=1 diff --git a/test/porousmediumflow/2p/implicit/fracture/CMakeLists.txt b/test/porousmediumflow/2p/implicit/fracture/CMakeLists.txt index 83ac13d59b..36a0e0d6f4 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 SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=FractureBox CMAKE_GUARD dune-foamgrid_FOUND @@ -11,7 +11,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 SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=FractureCCTpfa CMAKE_GUARD dune-foamgrid_FOUND @@ -21,7 +21,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 SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=FractureCCMpfa CMAKE_GUARD dune-foamgrid_FOUND @@ -32,7 +32,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 CMAKE_GUARD dune-foamgrid_FOUND COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py @@ -41,7 +41,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 CMAKE_GUARD dune-foamgrid_FOUND COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py @@ -50,7 +50,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 CMAKE_GUARD dune-foamgrid_FOUND COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py diff --git a/test/porousmediumflow/2p/implicit/incompressible/CMakeLists.txt b/test/porousmediumflow/2p/implicit/incompressible/CMakeLists.txt index 68243e324f..ad0b227b82 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 COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py CMD_ARGS --script fuzzy @@ -13,7 +13,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 COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py CMD_ARGS --script fuzzy @@ -25,7 +25,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 SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=TwoPIncompressibleBox COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py @@ -35,7 +35,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 SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=TwoPIncompressibleBox COMPILE_DEFINITIONS ENABLEINTERFACESOLVER=true @@ -48,7 +48,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 SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=TwoPIncompressibleTpfa COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py @@ -61,7 +61,7 @@ dune_add_test(NAME test_2p_incompressible_tpfa_oilwet -SpatialParams.LensIsOilWet true") # using mpfa -dune_add_test(NAME test_2p_incompressible_mpfa +dumux_add_test(NAME test_2p_incompressible_mpfa SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=TwoPIncompressibleMpfa COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py diff --git a/test/porousmediumflow/2p/implicit/nonisothermal/CMakeLists.txt b/test/porousmediumflow/2p/implicit/nonisothermal/CMakeLists.txt index d43fd41bf8..575cda7405 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 SOURCES main.cc CMAKE_GUARD dune-uggrid_FOUND COMPILE_DEFINITIONS GRIDTYPE=Dune::UGGrid<2> @@ -11,7 +11,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 SOURCES main.cc COMPILE_DEFINITIONS GRIDTYPE=Dune::YaspGrid<2> COMPILE_DEFINITIONS TYPETAG=InjectionBox2PNITypeTag @@ -21,7 +21,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 SOURCES main.cc CMAKE_GUARD dune-alugrid_FOUND COMPILE_DEFINITIONS GRIDTYPE=Dune::ALUGrid<2,2,Dune::simplex,Dune::nonconforming> @@ -32,7 +32,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 SOURCES main.cc COMPILE_DEFINITIONS GRIDTYPE=Dune::YaspGrid<2> COMPILE_DEFINITIONS TYPETAG=InjectionCC2PNITypeTag diff --git a/test/porousmediumflow/2p/sequential/CMakeLists.txt b/test/porousmediumflow/2p/sequential/CMakeLists.txt index 0d68f1fef0..7aa67ae24f 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 SOURCES test_impes.cc COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py CMD_ARGS --script fuzzy @@ -9,7 +9,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 SOURCES test_impesadaptive.cc COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py CMD_ARGS --script fuzzy @@ -17,7 +17,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 SOURCES test_impesadaptiverestart.cc COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py CMD_ARGS --script fuzzy @@ -29,7 +29,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 SOURCES test_impeswithamg.cc COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py CMD_ARGS --script fuzzy @@ -37,7 +37,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 SOURCES test_impeswithamg.cc COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py CMD_ARGS --script fuzzy @@ -46,7 +46,7 @@ else() --command "${CMAKE_CURRENT_BINARY_DIR}/test_impeswithamg") endif() -dune_add_test(NAME test_transport +dumux_add_test(NAME test_transport SOURCES test_transport.cc COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py CMD_ARGS --script fuzzy @@ -56,7 +56,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 COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py CMD_ARGS --script fuzzy @@ -64,7 +64,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 COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py CMD_ARGS --script fuzzy @@ -72,7 +72,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 COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py CMD_ARGS --script fuzzy @@ -81,7 +81,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 SOURCES test_3d2p.cc COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py CMD_ARGS --script fuzzy @@ -89,7 +89,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 SOURCES test_3d2p.cc COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py CMD_ARGS --script fuzzy @@ -97,7 +97,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 SOURCES test_3d2p.cc COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py CMD_ARGS --script fuzzy @@ -105,7 +105,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 SOURCES test_3d2p.cc COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py CMD_ARGS --script fuzzy @@ -113,7 +113,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 SOURCES test_3d2p.cc COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py CMD_ARGS --script fuzzy @@ -121,7 +121,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 SOURCES test_3d2p.cc COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py CMD_ARGS --script fuzzy diff --git a/test/porousmediumflow/2p1c/implicit/CMakeLists.txt b/test/porousmediumflow/2p1c/implicit/CMakeLists.txt index 94953d3aa0..8cda3bce6c 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 TARGET test_2p1cni_steaminjection_box COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py CMD_ARGS --script fuzzy @@ -15,7 +15,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 TARGET test_2p1cni_steaminjection_tpfa COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py CMD_ARGS --script fuzzy @@ -23,7 +23,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 TARGET test_2p1cni_steaminjection_box COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py CMD_ARGS --script fuzzy @@ -33,7 +33,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 TARGET test_2p1cni_steaminjection_tpfa COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py CMD_ARGS --script fuzzy diff --git a/test/porousmediumflow/2p2c/implicit/injection/CMakeLists.txt b/test/porousmediumflow/2p2c/implicit/injection/CMakeLists.txt index 89e4572132..6f2f49fc7c 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 SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=InjectionBox ENABLECACHING=0 COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py @@ -9,7 +9,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 COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py CMD_ARGS --script fuzzy @@ -20,7 +20,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 SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=InjectionCCTpfa ENABLECACHING=0 COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py @@ -29,7 +29,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 SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=InjectionCCMpfa ENABLECACHING=0 COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py @@ -39,7 +39,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 SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=InjectionBox ENABLECACHING=1 COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py @@ -48,7 +48,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 SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=InjectionCCTpfa ENABLECACHING=1 COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py @@ -57,7 +57,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 SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=InjectionCCMpfa ENABLECACHING=1 COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py diff --git a/test/porousmediumflow/2p2c/implicit/mpnccomparison/CMakeLists.txt b/test/porousmediumflow/2p2c/implicit/mpnccomparison/CMakeLists.txt index 72d43f7d47..3b4183a937 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 SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=TwoPTwoCComparisonBox COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py @@ -9,7 +9,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 SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=TwoPTwoCComparisonCC COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py diff --git a/test/porousmediumflow/2p2c/implicit/waterair/CMakeLists.txt b/test/porousmediumflow/2p2c/implicit/waterair/CMakeLists.txt index d0cb6a6518..c3dde8b7db 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 SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=WaterAirBox ENABLECACHING=0 COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py @@ -10,7 +10,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 TARGET test_2p2cni_waterair_box COMPILE_DEFINITIONS TYPETAG=WaterAirBox ENABLECACHING=0 COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py @@ -19,7 +19,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 SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=WaterAirCCTpfa ENABLECACHING=0 COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py diff --git a/test/porousmediumflow/2p2c/sequential/CMakeLists.txt b/test/porousmediumflow/2p2c/sequential/CMakeLists.txt index 31032eff52..7140952c29 100644 --- a/test/porousmediumflow/2p2c/sequential/CMakeLists.txt +++ b/test/porousmediumflow/2p2c/sequential/CMakeLists.txt @@ -1,6 +1,6 @@ add_input_file_links() -dune_add_test(NAME test_adaptive2p2c2d +dumux_add_test(NAME test_adaptive2p2c2d SOURCES test_adaptive2p2c2d.cc COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py CMD_ARGS --script fuzzy @@ -8,7 +8,7 @@ dune_add_test(NAME test_adaptive2p2c2d ${CMAKE_CURRENT_BINARY_DIR}/test_adaptive2p2c2d-00007.vtu --command "${CMAKE_CURRENT_BINARY_DIR}/test_adaptive2p2c2d") -dune_add_test(NAME test_adaptive2p2c3d +dumux_add_test(NAME test_adaptive2p2c3d SOURCES test_adaptive2p2c3d.cc COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py CMD_ARGS --script fuzzy @@ -16,7 +16,7 @@ dune_add_test(NAME test_adaptive2p2c3d ${CMAKE_CURRENT_BINARY_DIR}/test_adaptive2p2c3d-00011.vtu --command "${CMAKE_CURRENT_BINARY_DIR}/test_adaptive2p2c3d") -dune_add_test(NAME test_dec2p2c +dumux_add_test(NAME test_dec2p2c SOURCES test_dec2p2c.cc COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py CMD_ARGS --script fuzzy @@ -24,7 +24,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 SOURCES test_multiphysics2p2c.cc COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py CMD_ARGS --script fuzzy diff --git a/test/porousmediumflow/2pnc/implicit/diffusion/CMakeLists.txt b/test/porousmediumflow/2pnc/implicit/diffusion/CMakeLists.txt index 56227e9e2b..407fa5d726 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 SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=TwoPNCDiffusion DIFFUSIONTYPE=MaxwellStefansLaw COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py @@ -9,7 +9,7 @@ dune_add_test(NAME test_2pnc_maxwellstefan_tpfa ${CMAKE_CURRENT_BINARY_DIR}/test_2pnc_maxwellstefan_tpfa-00026.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 SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=TwoPNCDiffusion DIFFUSIONTYPE=FicksLaw COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py diff --git a/test/porousmediumflow/2pnc/implicit/fuelcell/CMakeLists.txt b/test/porousmediumflow/2pnc/implicit/fuelcell/CMakeLists.txt index 7a6d1ee8d9..af13e2f372 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 SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=FuelCellBox COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py @@ -10,7 +10,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 SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=FuelCellCCTpfa COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py @@ -20,7 +20,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 SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=FuelCellNIBox NONISOTHERMAL=1 COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py diff --git a/test/porousmediumflow/2pncmin/implicit/CMakeLists.txt b/test/porousmediumflow/2pncmin/implicit/CMakeLists.txt index 48262029e9..2aa80be26e 100644 --- a/test/porousmediumflow/2pncmin/implicit/CMakeLists.txt +++ b/test/porousmediumflow/2pncmin/implicit/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 SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=DissolutionBox COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py @@ -10,7 +10,7 @@ dune_add_test(NAME test_2pncmin_dissolution_box ${CMAKE_CURRENT_BINARY_DIR}/test_2pncmin_dissolution_box-00044.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 TARGET test_2pncmin_dissolution_box COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py CMD_ARGS --script fuzzy @@ -21,7 +21,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 SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=DissolutionCCTpfa COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py diff --git a/test/porousmediumflow/3p/implicit/conduction/CMakeLists.txt b/test/porousmediumflow/3p/implicit/conduction/CMakeLists.txt index 32b3f8168e..81594a8096 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 SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=ThreePNIConductionBox COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py @@ -10,7 +10,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 SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=ThreePNIConductionCCTpfa COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py diff --git a/test/porousmediumflow/3p/implicit/convection/CMakeLists.txt b/test/porousmediumflow/3p/implicit/convection/CMakeLists.txt index cdb45ba694..b3cfe52080 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 SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=ThreePNIConvectionBox COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py @@ -10,7 +10,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 SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=ThreePNIConvectionCCTpfa COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py diff --git a/test/porousmediumflow/3p/implicit/infiltration/CMakeLists.txt b/test/porousmediumflow/3p/implicit/infiltration/CMakeLists.txt index eb79d69c48..6044802e5d 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 SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=InfiltrationThreePBox COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py @@ -10,7 +10,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 SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=InfiltrationThreePCCTpfa COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py diff --git a/test/porousmediumflow/3p3c/implicit/columnxylol/CMakeLists.txt b/test/porousmediumflow/3p3c/implicit/columnxylol/CMakeLists.txt index a465b7dade..7d58071536 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 SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=ColumnBox COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py @@ -10,7 +10,7 @@ dune_add_test(NAME test_3p3cni_columnxylol_box ${CMAKE_CURRENT_BINARY_DIR}/test_3p3cni_columnxylol_box-00062.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 SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=ColumnCCTpfa COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py diff --git a/test/porousmediumflow/3p3c/implicit/infiltration/CMakeLists.txt b/test/porousmediumflow/3p3c/implicit/infiltration/CMakeLists.txt index 9de2bfa286..434cd2b9e5 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 SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=InfiltrationThreePThreeCBox COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py @@ -10,7 +10,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 SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=InfiltrationThreePThreeCCCTpfa COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py diff --git a/test/porousmediumflow/3p3c/implicit/kuevette/CMakeLists.txt b/test/porousmediumflow/3p3c/implicit/kuevette/CMakeLists.txt index bcb756b5c1..465375cff0 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 SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=KuevetteBox COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py @@ -9,7 +9,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 SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=KuevetteCCTpfa COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py diff --git a/test/porousmediumflow/3pwateroil/implicit/CMakeLists.txt b/test/porousmediumflow/3pwateroil/implicit/CMakeLists.txt index 5a16b6e0b4..e05068828b 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 SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=ThreePWaterOilSagdBox COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py diff --git a/test/porousmediumflow/co2/implicit/CMakeLists.txt b/test/porousmediumflow/co2/implicit/CMakeLists.txt index 84669a1a73..6c043b2b37 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 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 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 co2 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 co2 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 2b1d74df78..100eddd843 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 SOURCES main.cc LABELS mpnc 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 SOURCES main.cc LABELS mpnc COMPILE_DEFINITIONS TYPETAG=MPNCComparisonCC diff --git a/test/porousmediumflow/mpnc/implicit/kinetic/CMakeLists.txt b/test/porousmediumflow/mpnc/implicit/kinetic/CMakeLists.txt index e36c7cf9a2..e7105218b5 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 SOURCES main.cc LABELS mpnc COMPILE_DEFINITIONS TYPETAG=EvaporationAtmosphereBox diff --git a/test/porousmediumflow/mpnc/implicit/obstacle/CMakeLists.txt b/test/porousmediumflow/mpnc/implicit/obstacle/CMakeLists.txt index aed66030e9..0020acb300 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 SOURCES main.cc LABELS mpnc 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 SOURCES main.cc LABELS mpnc COMPILE_DEFINITIONS TYPETAG=ObstacleCC diff --git a/test/porousmediumflow/mpnc/implicit/thermalnonequilibrium/CMakeLists.txt b/test/porousmediumflow/mpnc/implicit/thermalnonequilibrium/CMakeLists.txt index f730d5cdfb..e4ace8feac 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 SOURCES main.cc LABELS mpnc diff --git a/test/porousmediumflow/richards/implicit/analytical/CMakeLists.txt b/test/porousmediumflow/richards/implicit/analytical/CMakeLists.txt index 95edd4df95..9ac0ea1413 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 SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=RichardsAnalyticalCC COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py diff --git a/test/porousmediumflow/richards/implicit/lens/CMakeLists.txt b/test/porousmediumflow/richards/implicit/lens/CMakeLists.txt index 4bf55b7c8d..7ca65cca29 100644 --- a/test/porousmediumflow/richards/implicit/lens/CMakeLists.txt +++ b/test/porousmediumflow/richards/implicit/lens/CMakeLists.txt @@ -7,21 +7,21 @@ target_compile_definitions(test_richards_lens_tpfa PUBLIC TYPETAG=RichardsLensCC add_executable(test_richards_lens_box EXCLUDE_FROM_ALL main.cc) target_compile_definitions(test_richards_lens_box PUBLIC TYPETAG=RichardsLensBox) -dune_add_test(TARGET test_richards_lens_box +dumux_add_test(TARGET test_richards_lens_box COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py CMD_ARGS --script fuzzy --files ${CMAKE_SOURCE_DIR}/test/references/test_richards_lens_box-reference.vtu ${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(TARGET test_richards_lens_tpfa +dumux_add_test(TARGET test_richards_lens_tpfa COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py CMD_ARGS --script fuzzy --files ${CMAKE_SOURCE_DIR}/test/references/test_richards_lens_tpfa-reference.vtu ${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_box_parallel_yasp +dumux_add_test(NAME test_richards_lens_box_parallel_yasp TARGET test_richards_lens_box CMAKE_GUARD MPI_FOUND COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py @@ -32,7 +32,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 CMAKE_GUARD MPI_FOUND COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py @@ -45,7 +45,7 @@ dune_add_test(NAME test_richards_lens_tpfa_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 CMAKE_GUARD MPI_FOUND COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py @@ -59,7 +59,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 SOURCES main.cc CMAKE_GUARD "( MPI_FOUND AND HAVE_UG )" COMPILE_DEFINITIONS TYPETAG=RichardsLensBox GRIDTYPE=Dune::UGGrid<2> @@ -69,7 +69,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 SOURCES main.cc CMAKE_GUARD "( MPI_FOUND AND HAVE_UG )" COMPILE_DEFINITIONS TYPETAG=RichardsLensCC GRIDTYPE=Dune::UGGrid<2> @@ -79,7 +79,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 SOURCES main.cc CMAKE_GUARD "( MPI_FOUND AND dune-alugrid_FOUND )" COMPILE_DEFINITIONS TYPETAG=RichardsLensBox GRIDTYPE=Dune::ALUGrid<2,2,Dune::cube,Dune::nonconforming> @@ -89,7 +89,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 SOURCES main.cc CMAKE_GUARD "( MPI_FOUND AND dune-alugrid_FOUND )" COMPILE_DEFINITIONS TYPETAG=RichardsLensCC GRIDTYPE=Dune::ALUGrid<2,2,Dune::cube,Dune::nonconforming> diff --git a/test/porousmediumflow/richards/implicit/nonisothermal/conduction/CMakeLists.txt b/test/porousmediumflow/richards/implicit/nonisothermal/conduction/CMakeLists.txt index 4852904c09..bd084b5fc3 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 SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=RichardsNIConductionBox COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py @@ -10,7 +10,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 SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=RichardsNIConductionCC COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py diff --git a/test/porousmediumflow/richards/implicit/nonisothermal/convection/CMakeLists.txt b/test/porousmediumflow/richards/implicit/nonisothermal/convection/CMakeLists.txt index 52cf0c1453..a26cde2d09 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 SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=RichardsNIConvectionBox COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py @@ -10,7 +10,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 SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=RichardsNIConvectionCC COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py diff --git a/test/porousmediumflow/richards/implicit/nonisothermal/evaporation/CMakeLists.txt b/test/porousmediumflow/richards/implicit/nonisothermal/evaporation/CMakeLists.txt index f542655f03..cd1435223c 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 SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=RichardsNIEvaporationCC COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py @@ -10,7 +10,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 SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=RichardsNIEvaporationBox COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py diff --git a/test/porousmediumflow/richardsnc/implicit/CMakeLists.txt b/test/porousmediumflow/richardsnc/implicit/CMakeLists.txt index 8bf96901bd..092e5aca24 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 SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=RichardsWellTracerBox COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py @@ -9,7 +9,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 SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=RichardsWellTracerCC 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 c0a572e5f3..60d70a5c90 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 SOURCES main.cc CMAKE_GUARD HAVE_UMFPACK COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py diff --git a/test/porousmediumflow/tracer/constvel/CMakeLists.txt b/test/porousmediumflow/tracer/constvel/CMakeLists.txt index 9f2213bc42..d89a3ff4cb 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 SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=TracerTestTpfa IMPLICIT=false USEMOLES=false CMAKE_GUARD HAVE_UMFPACK @@ -11,7 +11,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 SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=TracerTestBox IMPLICIT=false USEMOLES=false CMAKE_GUARD HAVE_UMFPACK @@ -22,7 +22,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 SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=TracerTestTpfa IMPLICIT=false USEMOLES=true CMAKE_GUARD HAVE_UMFPACK @@ -32,7 +32,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 SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=TracerTestBox IMPLICIT=false USEMOLES=true CMAKE_GUARD HAVE_UMFPACK @@ -43,7 +43,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 SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=TracerTestTpfa IMPLICIT=true USEMOLES=false CMAKE_GUARD HAVE_UMFPACK @@ -53,7 +53,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 SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=TracerTestBox IMPLICIT=true USEMOLES=false CMAKE_GUARD HAVE_UMFPACK diff --git a/test/porousmediumflow/tracer/multicomp/CMakeLists.txt b/test/porousmediumflow/tracer/multicomp/CMakeLists.txt index 4b9282be43..2b8d23c463 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 SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=MaxwellStefanTestCC COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py @@ -10,7 +10,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 SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=MaxwellStefanTestBox COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py -- GitLab From 0d91c6b24ea506a5adc7985c40134e6b2e301f3b Mon Sep 17 00:00:00 2001 From: Timo Koch Date: Wed, 30 Oct 2019 16:25:43 +0000 Subject: [PATCH 3/3] [common] Implement fallback for partial for dune 2.6.0 (cherry picked from commit 55fe98b16af5ddf3f2d9a048b16b4b3d358f423d) --- dumux/common/partial.hh | 54 +++++++++++++++++++++++++++++++++++++ test/common/test_partial.cc | 7 +++++ 2 files changed, 61 insertions(+) diff --git a/dumux/common/partial.hh b/dumux/common/partial.hh index 1dc4dbeabd..26b34d832c 100644 --- a/dumux/common/partial.hh +++ b/dumux/common/partial.hh @@ -28,9 +28,11 @@ #include #include +#include namespace Dumux { +#if DUNE_VERSION_GT_REV(DUNE_ISTL,2,6,0) /*! * \brief a function to get a MultiTypeBlockVector with references to some entries of another MultiTypeBlockVector * \param v a MultiTypeBlockVector @@ -42,6 +44,58 @@ auto partial(Dune::MultiTypeBlockVector& v, Dune::index_constant... return Dune::MultiTypeBlockVector>>>...>(v[indices]...); } +#else + +// for backwards-compatibility of partial with v2.6.0 +template +class MultiTypeBlockVectorProxy : public std::tuple +{ + typedef std::tuple ParentType; +public: + using ParentType::ParentType; + + typedef MultiTypeBlockVectorProxy type; + typedef double field_type; + + /** \brief Random-access operator + */ + template< std::size_t index > + typename std::tuple_element::type& + operator[] ( const std::integral_constant< std::size_t, index > indexVariable ) + { + DUNE_UNUSED_PARAMETER(indexVariable); + return std::get(*this); + } + + /** \brief Const random-access operator + */ + template< std::size_t index > + const typename std::tuple_element::type& + operator[] ( const std::integral_constant< std::size_t, index > indexVariable ) const + { + DUNE_UNUSED_PARAMETER(indexVariable); + return std::get(*this); + } +}; + +template struct isMultiTypeBlockVector; + +template +struct isMultiTypeBlockVector > : public std::true_type {}; + +/*! + * \brief a function to get a MultiTypeBlockVector with references to some entries of another MultiTypeBlockVector + * \param v a MultiTypeBlockVector + * \param indices the indices of the entries that should be referenced + */ +template +auto partial(Dune::MultiTypeBlockVector& v, Dune::index_constant... indices) +{ + return MultiTypeBlockVectorProxy>>>...>(v[indices]...); +} + +#endif + /*! * \brief a function to get a tuple with references to some entries of another tuple * \param v a tuple diff --git a/test/common/test_partial.cc b/test/common/test_partial.cc index f420efc90a..11ade4186b 100644 --- a/test/common/test_partial.cc +++ b/test/common/test_partial.cc @@ -12,6 +12,7 @@ #include #include +#include namespace Dumux { @@ -41,8 +42,14 @@ void runTest() auto p = partial(m, _0, _2); p = partial(m, std::make_tuple(_0, _2)); +#if DUNE_VERSION_GT_REV(DUNE_ISTL,2,6,0) if (!std::is_same, std::decay_t>::value) DUNE_THROW(Dune::Exception, "Dumux::partial() returned wrong type: " << Dune::className(p)); +#else + // for dune less or equal than v2.6.0, partial returns a std::tuple + if (!(std::is_same, std::decay_t>::value || std::is_same, std::decay_t>::value)) + DUNE_THROW(Dune::Exception, "Dumux::partial() returned wrong type: " << Dune::className(p)); +#endif std::get<1>(p)[0][0] = 5.0; -- GitLab