From 98cb25651bb87d0d09a384780302bbd5b9a7ee30 Mon Sep 17 00:00:00 2001 From: Samuel Scherrer <samuel.scherrer@iws.uni-stuttgart.de> Date: Wed, 27 Feb 2019 13:58:13 +0100 Subject: [PATCH] [tests][labels] removed discretization labels --- .../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 | 8 +++---- .../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 ++-- .../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 | 10 ++++----- .../2p1c/implicit/CMakeLists.txt | 8 +++---- .../2p2c/implicit/injection/CMakeLists.txt | 14 ++++++------ .../implicit/mpnccomparison/CMakeLists.txt | 4 ++-- .../2p2c/implicit/waterair/CMakeLists.txt | 6 ++--- .../2pnc/implicit/diffusion/CMakeLists.txt | 4 ++-- .../2pnc/implicit/fuelcell/CMakeLists.txt | 6 ++--- .../2pncmin/implicit/CMakeLists.txt | 6 ++--- 31 files changed, 115 insertions(+), 115 deletions(-) diff --git a/test/porousmediumflow/1p/implicit/compressible/instationary/CMakeLists.txt b/test/porousmediumflow/1p/implicit/compressible/instationary/CMakeLists.txt index 6b7f57041b..76426275cb 100644 --- a/test/porousmediumflow/1p/implicit/compressible/instationary/CMakeLists.txt +++ b/test/porousmediumflow/1p/implicit/compressible/instationary/CMakeLists.txt @@ -2,7 +2,7 @@ dune_symlink_to_source_files(FILES "params.input") # compressible instationary dune_add_test(NAME test_1p_compressible_instationary_tpfa - LABELS porousmediumflow 1p tpfa + LABELS porousmediumflow 1p SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=OnePCompressibleTpfa COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py @@ -12,7 +12,7 @@ dune_add_test(NAME test_1p_compressible_instationary_tpfa --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 - LABELS porousmediumflow 1p mpfa + LABELS porousmediumflow 1p SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=OnePCompressibleMpfa COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py @@ -22,7 +22,7 @@ dune_add_test(NAME test_1p_compressible_instationary_mpfa --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 - LABELS porousmediumflow 1p box + LABELS porousmediumflow 1p 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 e01c6f1a32..039a99519f 100644 --- a/test/porousmediumflow/1p/implicit/compressible/stationary/CMakeLists.txt +++ b/test/porousmediumflow/1p/implicit/compressible/stationary/CMakeLists.txt @@ -2,7 +2,7 @@ dune_symlink_to_source_files(FILES "params.input") # compressible stationary dune_add_test(NAME test_1p_compressible_stationary_tpfa - LABELS porousmediumflow 1p tpfa + LABELS porousmediumflow 1p SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=OnePCompressibleTpfa COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py @@ -12,7 +12,7 @@ dune_add_test(NAME test_1p_compressible_stationary_tpfa --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 - LABELS porousmediumflow 1p mpfa + LABELS porousmediumflow 1p SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=OnePCompressibleMpfa COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py @@ -22,7 +22,7 @@ dune_add_test(NAME test_1p_compressible_stationary_mpfa --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 - LABELS porousmediumflow 1p box + LABELS porousmediumflow 1p 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 609eef89f8..850331e529 100644 --- a/test/porousmediumflow/1p/implicit/fracture2d3d/CMakeLists.txt +++ b/test/porousmediumflow/1p/implicit/fracture2d3d/CMakeLists.txt @@ -4,7 +4,7 @@ dune_symlink_to_source_files(FILES grids) # dim < dimWorld tests with Dune::Foamgrid<2,3> dune_add_test(NAME test_1p_fracture2d3d_box - LABELS porousmediumflow 1p box + LABELS porousmediumflow 1p SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=FractureBox CMAKE_GUARD dune-foamgrid_FOUND @@ -15,7 +15,7 @@ dune_add_test(NAME test_1p_fracture2d3d_box --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 - LABELS porousmediumflow 1p tpfa + LABELS porousmediumflow 1p SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=FractureCCTpfa CMAKE_GUARD dune-foamgrid_FOUND @@ -26,7 +26,7 @@ dune_add_test(NAME test_1p_fracture2d3d_tpfa --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 - LABELS porousmediumflow 1p mpfa + LABELS porousmediumflow 1p 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 2cf1177c02..aaa60aeea5 100644 --- a/test/porousmediumflow/1p/implicit/incompressible/CMakeLists.txt +++ b/test/porousmediumflow/1p/implicit/incompressible/CMakeLists.txt @@ -16,7 +16,7 @@ target_compile_definitions(test_1p_incompressible_box_anadiff PUBLIC "TYPETAG=On # using tpfa and analytical Jacobian dune_add_test(NAME test_1p_incompressible_tpfa TARGET test_1p_incompressible_tpfa_anadiff - LABELS porousmediumflow 1p tpfa + LABELS porousmediumflow 1p COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py CMD_ARGS --script fuzzy --files ${CMAKE_SOURCE_DIR}/test/references/test_1p_cc-reference.vtu @@ -25,7 +25,7 @@ dune_add_test(NAME test_1p_incompressible_tpfa # using tpfa, analytical Jacobian and quad precision dune_add_test(NAME test_1p_incompressible_tpfa_quad - LABELS porousmediumflow 1p tpfa + LABELS porousmediumflow 1p SOURCES main.cc CMAKE_GUARD HAVE_QUAD COMPILE_DEFINITIONS TYPETAG=OnePIncompressibleTpfaQuad NUMDIFFMETHOD=DiffMethod::analytic @@ -39,7 +39,7 @@ dune_add_test(NAME test_1p_incompressible_tpfa_quad # using mpfa and analytical Jacobian dune_add_test(NAME test_1p_incompressible_mpfa TARGET test_1p_incompressible_mpfa_anadiff - LABELS porousmediumflow 1p mpfa + LABELS porousmediumflow 1p COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py CMD_ARGS --script fuzzy --files ${CMAKE_SOURCE_DIR}/test/references/test_1p_cc-reference.vtu @@ -51,7 +51,7 @@ dune_add_test(NAME test_1p_incompressible_mpfa # using box and analytical Jacobian dune_add_test(NAME test_1p_incompressible_box TARGET test_1p_incompressible_box_anadiff - LABELS porousmediumflow 1p box + LABELS porousmediumflow 1p COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py CMD_ARGS --script fuzzy --files ${CMAKE_SOURCE_DIR}/test/references/test_1p_box-reference.vtu @@ -60,7 +60,7 @@ dune_add_test(NAME test_1p_incompressible_box # using tpfa and numeric differentiation dune_add_test(NAME test_1p_incompressible_tpfa_numdiff - LABELS porousmediumflow 1p tpfa + LABELS porousmediumflow 1p SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=OnePIncompressibleTpfa NUMDIFFMETHOD=DiffMethod::numeric COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py @@ -73,7 +73,7 @@ dune_add_test(NAME test_1p_incompressible_tpfa_numdiff # using box and numeric differentiation dune_add_test(NAME test_1p_incompressible_box_numdiff - LABELS porousmediumflow 1p box + LABELS porousmediumflow 1p SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=OnePIncompressibleBox NUMDIFFMETHOD=DiffMethod::numeric COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py @@ -87,7 +87,7 @@ dune_add_test(NAME test_1p_incompressible_box_numdiff # using tpfa and analytical Jacobian with extrusion factor dune_add_test(NAME test_1p_incompressible_tpfa_extrude TARGET test_1p_incompressible_tpfa_anadiff - LABELS porousmediumflow 1p tpfa + LABELS porousmediumflow 1p COMMAND ./test_1p_incompressible_tpfa_anadiff CMD_ARGS params.input -Problem.Name test_1p_incompressible_tpfa_extrude -Problem.ExtrusionFactor 10 @@ -98,7 +98,7 @@ dune_add_test(NAME test_1p_incompressible_tpfa_extrude # using mpfa and analytical Jacobian with extrusion factor dune_add_test(NAME test_1p_incompressible_mpfa_extrude TARGET test_1p_incompressible_mpfa_anadiff - LABELS porousmediumflow 1p mpfa + LABELS porousmediumflow 1p COMMAND ./test_1p_incompressible_mpfa_anadiff CMD_ARGS params.input -Problem.Name test_1p_incompressible_mpfa_extrude -Problem.ExtrusionFactor 10 @@ -109,7 +109,7 @@ dune_add_test(NAME test_1p_incompressible_mpfa_extrude # using box and analytical Jacobian with extrusion factor dune_add_test(NAME test_1p_incompressible_box_extrude TARGET test_1p_incompressible_box_anadiff - LABELS porousmediumflow 1p box + LABELS porousmediumflow 1p COMMAND ./test_1p_incompressible_box_anadiff CMD_ARGS params.input -Problem.Name test_1p_incompressible_box_extrude -Problem.ExtrusionFactor 10 @@ -119,7 +119,7 @@ dune_add_test(NAME test_1p_incompressible_box_extrude # using box and analytical Jacobian with extrusion factor on distorted grid dune_add_test(NAME test_1p_incompressible_box_extrude_distorted - LABELS porousmediumflow 1p box + LABELS porousmediumflow 1p SOURCES main.cc CMAKE_GUARD dune-uggrid_FOUND COMPILE_DEFINITIONS GRIDTYPE=Dune::UGGrid<2> @@ -134,7 +134,7 @@ dune_add_test(NAME test_1p_incompressible_box_extrude_distorted # using mpfa and analytical Jacobian with extrusion factor on distorted grid dune_add_test(NAME test_1p_incompressible_mpfa_extrude_distorted - LABELS porousmediumflow 1p mpfa + LABELS porousmediumflow 1p 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 d5c55a28e8..da2aa7369c 100644 --- a/test/porousmediumflow/1p/implicit/isothermal/CMakeLists.txt +++ b/test/porousmediumflow/1p/implicit/isothermal/CMakeLists.txt @@ -4,7 +4,7 @@ add_gstat_file_links() # isothermal tests dune_add_test(NAME test_1p_tpfa - LABELS porousmediumflow 1p tpfa + LABELS porousmediumflow 1p SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=OnePTestCCTpfa COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py @@ -14,7 +14,7 @@ dune_add_test(NAME test_1p_tpfa --command "${CMAKE_CURRENT_BINARY_DIR}/test_1p_tpfa params.input -Problem.Name test_1p_tpfa") dune_add_test(NAME test_1p_mpfa - LABELS porousmediumflow 1p mpfa + LABELS porousmediumflow 1p SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=OnePTestCCMpfa COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py @@ -24,7 +24,7 @@ dune_add_test(NAME test_1p_mpfa --command "${CMAKE_CURRENT_BINARY_DIR}/test_1p_mpfa params.input -Problem.Name test_1p_mpfa") dune_add_test(NAME test_1p_box - LABELS porousmediumflow 1p box + LABELS porousmediumflow 1p SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=OnePTestBox COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py @@ -34,7 +34,7 @@ dune_add_test(NAME test_1p_box --command "${CMAKE_CURRENT_BINARY_DIR}/test_1p_box params.input -Problem.Name test_1p_box") dune_add_test(NAME test_1p_forchheimer_tpfa - LABELS porousmediumflow 1p tpfa + LABELS porousmediumflow 1p SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=OnePTestCCTpfa FORCHHEIMER=1 COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py diff --git a/test/porousmediumflow/1p/implicit/network1d3d/CMakeLists.txt b/test/porousmediumflow/1p/implicit/network1d3d/CMakeLists.txt index 71f2464650..abe971e90e 100644 --- a/test/porousmediumflow/1p/implicit/network1d3d/CMakeLists.txt +++ b/test/porousmediumflow/1p/implicit/network1d3d/CMakeLists.txt @@ -6,7 +6,7 @@ dune_symlink_to_source_files(FILES "convergencetest.py") # dim < dimWorld tests with Dune::Foamgrid<1,3> dune_add_test(NAME test_1p_network1d3d_tpfa - LABELS porousmediumflow 1p tpfa + LABELS porousmediumflow 1p SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=TubesTestCCTpfa CMAKE_GUARD dune-foamgrid_FOUND @@ -14,7 +14,7 @@ dune_add_test(NAME test_1p_network1d3d_tpfa CMD_ARGS test_1p_network1d3d_tpfa params.input -Problem.Name test_1p_network1d3d_tpfa) dune_add_test(NAME test_1p_network1d3d_box - LABELS porousmediumflow 1p box + LABELS porousmediumflow 1p 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 e27b232045..1f591c0699 100644 --- a/test/porousmediumflow/1p/implicit/nonisothermal/CMakeLists.txt +++ b/test/porousmediumflow/1p/implicit/nonisothermal/CMakeLists.txt @@ -2,7 +2,7 @@ add_input_file_links() # non-isothermal tests dune_add_test(NAME test_1pni_conduction_box - LABELS porousmediumflow 1p box 1pni + LABELS porousmediumflow 1p 1pni SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=OnePNIConductionBox COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py @@ -17,7 +17,7 @@ target_compile_definitions(test_1pni_convection_box PUBLIC TYPETAG=OnePNIConvect dune_add_test(NAME test_1pni_convection_box TARGET test_1pni_convection_box - LABELS porousmediumflow 1p box 1pni + LABELS porousmediumflow 1p 1pni COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py CMD_ARGS --script fuzzy --files ${CMAKE_SOURCE_DIR}/test/references/test_1pni_convection_box-reference.vtp @@ -27,7 +27,7 @@ dune_add_test(NAME test_1pni_convection_box dune_add_test(NAME test_1pni_convection_box_restart TARGET test_1pni_convection_box - LABELS porousmediumflow 1p box 1pni + LABELS porousmediumflow 1p 1pni COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py CMD_ARGS --script fuzzy --files ${CMAKE_SOURCE_DIR}/test/references/test_1pni_convection_box-reference.vtp @@ -39,7 +39,7 @@ dune_add_test(NAME test_1pni_convection_box_restart set_tests_properties(test_1pni_convection_box_restart PROPERTIES DEPENDS test_1pni_convection_box) dune_add_test(NAME test_1pni_conduction_tpfa - LABELS porousmediumflow 1p tpfa 1pni + LABELS porousmediumflow 1p 1pni SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=OnePNIConductionCCTpfa COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py @@ -50,7 +50,7 @@ dune_add_test(NAME test_1pni_conduction_tpfa --zeroThreshold {"velocity":1e-8}) dune_add_test(NAME test_1pni_convection_tpfa - LABELS porousmediumflow 1p tpfa 1pni + LABELS porousmediumflow 1p 1pni SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=OnePNIConvectionCCTpfa COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py @@ -60,7 +60,7 @@ dune_add_test(NAME test_1pni_convection_tpfa --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 - LABELS porousmediumflow 1p mpfa 1pni + LABELS porousmediumflow 1p 1pni 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 e3c876e2f0..5280467d21 100644 --- a/test/porousmediumflow/1p/implicit/periodicbc/CMakeLists.txt +++ b/test/porousmediumflow/1p/implicit/periodicbc/CMakeLists.txt @@ -2,7 +2,7 @@ dune_symlink_to_source_files(FILES "params.input" "periodic.dgf") # test using periodic boundary conditions dune_add_test(NAME test_1p_periodic_tpfa - LABELS porousmediumflow 1p tpfa + LABELS porousmediumflow 1p SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=OnePIncompressibleTpfa FVGEOMCACHING=false CMAKE_GUARD dune-spgrid_FOUND @@ -10,7 +10,7 @@ dune_add_test(NAME test_1p_periodic_tpfa dune_add_test(NAME test_1p_periodic_tpfa_sequential TARGET test_1p_periodic_tpfa - LABELS porousmediumflow 1p tpfa + LABELS porousmediumflow 1p CMAKE_GUARD dune-spgrid_FOUND COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py CMD_ARGS --script fuzzy @@ -20,7 +20,7 @@ dune_add_test(NAME test_1p_periodic_tpfa_sequential dune_add_test(NAME test_1p_periodic_tpfa_parallel TARGET test_1p_periodic_tpfa - LABELS porousmediumflow 1p tpfa + LABELS porousmediumflow 1p CMAKE_GUARD dune-spgrid_FOUND COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py CMD_ARGS --script fuzzy @@ -30,7 +30,7 @@ dune_add_test(NAME test_1p_periodic_tpfa_parallel --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 - LABELS porousmediumflow 1p tpfa + LABELS porousmediumflow 1p SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=OnePIncompressibleTpfa FVGEOMCACHING=true CMAKE_GUARD dune-spgrid_FOUND @@ -41,7 +41,7 @@ dune_add_test(NAME test_1p_periodic_tpfa_caching --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 - LABELS porousmediumflow 1p box + LABELS porousmediumflow 1p 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 a733723611..303a4a87f5 100644 --- a/test/porousmediumflow/1p/implicit/pointsources/timedependent/CMakeLists.txt +++ b/test/porousmediumflow/1p/implicit/pointsources/timedependent/CMakeLists.txt @@ -1,7 +1,7 @@ add_input_file_links("params.input") dune_add_test(NAME test_1p_pointsources_timedependent_tpfa - LABELS porousmediumflow 1p tpfa + LABELS porousmediumflow 1p 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 d9233b6988..06d7f95ddd 100644 --- a/test/porousmediumflow/1p/implicit/pointsources/timeindependent/CMakeLists.txt +++ b/test/porousmediumflow/1p/implicit/pointsources/timeindependent/CMakeLists.txt @@ -1,7 +1,7 @@ add_input_file_links("params.input") dune_add_test(NAME test_1p_pointsources_timeindependent_tpfa - LABELS porousmediumflow 1p tpfa + LABELS porousmediumflow 1p SOURCES main.cc COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py COMPILE_DEFINITIONS TYPETAG=OnePSingularityCCTpfa @@ -11,7 +11,7 @@ dune_add_test(NAME test_1p_pointsources_timeindependent_tpfa --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 - LABELS porousmediumflow 1p box + LABELS porousmediumflow 1p SOURCES main.cc COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py COMPILE_DEFINITIONS TYPETAG=OnePSingularityBox diff --git a/test/porousmediumflow/1pnc/implicit/1p2c/isothermal/CMakeLists.txt b/test/porousmediumflow/1pnc/implicit/1p2c/isothermal/CMakeLists.txt index f99512bc6e..3067934423 100644 --- a/test/porousmediumflow/1pnc/implicit/1p2c/isothermal/CMakeLists.txt +++ b/test/porousmediumflow/1pnc/implicit/1p2c/isothermal/CMakeLists.txt @@ -3,7 +3,7 @@ add_subdirectory(saltwaterintrusion) add_input_file_links() dune_add_test(NAME test_1p2c_transport_box - LABELS porousmediumflow 1p2c box + LABELS porousmediumflow 1p2c SOURCES main.cc LABELS 1pnc COMPILE_DEFINITIONS TYPETAG=OnePTwoCTestBox @@ -15,7 +15,7 @@ dune_add_test(NAME test_1p2c_transport_box --zeroThreshold {"velocity_liq \(m/s\)_1":1e-15}) dune_add_test(NAME test_1p2c_transport_tpfa - LABELS porousmediumflow 1p2c tpfa + LABELS porousmediumflow 1p2c SOURCES main.cc LABELS 1pnc COMPILE_DEFINITIONS TYPETAG=OnePTwoCTestCCTpfa @@ -27,7 +27,7 @@ dune_add_test(NAME test_1p2c_transport_tpfa --zeroThreshold {"velocity_liq \(m/s\)_1":1e-15}) dune_add_test(NAME test_1p2c_transport_mpfa - LABELS porousmediumflow 1p2c mpfa + LABELS porousmediumflow 1p2c 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 df51128b8f..421ca75729 100644 --- a/test/porousmediumflow/1pnc/implicit/1p2c/isothermal/saltwaterintrusion/CMakeLists.txt +++ b/test/porousmediumflow/1pnc/implicit/1p2c/isothermal/saltwaterintrusion/CMakeLists.txt @@ -2,7 +2,7 @@ add_input_file_links() # salt-water intrusion test using the box model dune_add_test(NAME test_1p2c_saltwaterintrusion_box - LABELS porousmediumflow 1p2c box + LABELS porousmediumflow 1p2c 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 7164a0c9c6..c1b2a48ae8 100644 --- a/test/porousmediumflow/1pnc/implicit/1p2c/nonisothermal/conduction/CMakeLists.txt +++ b/test/porousmediumflow/1pnc/implicit/1p2c/nonisothermal/conduction/CMakeLists.txt @@ -3,7 +3,7 @@ add_input_file_links() # non-isothermal tests # conduction dune_add_test(NAME test_1p2cni_conduction_box - LABELS porousmediumflow 1p2c box 1p2cni + LABELS porousmediumflow 1p2c 1p2cni SOURCES main.cc LABELS 1pnc COMPILE_DEFINITIONS TYPETAG=OnePTwoCNIConductionBox @@ -15,7 +15,7 @@ dune_add_test(NAME test_1p2cni_conduction_box --zeroThreshold {"velocity_liq \(m/s\)":1e-9}) dune_add_test(NAME test_1p2cni_conduction_tpfa - LABELS porousmediumflow 1p2c tpfa 1p2cni + LABELS porousmediumflow 1p2c 1p2cni SOURCES main.cc LABELS 1pnc COMPILE_DEFINITIONS TYPETAG=OnePTwoCNIConductionCCTpfa @@ -27,7 +27,7 @@ dune_add_test(NAME test_1p2cni_conduction_tpfa --zeroThreshold {"velocity_liq \(m/s\)_0":1e-9}) dune_add_test(NAME test_1p2cni_conduction_mpfa - LABELS porousmediumflow 1p2c mpfa 1p2cni + LABELS porousmediumflow 1p2c 1p2cni 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 b4da1c487f..04c5f32837 100644 --- a/test/porousmediumflow/1pnc/implicit/1p2c/nonisothermal/convection/CMakeLists.txt +++ b/test/porousmediumflow/1pnc/implicit/1p2c/nonisothermal/convection/CMakeLists.txt @@ -3,7 +3,7 @@ add_input_file_links() # non-isothermal tests # convection dune_add_test(NAME test_1p2cni_convection_box - LABELS porousmediumflow 1p2c box 1p2cni + LABELS porousmediumflow 1p2c 1p2cni SOURCES main.cc LABELS 1pnc COMPILE_DEFINITIONS TYPETAG=OnePTwoCNIConvectionBox @@ -15,7 +15,7 @@ dune_add_test(NAME test_1p2cni_convection_box --zeroThreshold {"velocity_liq \(m/s\)":1e-9}) dune_add_test(NAME test_1p2cni_convection_tpfa - LABELS porousmediumflow 1p2c tpfa 1p2cni + LABELS porousmediumflow 1p2c 1p2cni SOURCES main.cc LABELS 1pnc COMPILE_DEFINITIONS TYPETAG=OnePTwoCNIConvectionCCTpfa @@ -27,7 +27,7 @@ dune_add_test(NAME test_1p2cni_convection_tpfa --zeroThreshold {"velocity_liq \(m/s\)_0":1e-9}) dune_add_test(NAME test_1p2cni_convection_mpfa - LABELS porousmediumflow 1p2c mpfa 1p2cni + LABELS porousmediumflow 1p2c 1p2cni 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 d0ebb9b504..dba370d293 100644 --- a/test/porousmediumflow/1pnc/implicit/1p2c/nonisothermal/transientbc/CMakeLists.txt +++ b/test/porousmediumflow/1pnc/implicit/1p2c/nonisothermal/transientbc/CMakeLists.txt @@ -1,7 +1,7 @@ add_input_file_links() dune_add_test(NAME test_1pncni_transientbc_box_caching - LABELS porousmediumflow 1pnc box 1pncni + LABELS porousmediumflow 1pnc 1pncni SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=OnePTwoCNITransientBCBox ENABLECACHING=1 LABELS caching @@ -13,7 +13,7 @@ dune_add_test(NAME test_1pncni_transientbc_box_caching --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 - LABELS porousmediumflow 1pnc box 1pncni + LABELS porousmediumflow 1pnc 1pncni SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=OnePTwoCNITransientBCBox ENABLECACHING=0 LABELS caching @@ -25,7 +25,7 @@ dune_add_test(NAME test_1pncni_transientbc_box --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 - LABELS porousmediumflow 1pnc tpfa 1pncni + LABELS porousmediumflow 1pnc 1pncni SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=OnePTwoCNITransientBCCCTpfa ENABLECACHING=1 LABELS caching @@ -37,7 +37,7 @@ dune_add_test(NAME test_1pncni_transientbc_tpfa_caching --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 - LABELS porousmediumflow 1pnc tpfa 1pncni + LABELS porousmediumflow 1pnc 1pncni SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=OnePTwoCNITransientBCCCTpfa ENABLECACHING=0 LABELS caching @@ -49,7 +49,7 @@ dune_add_test(NAME test_1pncni_transientbc_tpfa --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 - LABELS porousmediumflow 1pnc mpfa 1pncni + LABELS porousmediumflow 1pnc 1pncni SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=OnePTwoCNITransientBCCCMpfa ENABLECACHING=1 LABELS caching @@ -61,7 +61,7 @@ dune_add_test(NAME test_1pncni_transientbc_mpfa_caching --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 - LABELS porousmediumflow 1pnc mpfa 1pncni + LABELS porousmediumflow 1pnc 1pncni 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 9c766fbde5..7086d76dc3 100644 --- a/test/porousmediumflow/1pnc/implicit/nonequilibrium/CMakeLists.txt +++ b/test/porousmediumflow/1pnc/implicit/nonequilibrium/CMakeLists.txt @@ -3,7 +3,7 @@ add_input_file_links() # non-isothermal tests # conduction dune_add_test(NAME test_1p2c_nonequilibrium_box - LABELS porousmediumflow 1p2c box + LABELS porousmediumflow 1p2c SOURCES main.cc LABELS 1pnc COMPILE_DEFINITIONS TYPETAG=OnePTwoCThermalNonequilibriumBox @@ -15,7 +15,7 @@ dune_add_test(NAME test_1p2c_nonequilibrium_box --zeroThreshold {"velocity_liq \(m/s\)_1":1e-15}) dune_add_test(NAME test_1p2c_nonequilibrium_tpfa - LABELS porousmediumflow 1p2c tpfa + LABELS porousmediumflow 1p2c 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 8d84982a0d..6aa7f7de4b 100644 --- a/test/porousmediumflow/1pncmin/implicit/nonisothermal/CMakeLists.txt +++ b/test/porousmediumflow/1pncmin/implicit/nonisothermal/CMakeLists.txt @@ -1,7 +1,7 @@ add_input_file_links() dune_add_test(NAME test_1pncminni_box - LABELS porousmediumflow 1pncmin box 1pncminni + LABELS porousmediumflow 1pncmin 1pncminni 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 5f3b28fae6..31544af406 100644 --- a/test/porousmediumflow/2p/implicit/adaptive/CMakeLists.txt +++ b/test/porousmediumflow/2p/implicit/adaptive/CMakeLists.txt @@ -4,7 +4,7 @@ dune_symlink_to_source_files(FILES "initialsolutionbox.txt") # using tpfa dune_add_test(NAME test_2p_adaptive_tpfa - LABELS porousmediumflow 2p tpfa + LABELS porousmediumflow 2p SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=TwoPIncompressibleAdaptiveTpfa CMAKE_GUARD dune-alugrid_FOUND @@ -16,7 +16,7 @@ dune_add_test(NAME test_2p_adaptive_tpfa # using tpfa and point source dune_add_test(NAME test_2p_pointsource_adaptive_tpfa - LABELS porousmediumflow 2p tpfa + LABELS porousmediumflow 2p SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=TwoPAdaptivePointSource CMAKE_GUARD dune-alugrid_FOUND @@ -28,7 +28,7 @@ dune_add_test(NAME test_2p_pointsource_adaptive_tpfa # using mpfa dune_add_test(NAME test_2p_adaptive_mpfa - LABELS porousmediumflow 2p mpfa + LABELS porousmediumflow 2p SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=TwoPIncompressibleAdaptiveMpfa CMAKE_GUARD dune-alugrid_FOUND @@ -40,7 +40,7 @@ dune_add_test(NAME test_2p_adaptive_mpfa # using box dune_add_test(NAME test_2p_adaptive_box - LABELS porousmediumflow 2p box + LABELS porousmediumflow 2p 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 80d0c6523a..b850ef4d7e 100644 --- a/test/porousmediumflow/2p/implicit/boxdfm/CMakeLists.txt +++ b/test/porousmediumflow/2p/implicit/boxdfm/CMakeLists.txt @@ -2,7 +2,7 @@ dune_symlink_to_source_files(FILES "params.input" "grids") # quadrilaterals alu grid dune_add_test(NAME test_2p_boxdfm_quads_alu - LABELS porousmediumflow 2p box + LABELS porousmediumflow 2p SOURCES main.cc CMAKE_GUARD dune-alugrid_FOUND CMAKE_GUARD dune-foamgrid_FOUND @@ -16,7 +16,7 @@ dune_add_test(NAME test_2p_boxdfm_quads_alu # quadrilaterals ug grid dune_add_test(NAME test_2p_boxdfm_quads_ug - LABELS porousmediumflow 2p box + LABELS porousmediumflow 2p SOURCES main.cc CMAKE_GUARD dune-uggrid_FOUND CMAKE_GUARD dune-foamgrid_FOUND @@ -30,7 +30,7 @@ dune_add_test(NAME test_2p_boxdfm_quads_ug # triangles alu dune_add_test(NAME test_2p_boxdfm_trias_alu - LABELS porousmediumflow 2p box + LABELS porousmediumflow 2p SOURCES main.cc CMAKE_GUARD dune-foamgrid_FOUND CMAKE_GUARD dune-alugrid_FOUND @@ -44,7 +44,7 @@ dune_add_test(NAME test_2p_boxdfm_trias_alu # triangles ug dune_add_test(NAME test_2p_boxdfm_trias_ug - LABELS porousmediumflow 2p box + LABELS porousmediumflow 2p SOURCES main.cc CMAKE_GUARD dune-uggrid_FOUND CMAKE_GUARD dune-foamgrid_FOUND @@ -58,7 +58,7 @@ dune_add_test(NAME test_2p_boxdfm_trias_ug # tetrahedra alu dune_add_test(NAME test_2p_boxdfm_tets_alu - LABELS porousmediumflow 2p box + LABELS porousmediumflow 2p SOURCES main.cc CMAKE_GUARD dune-foamgrid_FOUND CMAKE_GUARD dune-alugrid_FOUND @@ -72,7 +72,7 @@ dune_add_test(NAME test_2p_boxdfm_tets_alu # tetrahedra ug dune_add_test(NAME test_2p_boxdfm_tets_ug - LABELS porousmediumflow 2p box + LABELS porousmediumflow 2p 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 cd31eded81..3e6095f550 100644 --- a/test/porousmediumflow/2p/implicit/cornerpoint/CMakeLists.txt +++ b/test/porousmediumflow/2p/implicit/cornerpoint/CMakeLists.txt @@ -2,7 +2,7 @@ dune_symlink_to_source_files(FILES "params.input") dune_symlink_to_source_files(FILES grids) dune_add_test(NAME test_2p_cornerpoint - LABELS porousmediumflow 2p tpfa + LABELS porousmediumflow 2p 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 ab505a8b48..c4215a9d32 100644 --- a/test/porousmediumflow/2p/implicit/fracture/CMakeLists.txt +++ b/test/porousmediumflow/2p/implicit/fracture/CMakeLists.txt @@ -2,7 +2,7 @@ dune_symlink_to_source_files(FILES "params.input" "grids") # tests without gravity dune_add_test(NAME test_2p_fracture_box - LABELS porousmediumflow 2p box + LABELS porousmediumflow 2p SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=FractureBox CMAKE_GUARD dune-foamgrid_FOUND @@ -13,7 +13,7 @@ dune_add_test(NAME test_2p_fracture_box --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 - LABELS porousmediumflow 2p tpfa + LABELS porousmediumflow 2p SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=FractureCCTpfa CMAKE_GUARD dune-foamgrid_FOUND @@ -24,7 +24,7 @@ dune_add_test(NAME test_2p_fracture_tpfa --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 - LABELS porousmediumflow 2p mpfa + LABELS porousmediumflow 2p SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=FractureCCMpfa CMAKE_GUARD dune-foamgrid_FOUND @@ -37,7 +37,7 @@ dune_add_test(NAME test_2p_fracture_mpfa # tests with gravity dune_add_test(NAME test_2p_fracture_gravity_box TARGET test_2p_fracture_box - LABELS porousmediumflow 2p box + LABELS porousmediumflow 2p CMAKE_GUARD dune-foamgrid_FOUND COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py CMD_ARGS --script fuzzy @@ -47,7 +47,7 @@ dune_add_test(NAME test_2p_fracture_gravity_box dune_add_test(NAME test_2p_fracture_gravity_tpfa TARGET test_2p_fracture_tpfa - LABELS porousmediumflow 2p tpfa + LABELS porousmediumflow 2p CMAKE_GUARD dune-foamgrid_FOUND COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py CMD_ARGS --script fuzzy @@ -57,7 +57,7 @@ dune_add_test(NAME test_2p_fracture_gravity_tpfa dune_add_test(NAME test_2p_fracture_gravity_mpfa TARGET test_2p_fracture_mpfa - LABELS porousmediumflow 2p mpfa + LABELS porousmediumflow 2p CMAKE_GUARD dune-foamgrid_FOUND COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py CMD_ARGS --script fuzzy diff --git a/test/porousmediumflow/2p/implicit/incompressible/CMakeLists.txt b/test/porousmediumflow/2p/implicit/incompressible/CMakeLists.txt index b20ec650c1..9cf5b05189 100644 --- a/test/porousmediumflow/2p/implicit/incompressible/CMakeLists.txt +++ b/test/porousmediumflow/2p/implicit/incompressible/CMakeLists.txt @@ -6,7 +6,7 @@ target_compile_definitions(test_2p_incompressible_tpfa PUBLIC TYPETAG=TwoPIncomp dune_add_test(NAME test_2p_incompressible_tpfa TARGET test_2p_incompressible_tpfa - LABELS porousmediumflow 2p tpfa + LABELS porousmediumflow 2p COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py CMD_ARGS --script fuzzy --files ${CMAKE_SOURCE_DIR}/test/references/test_2p_incompressible_cc-reference.vtu @@ -16,7 +16,7 @@ dune_add_test(NAME test_2p_incompressible_tpfa # using tpfa dune_add_test(NAME test_2p_incompressible_tpfa_restart TARGET test_2p_incompressible_tpfa - LABELS porousmediumflow 2p tpfa + LABELS porousmediumflow 2p COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py CMD_ARGS --script fuzzy --files ${CMAKE_SOURCE_DIR}/test/references/test_2p_incompressible_cc-reference.vtu @@ -28,7 +28,7 @@ set_tests_properties(test_2p_incompressible_tpfa_restart PROPERTIES DEPENDS test # using box dune_add_test(NAME test_2p_incompressible_box - LABELS porousmediumflow 2p box + LABELS porousmediumflow 2p SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=TwoPIncompressibleBox COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py @@ -39,7 +39,7 @@ dune_add_test(NAME test_2p_incompressible_box # using box with interface solver dune_add_test(NAME test_2p_incompressible_box_ifsolver - LABELS porousmediumflow 2p box + LABELS porousmediumflow 2p SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=TwoPIncompressibleBox COMPILE_DEFINITIONS ENABLEINTERFACESOLVER=true @@ -53,7 +53,7 @@ dune_add_test(NAME test_2p_incompressible_box_ifsolver # using tpfa with an oil-wet lens dune_add_test(NAME test_2p_incompressible_tpfa_oilwet - LABELS porousmediumflow 2p tpfa + LABELS porousmediumflow 2p SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=TwoPIncompressibleTpfa COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py @@ -68,7 +68,7 @@ dune_add_test(NAME test_2p_incompressible_tpfa_oilwet # using mpfa dune_add_test(NAME test_2p_incompressible_mpfa - LABELS porousmediumflow 2p mpfa + LABELS porousmediumflow 2p 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 2a6c943497..e31b201261 100644 --- a/test/porousmediumflow/2p/implicit/nonisothermal/CMakeLists.txt +++ b/test/porousmediumflow/2p/implicit/nonisothermal/CMakeLists.txt @@ -1,7 +1,7 @@ dune_symlink_to_source_files(FILES "params.input") dune_add_test(NAME test_2pni_box_simplex - LABELS porousmediumflow 2p box 2pni + LABELS porousmediumflow 2p 2pni SOURCES main.cc CMAKE_GUARD dune-uggrid_FOUND COMPILE_DEFINITIONS GRIDTYPE=Dune::UGGrid<2> @@ -13,7 +13,7 @@ dune_add_test(NAME test_2pni_box_simplex --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 - LABELS porousmediumflow 2p box 2pni + LABELS porousmediumflow 2p 2pni SOURCES main.cc COMPILE_DEFINITIONS GRIDTYPE=Dune::YaspGrid<2> COMPILE_DEFINITIONS TYPETAG=InjectionBox2PNITypeTag @@ -24,7 +24,7 @@ dune_add_test(NAME test_2pni_box_cube --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 - LABELS porousmediumflow 2p tpfa 2pni + LABELS porousmediumflow 2p 2pni SOURCES main.cc CMAKE_GUARD dune-alugrid_FOUND COMPILE_DEFINITIONS GRIDTYPE=Dune::ALUGrid<2,2,Dune::simplex,Dune::nonconforming> @@ -36,7 +36,7 @@ dune_add_test(NAME test_2pni_tpfa_simplex --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 - LABELS porousmediumflow 2p tpfa 2pni + LABELS porousmediumflow 2p 2pni 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 0317e82c30..ea330edaea 100644 --- a/test/porousmediumflow/2p/sequential/CMakeLists.txt +++ b/test/porousmediumflow/2p/sequential/CMakeLists.txt @@ -64,7 +64,7 @@ dune_add_test(NAME test_transport add_executable(test_mpfa2p test_mpfa2p.cc) dune_add_test(NAME test_mpfao2p TARGET test_mpfa2p - LABELS porousmediumflow 2p mpfa + LABELS porousmediumflow 2p COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py CMD_ARGS --script fuzzy --files ${CMAKE_SOURCE_DIR}/test/references/test_mpfao2p-reference.vtu @@ -73,7 +73,7 @@ dune_add_test(NAME test_mpfao2p dune_add_test(NAME test_mpfal2p TARGET test_mpfa2p - LABELS porousmediumflow 2p mpfa + LABELS porousmediumflow 2p COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py CMD_ARGS --script fuzzy --files ${CMAKE_SOURCE_DIR}/test/references/test_mpfal2p-reference.vtu @@ -82,7 +82,7 @@ dune_add_test(NAME test_mpfal2p dune_add_test(NAME test_mpfal2padaptive TARGET test_mpfa2p - LABELS porousmediumflow 2p mpfa + LABELS porousmediumflow 2p COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py CMD_ARGS --script fuzzy --files ${CMAKE_SOURCE_DIR}/test/references/test_mpfal2padaptive-reference.vtu @@ -127,7 +127,7 @@ dune_add_test(NAME test_3d2pmimeticadaptive --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 - LABELS porousmediumflow 2p mpfa + LABELS porousmediumflow 2p SOURCES test_3d2p.cc COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py CMD_ARGS --script fuzzy @@ -136,7 +136,7 @@ dune_add_test(NAME test_3d2pmpfal --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 - LABELS porousmediumflow 2p mpfa + LABELS porousmediumflow 2p 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 d26fc68fe2..d1fd72aeef 100644 --- a/test/porousmediumflow/2p1c/implicit/CMakeLists.txt +++ b/test/porousmediumflow/2p1c/implicit/CMakeLists.txt @@ -8,7 +8,7 @@ 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 - LABELS porousmediumflow 2p1c box 2p1cni + LABELS porousmediumflow 2p1c 2p1cni TARGET test_2p1cni_steaminjection_box COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py CMD_ARGS --script fuzzy @@ -17,7 +17,7 @@ dune_add_test(NAME test_2p1cni_steaminjection_waterwet_box --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 - LABELS porousmediumflow 2p1c tpfa 2p1cni + LABELS porousmediumflow 2p1c 2p1cni TARGET test_2p1cni_steaminjection_tpfa COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py CMD_ARGS --script fuzzy @@ -26,7 +26,7 @@ dune_add_test(NAME test_2p1cni_steaminjection_waterwet_tpfa --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 - LABELS porousmediumflow 2p1c box 2p1cni + LABELS porousmediumflow 2p1c 2p1cni TARGET test_2p1cni_steaminjection_box COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py CMD_ARGS --script fuzzy @@ -37,7 +37,7 @@ dune_add_test(NAME test_2p1cni_steaminjection_gaswet_box -SpatialParams.GasWetting true") dune_add_test(NAME test_2p1cni_steaminjection_gaswet_tpfa - LABELS porousmediumflow 2p1c tpfa 2p1cni + LABELS porousmediumflow 2p1c 2p1cni 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 340ebb06ed..03a3b28168 100644 --- a/test/porousmediumflow/2p2c/implicit/injection/CMakeLists.txt +++ b/test/porousmediumflow/2p2c/implicit/injection/CMakeLists.txt @@ -1,7 +1,7 @@ add_input_file_links(FILES params.input) dune_add_test(NAME test_2p2c_injection_box - LABELS porousmediumflow 2p2c box + LABELS porousmediumflow 2p2c SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=InjectionBox ENABLECACHING=0 COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py @@ -12,7 +12,7 @@ dune_add_test(NAME test_2p2c_injection_box dune_add_test(NAME test_2p2c_injection_box_restart TARGET test_2p2c_injection_box - LABELS porousmediumflow 2p2c box + LABELS porousmediumflow 2p2c COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py CMD_ARGS --script fuzzy --files ${CMAKE_SOURCE_DIR}/test/references/test_2p2c_injection_box-reference.vtu @@ -23,7 +23,7 @@ dune_add_test(NAME test_2p2c_injection_box_restart set_tests_properties(test_2p2c_injection_box_restart PROPERTIES DEPENDS test_2p2c_injection_box) dune_add_test(NAME test_2p2c_injection_tpfa - LABELS porousmediumflow 2p2c tpfa + LABELS porousmediumflow 2p2c SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=InjectionCCTpfa ENABLECACHING=0 COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py @@ -33,7 +33,7 @@ dune_add_test(NAME test_2p2c_injection_tpfa --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 - LABELS porousmediumflow 2p2c mpfa + LABELS porousmediumflow 2p2c SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=InjectionCCMpfa ENABLECACHING=0 COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py @@ -44,7 +44,7 @@ dune_add_test(NAME test_2p2c_injection_mpfa # isothermal tests with caching dune_add_test(NAME test_2p2c_injection_box_caching - LABELS porousmediumflow 2p2c box + LABELS porousmediumflow 2p2c SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=InjectionBox ENABLECACHING=1 COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py @@ -54,7 +54,7 @@ dune_add_test(NAME test_2p2c_injection_box_caching --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 - LABELS porousmediumflow 2p2c tpfa + LABELS porousmediumflow 2p2c SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=InjectionCCTpfa ENABLECACHING=1 COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py @@ -64,7 +64,7 @@ dune_add_test(NAME test_2p2c_injection_tpfa_caching --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 - LABELS porousmediumflow 2p2c mpfa + LABELS porousmediumflow 2p2c 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 ed1e053dc0..fa0fc24558 100644 --- a/test/porousmediumflow/2p2c/implicit/mpnccomparison/CMakeLists.txt +++ b/test/porousmediumflow/2p2c/implicit/mpnccomparison/CMakeLists.txt @@ -1,7 +1,7 @@ add_input_file_links() dune_add_test(NAME test_2p2c_mpnc_comparison_box - LABELS porousmediumflow 2p2c box + LABELS porousmediumflow 2p2c SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=TwoPTwoCComparisonBox COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py @@ -11,7 +11,7 @@ dune_add_test(NAME test_2p2c_mpnc_comparison_box --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 - LABELS porousmediumflow 2p2c tpfa + LABELS porousmediumflow 2p2c 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 1a5cfc5043..dc8f9e0c5c 100644 --- a/test/porousmediumflow/2p2c/implicit/waterair/CMakeLists.txt +++ b/test/porousmediumflow/2p2c/implicit/waterair/CMakeLists.txt @@ -2,7 +2,7 @@ add_input_file_links(FILES params.input) # non-isothermal tests dune_add_test(NAME test_2p2cni_waterair_box - LABELS porousmediumflow 2p2c box 2p2cni + LABELS porousmediumflow 2p2c 2p2cni SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=WaterAirBox ENABLECACHING=0 COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py @@ -12,7 +12,7 @@ dune_add_test(NAME test_2p2cni_waterair_box --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 - LABELS porousmediumflow 2p2c box 2p2cni + LABELS porousmediumflow 2p2c 2p2cni TARGET test_2p2cni_waterair_box COMPILE_DEFINITIONS TYPETAG=WaterAirBox ENABLECACHING=0 COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py @@ -22,7 +22,7 @@ dune_add_test(NAME test_2p2cni_waterair_buoyancy_box --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 - LABELS porousmediumflow 2p2c tpfa 2p2cni + LABELS porousmediumflow 2p2c 2p2cni SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=WaterAirCCTpfa ENABLECACHING=0 COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py diff --git a/test/porousmediumflow/2pnc/implicit/diffusion/CMakeLists.txt b/test/porousmediumflow/2pnc/implicit/diffusion/CMakeLists.txt index 85136d274f..3f0687d8b8 100644 --- a/test/porousmediumflow/2pnc/implicit/diffusion/CMakeLists.txt +++ b/test/porousmediumflow/2pnc/implicit/diffusion/CMakeLists.txt @@ -1,7 +1,7 @@ dune_symlink_to_source_files(FILES params.input) dune_add_test(NAME test_2pnc_maxwellstefan_tpfa - LABELS porousmediumflow 2pnc tpfa + LABELS porousmediumflow 2pnc SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=TwoPNCDiffusion DIFFUSIONTYPE=MaxwellStefansLaw<TypeTag> COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py @@ -11,7 +11,7 @@ dune_add_test(NAME test_2pnc_maxwellstefan_tpfa --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 - LABELS porousmediumflow 2pnc tpfa + LABELS porousmediumflow 2pnc SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=TwoPNCDiffusion DIFFUSIONTYPE=FicksLaw<TypeTag> 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 5302c0442a..b5a982f5a0 100644 --- a/test/porousmediumflow/2pnc/implicit/fuelcell/CMakeLists.txt +++ b/test/porousmediumflow/2pnc/implicit/fuelcell/CMakeLists.txt @@ -2,7 +2,7 @@ dune_symlink_to_source_files(FILES params.input) # isothermal tests dune_add_test(NAME test_2pnc_fuelcell_box - LABELS porousmediumflow 2pnc box + LABELS porousmediumflow 2pnc SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=FuelCellBox COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py @@ -12,7 +12,7 @@ dune_add_test(NAME test_2pnc_fuelcell_box --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 - LABELS porousmediumflow 2pnc tpfa + LABELS porousmediumflow 2pnc SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=FuelCellCCTpfa COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py @@ -23,7 +23,7 @@ dune_add_test(NAME test_2pnc_fuelcell_tpfa dune_add_test(NAME test_2pncni_fuelcell_box - LABELS porousmediumflow 2pnc box 2pncni + LABELS porousmediumflow 2pnc 2pncni 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 eecfb536be..4b2d0333ce 100644 --- a/test/porousmediumflow/2pncmin/implicit/CMakeLists.txt +++ b/test/porousmediumflow/2pncmin/implicit/CMakeLists.txt @@ -2,7 +2,7 @@ dune_symlink_to_source_files(FILES params.input) # isothermal tests dune_add_test(NAME test_2pncmin_dissolution_box - LABELS porousmediumflow 2pncmin box + LABELS porousmediumflow 2pncmin SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=DissolutionBox COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py @@ -12,7 +12,7 @@ dune_add_test(NAME test_2pncmin_dissolution_box --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 - LABELS porousmediumflow 2pncmin box + LABELS porousmediumflow 2pncmin TARGET test_2pncmin_dissolution_box COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py CMD_ARGS --script fuzzy @@ -24,7 +24,7 @@ dune_add_test(NAME test_2pncmin_dissolution_box_restart set_tests_properties(test_2pncmin_dissolution_box_restart PROPERTIES DEPENDS test_2pncmin_dissolution_box) dune_add_test(NAME test_2pncmin_dissolution_tpfa - LABELS porousmediumflow 2pncmin tpfa + LABELS porousmediumflow 2pncmin SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=DissolutionCCTpfa COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py -- GitLab