diff --git a/test/freeflow/navierstokes/CMakeLists.txt b/test/freeflow/navierstokes/CMakeLists.txt
index f9b9bea0781b8c9052866d5d8ff4e5f0e3d915ca..70746e33d2d3b0cb5819f21fc369868f924ff776 100644
--- a/test/freeflow/navierstokes/CMakeLists.txt
+++ b/test/freeflow/navierstokes/CMakeLists.txt
@@ -1,144 +1,7 @@
-add_input_file_links()
-dune_symlink_to_source_files(FILES convergence.sh)
-set(CMAKE_BUILD_TYPE Release)
-add_executable(test_closedsystem EXCLUDE_FROM_ALL test_closedsystem.cc)
-
-dune_add_test(NAME test_navierstokes_liddrivencavity_re1
- TARGET test_closedsystem
- CMAKE_GUARD HAVE_UMFPACK
- COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
- CMD_ARGS --script fuzzy
- --files ${CMAKE_SOURCE_DIR}/test/references/liddrivencavity-low-re-reference.vtu
- ${CMAKE_CURRENT_BINARY_DIR}/test_liddrivencavity_re1-00002.vtu
- --command "${CMAKE_CURRENT_BINARY_DIR}/test_closedsystem test_liddrivencavity_re1.input")
-
-dune_add_test(NAME test_navierstokes_liddrivencavity_re1000
- TARGET test_closedsystem
- CMAKE_GUARD HAVE_UMFPACK
- COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
- CMD_ARGS --script fuzzy
- --files ${CMAKE_SOURCE_DIR}/test/references/liddrivencavity-high-re-reference.vtu
- ${CMAKE_CURRENT_BINARY_DIR}/test_liddrivencavity_re1000-00009.vtu
- --command "${CMAKE_CURRENT_BINARY_DIR}/test_closedsystem test_liddrivencavity_re1000.input")
-
-dune_add_test(NAME test_navierstokes_hydrostaticpressure
- TARGET test_closedsystem
- CMAKE_GUARD HAVE_UMFPACK
- COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
- CMD_ARGS --script fuzzy
- --files ${CMAKE_SOURCE_DIR}/test/references/stokeshydrostaticpressure-reference.vtu
- ${CMAKE_CURRENT_BINARY_DIR}/test_hydrostaticpressure-00002.vtu
- --command "${CMAKE_CURRENT_BINARY_DIR}/test_closedsystem test_hydrostaticpressure.input"
- --zeroThreshold {"velocity_liq \(m/s\)":1e-16})
-
-add_executable(test_channel EXCLUDE_FROM_ALL test_channel.cc)
-
-dune_add_test(NAME test_stokes_channel
- TARGET test_channel
- CMAKE_GUARD HAVE_UMFPACK
- COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
- CMD_ARGS --script fuzzy
- --files ${CMAKE_SOURCE_DIR}/test/references/channel-stokes.vtu
- ${CMAKE_CURRENT_BINARY_DIR}/test_channel_stokes-00002.vtu
- --command "${CMAKE_CURRENT_BINARY_DIR}/test_channel test_channel_stokes.input")
-
-dune_add_test(NAME test_navierstokes_channel
- TARGET test_channel
- CMAKE_GUARD HAVE_UMFPACK
- COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
- CMD_ARGS --script fuzzy
- --files ${CMAKE_SOURCE_DIR}/test/references/channel-navierstokes-reference.vtu
- ${CMAKE_CURRENT_BINARY_DIR}/test_channel_navierstokes-00002.vtu
- --command "${CMAKE_CURRENT_BINARY_DIR}/test_channel test_channel_navierstokes.input -Vtk.WriteFaceData 1")
-
-
-add_executable(test_channel_stokesni EXCLUDE_FROM_ALL test_channel.cc)
-target_compile_definitions(test_channel_stokesni PUBLIC "NONISOTHERMAL=1")
+add_subdirectory(donea)
+add_subdirectory(angeli)
+add_subdirectory(kovasznay)
+add_subdirectory(closedsystem)
+add_subdirectory(channel)
-dune_add_test(NAME test_channel_stokesni_convection
- TARGET test_channel_stokesni
- CMAKE_GUARD HAVE_UMFPACK
- COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
- CMD_ARGS --script fuzzy
- --files ${CMAKE_SOURCE_DIR}/test/references/stokesni-convection-reference.vtu
- ${CMAKE_CURRENT_BINARY_DIR}/test_channel_stokesni_convection-00006.vtu
- --command "${CMAKE_CURRENT_BINARY_DIR}/test_channel_stokesni test_channel_stokesni_convection.input")
-
-dune_add_test(NAME test_channel_stokesni_conduction
- TARGET test_channel_stokesni
- CMAKE_GUARD HAVE_UMFPACK
- COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
- CMD_ARGS --script fuzzy
- --files ${CMAKE_SOURCE_DIR}/test/references/stokesni-conduction-reference.vtu
- ${CMAKE_CURRENT_BINARY_DIR}/test_channel_stokesni_conduction-00004.vtu
- --command "${CMAKE_CURRENT_BINARY_DIR}/test_channel_stokesni test_channel_stokesni_conduction.input"
- --zeroThreshold {"velocity_liq \(m/s\)":1e-20})
-
-dune_add_test(NAME test_stokes_donea_no_caching
- SOURCES test_donea.cc
- CMAKE_GUARD HAVE_UMFPACK
- COMPILE_DEFINITIONS ENABLECACHING=0
- COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
- CMD_ARGS --script fuzzy
- --files ${CMAKE_SOURCE_DIR}/test/references/stokes-donea-reference.vtu
- ${CMAKE_CURRENT_BINARY_DIR}/test_donea-00001.vtu
- --command "${CMAKE_CURRENT_BINARY_DIR}/test_stokes_donea_no_caching test_stokes_donea.input")
-
-dune_add_test(NAME test_stokes_donea
- SOURCES test_donea.cc
- CMAKE_GUARD HAVE_UMFPACK
- COMPILE_DEFINITIONS ENABLECACHING=1
- COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
- CMD_ARGS --script fuzzy
- --files ${CMAKE_SOURCE_DIR}/test/references/stokes-donea-reference.vtu
- ${CMAKE_CURRENT_BINARY_DIR}/test_donea-00001.vtu
- --command "${CMAKE_CURRENT_BINARY_DIR}/test_stokes_donea")
-
-dune_add_test(NAME test_navierstokes_1d
- SOURCES test_navierstokes_1d.cc
- CMAKE_GUARD HAVE_UMFPACK
- COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
- CMD_ARGS --script fuzzy
- --files ${CMAKE_SOURCE_DIR}/test/references/test_navierstokes_1d.vtp
- ${CMAKE_CURRENT_BINARY_DIR}/test_navierstokes_1d-00001.vtp
- --command "${CMAKE_CURRENT_BINARY_DIR}/test_navierstokes_1d")
-
-dune_add_test(NAME test_navierstokes_kovasznay
- SOURCES test_kovasznay.cc
- CMAKE_GUARD HAVE_UMFPACK
- COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
- CMD_ARGS --script fuzzy
- --files ${CMAKE_SOURCE_DIR}/test/references/test_kovasznay-reference.vtu
- ${CMAKE_CURRENT_BINARY_DIR}/test_kovasznay-00001.vtu
- --command "${CMAKE_CURRENT_BINARY_DIR}/test_navierstokes_kovasznay")
-
-dune_add_test(NAME test_navierstokes_angeli
- SOURCES test_angeli.cc
- CMAKE_GUARD HAVE_UMFPACK
- COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
- CMD_ARGS --script fuzzy
- --files ${CMAKE_SOURCE_DIR}/test/references/test_angeli-reference.vtu
- ${CMAKE_CURRENT_BINARY_DIR}/test_angeli-00045.vtu
- --command "${CMAKE_CURRENT_BINARY_DIR}/test_navierstokes_angeli")
-
-dune_add_test(NAME test_stokes_channel_3d
- SOURCES test_stokes_channel_3d.cc
- COMPILE_DEFINITIONS DIM_3D=1
- CMAKE_GUARD HAVE_UMFPACK
- COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
- CMD_ARGS --script fuzzy
- --files ${CMAKE_SOURCE_DIR}/test/references/stokes_channel_3d-reference.vtu
- ${CMAKE_CURRENT_BINARY_DIR}/test_stokes_channel_3d-00001.vtu
- --command "${CMAKE_CURRENT_BINARY_DIR}/test_stokes_channel_3d"
- --zeroThreshold {"velocity_liq \(m/s\)":1e-12})
-
-dune_add_test(NAME test_stokes_channel_pseudo3d
- SOURCES test_stokes_channel_3d.cc
- COMPILE_DEFINITIONS DIM_3D=0
- CMAKE_GUARD HAVE_UMFPACK
- COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
- CMD_ARGS --script fuzzy
- --files ${CMAKE_SOURCE_DIR}/test/references/stokes_channel_pseudo3d-reference.vtu
- ${CMAKE_CURRENT_BINARY_DIR}/test_stokes_channel_pseudo3d-00001.vtu
- --command "${CMAKE_CURRENT_BINARY_DIR}/test_stokes_channel_pseudo3d"
- --zeroThreshold {"velocity_liq \(m/s\)":1e-12})
+dune_symlink_to_source_files(FILES convergence.sh)
diff --git a/test/freeflow/navierstokes/angeli/CMakeLists.txt b/test/freeflow/navierstokes/angeli/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..ca693667be5b06722f43afd62e997b9c1b77ca1b
--- /dev/null
+++ b/test/freeflow/navierstokes/angeli/CMakeLists.txt
@@ -0,0 +1,11 @@
+dune_add_test(NAME test_ff_navierstokes_angeli
+ SOURCES main.cc
+ CMAKE_GUARD HAVE_UMFPACK
+ COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
+ CMD_ARGS --script fuzzy
+ --files ${CMAKE_SOURCE_DIR}/test/references/test_ff_navierstokes_angeli-reference.vtu
+ ${CMAKE_CURRENT_BINARY_DIR}/test_ff_navierstokes_angeli-00045.vtu
+ --command "${CMAKE_CURRENT_BINARY_DIR}/test_ff_navierstokes_angeli params.input
+ -Problem.Name test_ff_navierstokes_angeli")
+
+dune_symlink_to_source_files(FILES "params.input")
diff --git a/test/freeflow/navierstokes/test_angeli.cc b/test/freeflow/navierstokes/angeli/main.cc
similarity index 99%
rename from test/freeflow/navierstokes/test_angeli.cc
rename to test/freeflow/navierstokes/angeli/main.cc
index f19351e6bb1f433cca6f6f8b5d468f290073f0c3..1d57a0002d3c019eb7668a781aea4811d1cda5c9 100644
--- a/test/freeflow/navierstokes/test_angeli.cc
+++ b/test/freeflow/navierstokes/angeli/main.cc
@@ -33,7 +33,7 @@
#include <dune/istl/io.hh>
-#include "angelitestproblem.hh"
+#include "problem.hh"
#include <dumux/common/properties.hh>
#include <dumux/common/parameters.hh>
diff --git a/test/freeflow/navierstokes/test_navierstokes_angeli.input b/test/freeflow/navierstokes/angeli/params.input
similarity index 100%
rename from test/freeflow/navierstokes/test_navierstokes_angeli.input
rename to test/freeflow/navierstokes/angeli/params.input
diff --git a/test/freeflow/navierstokes/angelitestproblem.hh b/test/freeflow/navierstokes/angeli/problem.hh
similarity index 99%
rename from test/freeflow/navierstokes/angelitestproblem.hh
rename to test/freeflow/navierstokes/angeli/problem.hh
index 2e9c8d06f3b64d8c893fa459c68f6d642a759f3d..7902c39e3972c32054210d076799424e73639253 100644
--- a/test/freeflow/navierstokes/angelitestproblem.hh
+++ b/test/freeflow/navierstokes/angeli/problem.hh
@@ -32,7 +32,7 @@
#include <dumux/freeflow/navierstokes/problem.hh>
#include <dumux/discretization/staggered/freeflow/properties.hh>
#include <dumux/freeflow/navierstokes/model.hh>
-#include "l2error.hh"
+#include "../l2error.hh"
namespace Dumux
{
diff --git a/test/freeflow/navierstokes/channel/1d/CMakeLists.txt b/test/freeflow/navierstokes/channel/1d/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..4cc81fa91ffd4c23eeb7e069a9b03544940af7d5
--- /dev/null
+++ b/test/freeflow/navierstokes/channel/1d/CMakeLists.txt
@@ -0,0 +1,10 @@
+dune_add_test(NAME test_ff_navierstokes_1d
+ SOURCES main.cc
+ CMAKE_GUARD HAVE_UMFPACK
+ COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
+ CMD_ARGS --script fuzzy
+ --files ${CMAKE_SOURCE_DIR}/test/references/test_ff_navierstokes_1d-reference.vtp
+ ${CMAKE_CURRENT_BINARY_DIR}/test_ff_navierstokes_1d-00001.vtp
+ --command "${CMAKE_CURRENT_BINARY_DIR}/test_ff_navierstokes_1d params.input
+ -Problem.Name test_ff_navierstokes_1d")
+dune_symlink_to_source_files(FILES params.input)
diff --git a/test/freeflow/navierstokes/test_navierstokes_1d.cc b/test/freeflow/navierstokes/channel/1d/main.cc
similarity index 99%
rename from test/freeflow/navierstokes/test_navierstokes_1d.cc
rename to test/freeflow/navierstokes/channel/1d/main.cc
index da8777f6de5446062a654adb0a48af35981f1ce2..3141c2c81c185857b6386698419ecf23a7f97833 100644
--- a/test/freeflow/navierstokes/test_navierstokes_1d.cc
+++ b/test/freeflow/navierstokes/channel/1d/main.cc
@@ -47,7 +47,7 @@
#include <dumux/linear/seqsolverbackend.hh>
#include <dumux/nonlinear/newtonsolver.hh>
-#include "navierstokesanalyticproblem.hh"
+#include "problem.hh"
/*!
* \brief Provides an interface for customizing error messages associated with
diff --git a/test/freeflow/navierstokes/test_navierstokes_1d.input b/test/freeflow/navierstokes/channel/1d/params.input
similarity index 100%
rename from test/freeflow/navierstokes/test_navierstokes_1d.input
rename to test/freeflow/navierstokes/channel/1d/params.input
diff --git a/test/freeflow/navierstokes/navierstokesanalyticproblem.hh b/test/freeflow/navierstokes/channel/1d/problem.hh
similarity index 99%
rename from test/freeflow/navierstokes/navierstokesanalyticproblem.hh
rename to test/freeflow/navierstokes/channel/1d/problem.hh
index 140da43a9e08151138456309677c455336bbe114..00594712bb6da7b99afc72a7d5bcd4b1574d3182 100644
--- a/test/freeflow/navierstokes/navierstokesanalyticproblem.hh
+++ b/test/freeflow/navierstokes/channel/1d/problem.hh
@@ -35,7 +35,7 @@
#include <dumux/discretization/staggered/freeflow/properties.hh>
#include <dumux/freeflow/navierstokes/model.hh>
#include <dumux/freeflow/navierstokes/problem.hh>
-#include "l2error.hh"
+#include "../../l2error.hh"
namespace Dumux
diff --git a/test/freeflow/navierstokes/channel/2d/CMakeLists.txt b/test/freeflow/navierstokes/channel/2d/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..9f86ea6d34ecb1d719b515183d35172fb07451b2
--- /dev/null
+++ b/test/freeflow/navierstokes/channel/2d/CMakeLists.txt
@@ -0,0 +1,48 @@
+dune_symlink_to_source_files(FILES "params.input" "params_navierstokes.input" "params_convection.input" "params_conduction.input")
+
+add_executable(test_ff_channel EXCLUDE_FROM_ALL main.cc)
+
+dune_add_test(NAME test_ff_stokes_channel
+ TARGET test_ff_channel
+ CMAKE_GUARD HAVE_UMFPACK
+ COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
+ CMD_ARGS --script fuzzy
+ --files ${CMAKE_SOURCE_DIR}/test/references/test_ff_stokes_channel-reference.vtu
+ ${CMAKE_CURRENT_BINARY_DIR}/test_ff_stokes_channel-00002.vtu
+ --command "${CMAKE_CURRENT_BINARY_DIR}/test_ff_channel params.input
+ -Problem.Name test_ff_stokes_channel")
+
+dune_add_test(NAME test_ff_navierstokes_channel
+ TARGET test_ff_channel
+ CMAKE_GUARD HAVE_UMFPACK
+ COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
+ CMD_ARGS --script fuzzy
+ --files ${CMAKE_SOURCE_DIR}/test/references/test_ff_navierstokes_channel-reference.vtu
+ ${CMAKE_CURRENT_BINARY_DIR}/test_ff_navierstokes_channel-00002.vtu
+ --command "${CMAKE_CURRENT_BINARY_DIR}/test_ff_channel params_navierstokes.input
+ -Vtk.WriteFaceData 1
+ -Problem.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
+ TARGET test_ff_stokesni_channel
+ CMAKE_GUARD HAVE_UMFPACK
+ COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
+ CMD_ARGS --script fuzzy
+ --files ${CMAKE_SOURCE_DIR}/test/references/test_ff_stokesni_channel_convection-reference.vtu
+ ${CMAKE_CURRENT_BINARY_DIR}/test_ff_stokesni_channel_convection-00006.vtu
+ --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
+ TARGET test_ff_stokesni_channel
+ CMAKE_GUARD HAVE_UMFPACK
+ COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
+ CMD_ARGS --script fuzzy
+ --files ${CMAKE_SOURCE_DIR}/test/references/test_ff_stokesni_channel_conduction-reference.vtu
+ ${CMAKE_CURRENT_BINARY_DIR}/test_ff_stokesni_channel_conduction-00004.vtu
+ --command "${CMAKE_CURRENT_BINARY_DIR}/test_ff_stokesni_channel params_conduction.input
+ -Problem.Name test_ff_stokesni_channel_conduction"
+ --zeroThreshold {"velocity_liq \(m/s\)":1e-20})
diff --git a/test/freeflow/navierstokes/test_channel.cc b/test/freeflow/navierstokes/channel/2d/main.cc
similarity index 99%
rename from test/freeflow/navierstokes/test_channel.cc
rename to test/freeflow/navierstokes/channel/2d/main.cc
index 78fc06c138e3b4852c5b6a5797f82b43d66bc956..bcac851cf80f680ea39aad8a9c27eea3eacf7c99 100644
--- a/test/freeflow/navierstokes/test_channel.cc
+++ b/test/freeflow/navierstokes/channel/2d/main.cc
@@ -32,7 +32,7 @@
#include <dune/grid/io/file/vtk.hh>
#include <dune/istl/io.hh>
-#include "channeltestproblem.hh"
+#include "problem.hh"
#include <dumux/common/properties.hh>
#include <dumux/common/parameters.hh>
diff --git a/test/freeflow/navierstokes/test_channel_stokes.input b/test/freeflow/navierstokes/channel/2d/params.input
similarity index 100%
rename from test/freeflow/navierstokes/test_channel_stokes.input
rename to test/freeflow/navierstokes/channel/2d/params.input
diff --git a/test/freeflow/navierstokes/test_channel_stokesni_conduction.input b/test/freeflow/navierstokes/channel/2d/params_conduction.input
similarity index 100%
rename from test/freeflow/navierstokes/test_channel_stokesni_conduction.input
rename to test/freeflow/navierstokes/channel/2d/params_conduction.input
diff --git a/test/freeflow/navierstokes/test_channel_stokesni_convection.input b/test/freeflow/navierstokes/channel/2d/params_convection.input
similarity index 100%
rename from test/freeflow/navierstokes/test_channel_stokesni_convection.input
rename to test/freeflow/navierstokes/channel/2d/params_convection.input
diff --git a/test/freeflow/navierstokes/test_channel_navierstokes.input b/test/freeflow/navierstokes/channel/2d/params_navierstokes.input
similarity index 100%
rename from test/freeflow/navierstokes/test_channel_navierstokes.input
rename to test/freeflow/navierstokes/channel/2d/params_navierstokes.input
diff --git a/test/freeflow/navierstokes/channeltestproblem.hh b/test/freeflow/navierstokes/channel/2d/problem.hh
similarity index 100%
rename from test/freeflow/navierstokes/channeltestproblem.hh
rename to test/freeflow/navierstokes/channel/2d/problem.hh
diff --git a/test/freeflow/navierstokes/channel/3d/CMakeLists.txt b/test/freeflow/navierstokes/channel/3d/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..6bda40761e6bc48228c2e1f42ad861254840e2b0
--- /dev/null
+++ b/test/freeflow/navierstokes/channel/3d/CMakeLists.txt
@@ -0,0 +1,26 @@
+dune_add_test(NAME test_ff_stokes_channel_3d
+ SOURCES main.cc
+ COMPILE_DEFINITIONS DIM_3D=1
+ CMAKE_GUARD HAVE_UMFPACK
+ COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
+ CMD_ARGS --script fuzzy
+ --files ${CMAKE_SOURCE_DIR}/test/references/test_ff_stokes_channel_3d-reference.vtu
+ ${CMAKE_CURRENT_BINARY_DIR}/test_ff_stokes_channel_3d-00001.vtu
+ --command "${CMAKE_CURRENT_BINARY_DIR}/test_ff_stokes_channel_3d params.input
+ -Problem.Name test_ff_stokes_channel_3d"
+ --zeroThreshold {"velocity_liq \(m/s\)":1e-12})
+
+dune_add_test(NAME test_ff_stokes_channel_pseudo3d
+ SOURCES main.cc
+ COMPILE_DEFINITIONS DIM_3D=0
+ CMAKE_GUARD HAVE_UMFPACK
+ COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
+ CMD_ARGS --script fuzzy
+ --files ${CMAKE_SOURCE_DIR}/test/references/test_ff_stokes_channel_pseudo3d-reference.vtu
+ ${CMAKE_CURRENT_BINARY_DIR}/test_ff_stokes_channel_pseudo3d-00001.vtu
+ --command "${CMAKE_CURRENT_BINARY_DIR}/test_ff_stokes_channel_pseudo3d params_pseudo.input
+ -Problem.Name test_ff_stokes_channel_pseudo3d"
+ --zeroThreshold {"velocity_liq \(m/s\)":1e-12})
+
+
+dune_symlink_to_source_files(FILES "params.input" "params_pseudo.input")
diff --git a/test/freeflow/navierstokes/test_stokes_channel_3d.cc b/test/freeflow/navierstokes/channel/3d/main.cc
similarity index 99%
rename from test/freeflow/navierstokes/test_stokes_channel_3d.cc
rename to test/freeflow/navierstokes/channel/3d/main.cc
index 5b9d3a0f96a8ae770302d7069fb26c2c3c82fc81..45fe8f4e0434c2c15509941c1f844bf7774f2f38 100644
--- a/test/freeflow/navierstokes/test_stokes_channel_3d.cc
+++ b/test/freeflow/navierstokes/channel/3d/main.cc
@@ -28,7 +28,7 @@
#include <dune/istl/io.hh>
-#include "stokeschannel3dproblem.hh"
+#include "problem.hh"
#include <dumux/common/properties.hh>
#include <dumux/common/parameters.hh>
diff --git a/test/freeflow/navierstokes/test_stokes_channel_3d.input b/test/freeflow/navierstokes/channel/3d/params.input
similarity index 100%
rename from test/freeflow/navierstokes/test_stokes_channel_3d.input
rename to test/freeflow/navierstokes/channel/3d/params.input
diff --git a/test/freeflow/navierstokes/test_stokes_channel_pseudo3d.input b/test/freeflow/navierstokes/channel/3d/params_pseudo.input
similarity index 100%
rename from test/freeflow/navierstokes/test_stokes_channel_pseudo3d.input
rename to test/freeflow/navierstokes/channel/3d/params_pseudo.input
diff --git a/test/freeflow/navierstokes/stokeschannel3dproblem.hh b/test/freeflow/navierstokes/channel/3d/problem.hh
similarity index 100%
rename from test/freeflow/navierstokes/stokeschannel3dproblem.hh
rename to test/freeflow/navierstokes/channel/3d/problem.hh
diff --git a/test/freeflow/navierstokes/channel/CMakeLists.txt b/test/freeflow/navierstokes/channel/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..642e957dc261af91658be8b75711c04aae476a0c
--- /dev/null
+++ b/test/freeflow/navierstokes/channel/CMakeLists.txt
@@ -0,0 +1,3 @@
+add_subdirectory(1d)
+add_subdirectory(2d)
+add_subdirectory(3d)
diff --git a/test/freeflow/navierstokes/closedsystem/CMakeLists.txt b/test/freeflow/navierstokes/closedsystem/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..e0d3d85d2f9bc706a0e67ac5068753a12f8a81fb
--- /dev/null
+++ b/test/freeflow/navierstokes/closedsystem/CMakeLists.txt
@@ -0,0 +1,34 @@
+add_executable(test_ff_navierstokes_closedsystem EXCLUDE_FROM_ALL main.cc)
+
+dune_add_test(NAME test_ff_navierstokes_closedsystem_ldc_re1
+ TARGET test_ff_navierstokes_closedsystem
+ CMAKE_GUARD HAVE_UMFPACK
+ COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
+ CMD_ARGS --script fuzzy
+ --files ${CMAKE_SOURCE_DIR}/test/references/test_ff_navierstokes_closedsystem_ldc_re1-reference.vtu
+ ${CMAKE_CURRENT_BINARY_DIR}/test_ff_navierstokes_closedsystem_ldc_re1-00002.vtu
+ --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
+ TARGET test_ff_navierstokes_closedsystem
+ CMAKE_GUARD HAVE_UMFPACK
+ COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
+ CMD_ARGS --script fuzzy
+ --files ${CMAKE_SOURCE_DIR}/test/references/test_ff_navierstokes_closedsystem_ldc_re1000-reference.vtu
+ ${CMAKE_CURRENT_BINARY_DIR}/test_ff_navierstokes_closedsystem_ldc_re1000-00009.vtu
+ --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
+ TARGET test_ff_navierstokes_closedsystem
+ CMAKE_GUARD HAVE_UMFPACK
+ COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
+ CMD_ARGS --script fuzzy
+ --files ${CMAKE_SOURCE_DIR}/test/references/test_ff_navierstokes_closedsystem_hydrostaticpressure-reference.vtu
+ ${CMAKE_CURRENT_BINARY_DIR}/test_ff_navierstokes_closedsystem_hydrostaticpressure-00002.vtu
+ --command "${CMAKE_CURRENT_BINARY_DIR}/test_ff_navierstokes_closedsystem params_hydrostaticpressure.input
+ -Problem.Name test_ff_navierstokes_closedsystem_hydrostaticpressure"
+ --zeroThreshold {"velocity_liq \(m/s\)":1e-16})
+
+dune_symlink_to_source_files(FILES "params_re1.input" "params_re1000.input" "params_hydrostaticpressure.input")
diff --git a/test/freeflow/navierstokes/test_closedsystem.cc b/test/freeflow/navierstokes/closedsystem/main.cc
similarity index 99%
rename from test/freeflow/navierstokes/test_closedsystem.cc
rename to test/freeflow/navierstokes/closedsystem/main.cc
index a006672081c120df0fbc69244535fd7078347cb7..77ca9aaa670c975d40b866ed4266969f9433a262 100644
--- a/test/freeflow/navierstokes/test_closedsystem.cc
+++ b/test/freeflow/navierstokes/closedsystem/main.cc
@@ -32,7 +32,7 @@
#include <dune/grid/io/file/vtk.hh>
#include <dune/istl/io.hh>
-#include "closedsystemtestproblem.hh"
+#include "problem.hh"
#include <dumux/common/properties.hh>
#include <dumux/common/parameters.hh>
diff --git a/test/freeflow/navierstokes/test_hydrostaticpressure.input b/test/freeflow/navierstokes/closedsystem/params_hydrostaticpressure.input
similarity index 100%
rename from test/freeflow/navierstokes/test_hydrostaticpressure.input
rename to test/freeflow/navierstokes/closedsystem/params_hydrostaticpressure.input
diff --git a/test/freeflow/navierstokes/test_liddrivencavity_re1.input b/test/freeflow/navierstokes/closedsystem/params_re1.input
similarity index 100%
rename from test/freeflow/navierstokes/test_liddrivencavity_re1.input
rename to test/freeflow/navierstokes/closedsystem/params_re1.input
diff --git a/test/freeflow/navierstokes/test_liddrivencavity_re1000.input b/test/freeflow/navierstokes/closedsystem/params_re1000.input
similarity index 100%
rename from test/freeflow/navierstokes/test_liddrivencavity_re1000.input
rename to test/freeflow/navierstokes/closedsystem/params_re1000.input
diff --git a/test/freeflow/navierstokes/closedsystemtestproblem.hh b/test/freeflow/navierstokes/closedsystem/problem.hh
similarity index 100%
rename from test/freeflow/navierstokes/closedsystemtestproblem.hh
rename to test/freeflow/navierstokes/closedsystem/problem.hh
diff --git a/test/freeflow/navierstokes/donea/CMakeLists.txt b/test/freeflow/navierstokes/donea/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..e278b9f1996751ff7d40318d60db8ab8e68bdd83
--- /dev/null
+++ b/test/freeflow/navierstokes/donea/CMakeLists.txt
@@ -0,0 +1,23 @@
+dune_add_test(NAME test_ff_stokes_donea_nocaching
+ SOURCES main.cc
+ CMAKE_GUARD HAVE_UMFPACK
+ COMPILE_DEFINITIONS ENABLECACHING=0
+ COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
+ CMD_ARGS --script fuzzy
+ --files ${CMAKE_SOURCE_DIR}/test/references/test_ff_stokes_donea-reference.vtu
+ ${CMAKE_CURRENT_BINARY_DIR}/test_ff_stokes_donea_nocaching-00001.vtu
+ --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
+ SOURCES main.cc
+ CMAKE_GUARD HAVE_UMFPACK
+ COMPILE_DEFINITIONS ENABLECACHING=1
+ COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
+ CMD_ARGS --script fuzzy
+ --files ${CMAKE_SOURCE_DIR}/test/references/test_ff_stokes_donea-reference.vtu
+ ${CMAKE_CURRENT_BINARY_DIR}/test_ff_stokes_donea-00001.vtu
+ --command "${CMAKE_CURRENT_BINARY_DIR}/test_ff_stokes_donea params.input
+ -Problem.Name test_ff_stokes_donea")
+
+dune_symlink_to_source_files(FILES "params.input")
diff --git a/test/freeflow/navierstokes/test_donea.cc b/test/freeflow/navierstokes/donea/main.cc
similarity index 99%
rename from test/freeflow/navierstokes/test_donea.cc
rename to test/freeflow/navierstokes/donea/main.cc
index fc884e315fe5c3fa4e5b4828600293a651435f3a..2ad3f9c20b63698773e16c38ff8dc92cbb6eb6c3 100644
--- a/test/freeflow/navierstokes/test_donea.cc
+++ b/test/freeflow/navierstokes/donea/main.cc
@@ -34,7 +34,7 @@
#include <dune/istl/io.hh>
-#include "doneatestproblem.hh"
+#include "problem.hh"
#include <dumux/common/properties.hh>
#include <dumux/common/parameters.hh>
diff --git a/test/freeflow/navierstokes/test_stokes_donea.input b/test/freeflow/navierstokes/donea/params.input
similarity index 100%
rename from test/freeflow/navierstokes/test_stokes_donea.input
rename to test/freeflow/navierstokes/donea/params.input
diff --git a/test/freeflow/navierstokes/doneatestproblem.hh b/test/freeflow/navierstokes/donea/problem.hh
similarity index 99%
rename from test/freeflow/navierstokes/doneatestproblem.hh
rename to test/freeflow/navierstokes/donea/problem.hh
index d2ee6b02a2be271822691f8d46f2d6e326e2d8e2..90bddc6ec5e29df9f4e98e9ece6d8e4160da63cd 100644
--- a/test/freeflow/navierstokes/doneatestproblem.hh
+++ b/test/freeflow/navierstokes/donea/problem.hh
@@ -36,7 +36,7 @@
#include <dumux/freeflow/navierstokes/problem.hh>
#include <dumux/discretization/staggered/freeflow/properties.hh>
#include <dumux/freeflow/navierstokes/model.hh>
-#include "l2error.hh"
+#include "../l2error.hh"
namespace Dumux
diff --git a/test/freeflow/navierstokes/kovasznay/CMakeLists.txt b/test/freeflow/navierstokes/kovasznay/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..fe70bc17d45ef023b28a0d237b6662a7d90060bb
--- /dev/null
+++ b/test/freeflow/navierstokes/kovasznay/CMakeLists.txt
@@ -0,0 +1,10 @@
+dune_add_test(NAME test_ff_navierstokes_kovasznay
+ SOURCES main.cc
+ CMAKE_GUARD HAVE_UMFPACK
+ COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
+ CMD_ARGS --script fuzzy
+ --files ${CMAKE_SOURCE_DIR}/test/references/test_ff_navierstokes_kovasznay-reference.vtu
+ ${CMAKE_CURRENT_BINARY_DIR}/test_ff_navierstokes_kovasznay-00001.vtu
+ --command "${CMAKE_CURRENT_BINARY_DIR}/test_ff_navierstokes_kovasznay params.input
+ -Problem.Name test_ff_navierstokes_kovasznay")
+dune_symlink_to_source_files(FILES "params.input")
diff --git a/test/freeflow/navierstokes/test_kovasznay.cc b/test/freeflow/navierstokes/kovasznay/main.cc
similarity index 99%
rename from test/freeflow/navierstokes/test_kovasznay.cc
rename to test/freeflow/navierstokes/kovasznay/main.cc
index 1bb20aeb3905b14fc2f8607868b07bd14b598138..5d98124dfc51a61e7861ef4ef2963672e4090d1b 100644
--- a/test/freeflow/navierstokes/test_kovasznay.cc
+++ b/test/freeflow/navierstokes/kovasznay/main.cc
@@ -33,7 +33,7 @@
#include <dune/istl/io.hh>
-#include "kovasznaytestproblem.hh"
+#include "problem.hh"
#include <dumux/common/properties.hh>
#include <dumux/common/parameters.hh>
diff --git a/test/freeflow/navierstokes/test_navierstokes_kovasznay.input b/test/freeflow/navierstokes/kovasznay/params.input
similarity index 100%
rename from test/freeflow/navierstokes/test_navierstokes_kovasznay.input
rename to test/freeflow/navierstokes/kovasznay/params.input
diff --git a/test/freeflow/navierstokes/kovasznaytestproblem.hh b/test/freeflow/navierstokes/kovasznay/problem.hh
similarity index 99%
rename from test/freeflow/navierstokes/kovasznaytestproblem.hh
rename to test/freeflow/navierstokes/kovasznay/problem.hh
index f3534aaf9bd223863511899dbe2432259233d38d..d1e9ae6c8cf8ec67b5c2ca5faca45a14eff50379 100644
--- a/test/freeflow/navierstokes/kovasznaytestproblem.hh
+++ b/test/freeflow/navierstokes/kovasznay/problem.hh
@@ -32,7 +32,7 @@
#include <dumux/freeflow/navierstokes/problem.hh>
#include <dumux/discretization/staggered/freeflow/properties.hh>
#include <dumux/freeflow/navierstokes/model.hh>
-#include "l2error.hh"
+#include "../l2error.hh"
namespace Dumux
{
diff --git a/test/freeflow/navierstokesnc/CMakeLists.txt b/test/freeflow/navierstokesnc/CMakeLists.txt
index 5931814a7da7baa3f68037f06515b87e0e693b09..b658ab60ea9765194c3e85f9da67e36bf3cf593d 100644
--- a/test/freeflow/navierstokesnc/CMakeLists.txt
+++ b/test/freeflow/navierstokesnc/CMakeLists.txt
@@ -1,89 +1,3 @@
-add_input_file_links()
-
-dune_add_test(NAME test_stokes2c_densitydrivenflow
- SOURCES test_densitydrivenflow.cc
- CMAKE_GUARD HAVE_UMFPACK
- COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
- CMD_ARGS --script fuzzy
- --files ${CMAKE_SOURCE_DIR}/test/references/stokes2c-densitydriven-reference.vtu
- ${CMAKE_CURRENT_BINARY_DIR}/test_densitydrivenflow-00021.vtu
- --command "${CMAKE_CURRENT_BINARY_DIR}/test_stokes2c_densitydrivenflow"
- --zeroThreshold {"X^Air_liq":1e-12}
- --zeroThreshold {"x^Air_liq":1e-12}
- --zeroThreshold {"velocity_liq \(m/s\)":1e-10}
- --zeroThreshold {"deltaRho":1e-7})
-
-add_executable(test_stokes2c_mass EXCLUDE_FROM_ALL test_channel.cc)
-target_compile_definitions(test_stokes2c_mass PUBLIC "USE_MASS=1")
-
-add_executable(test_stokes2c EXCLUDE_FROM_ALL test_channel.cc)
-
-dune_add_test(NAME test_stokes2c_purediffusion_mass
- TARGET test_stokes2c_mass
- CMAKE_GUARD HAVE_UMFPACK
- COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
- CMD_ARGS --script fuzzy
- --files ${CMAKE_SOURCE_DIR}/test/references/stokes2c-purediffusion.vtu
- ${CMAKE_CURRENT_BINARY_DIR}/test_purediffusion-00014.vtu
- --command "${CMAKE_CURRENT_BINARY_DIR}/test_stokes2c_mass test_stokes2c_purediffusion.input"
- --zeroThreshold {"velocity_liq \(m/s\)":1e-22})
-
-dune_add_test(NAME test_stokes2c_purediffusion_mole
- TARGET test_stokes2c
- CMAKE_GUARD HAVE_UMFPACK
- COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
- CMD_ARGS --script fuzzy
- --files ${CMAKE_SOURCE_DIR}/test/references/stokes2c-purediffusion.vtu
- ${CMAKE_CURRENT_BINARY_DIR}/test_purediffusion-00013.vtu
- --command "${CMAKE_CURRENT_BINARY_DIR}/test_stokes2c test_stokes2c_purediffusion.input"
- --zeroThreshold {"velocity_liq \(m/s\)":1e-22})
-
-dune_add_test(NAME test_stokes2c_advection
- TARGET test_stokes2c
- CMAKE_GUARD HAVE_UMFPACK
- COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
- CMD_ARGS --script fuzzy
- --files ${CMAKE_SOURCE_DIR}/test/references/stokes2c-advection.vtu
- ${CMAKE_CURRENT_BINARY_DIR}/test_advection-00009.vtu
- --command "${CMAKE_CURRENT_BINARY_DIR}/test_stokes2c test_stokes2c_advection.input")
-
-dune_add_test(NAME test_stokes2c_advection_no_caching
- SOURCES test_channel.cc
- CMAKE_GUARD HAVE_UMFPACK
- COMPILE_DEFINITIONS ENABLECACHING=0
- COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
- CMD_ARGS --script fuzzy
- --files ${CMAKE_SOURCE_DIR}/test/references/stokes2c-advection.vtu
- ${CMAKE_CURRENT_BINARY_DIR}/test_advection-00009.vtu
- --command "${CMAKE_CURRENT_BINARY_DIR}/test_stokes2c_advection_no_caching test_stokes2c_advection.input")
-
-add_executable(test_stokes2cni EXCLUDE_FROM_ALL test_channel.cc)
-target_compile_definitions(test_stokes2cni PUBLIC "NONISOTHERMAL=1")
-
-dune_add_test(NAME test_stokes2cni_advection
- TARGET test_stokes2cni
- CMAKE_GUARD HAVE_UMFPACK
- COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
- CMD_ARGS --script fuzzy
- --files ${CMAKE_SOURCE_DIR}/test/references/stokes2cni-advection.vtu
- ${CMAKE_CURRENT_BINARY_DIR}/test_stokes2cni_advection-00009.vtu
- --command "${CMAKE_CURRENT_BINARY_DIR}//test_stokes2cni test_stokes2cni_advection.input")
-
-dune_add_test(NAME test_stokes2cni_diffusion
- TARGET test_stokes2cni
- CMAKE_GUARD HAVE_UMFPACK
- COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
- CMD_ARGS --script fuzzy
- --files ${CMAKE_SOURCE_DIR}/test/references/stokes2cni-diffusion.vtu
- ${CMAKE_CURRENT_BINARY_DIR}/test_stokes2cni_diffusion-00014.vtu
- --command "${CMAKE_CURRENT_BINARY_DIR}//test_stokes2cni test_stokes2cni_diffusion.input"
- --zeroThreshold {"velocity_liq \(m/s\)":1e-13})
-
-dune_add_test(NAME test_msfreeflow
- SOURCES test_msfreeflow.cc
- CMAKE_GUARD HAVE_UMFPACK
- COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
- CMD_ARGS --script fuzzy
- --files ${CMAKE_SOURCE_DIR}/test/references/maxwellstefanfreeflow-reference.vtu
- ${CMAKE_CURRENT_BINARY_DIR}/test_msfreeflow-00005.vtu
- --command "${CMAKE_CURRENT_BINARY_DIR}/test_msfreeflow test_msfreeflow.input")
+add_subdirectory(densitydrivenflow)
+add_subdirectory(channel)
+add_subdirectory(maxwellstefan)
diff --git a/test/freeflow/navierstokesnc/channel/CMakeLists.txt b/test/freeflow/navierstokesnc/channel/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..cec68c4b2b003b2886d1af0ff50d00f0de681fd4
--- /dev/null
+++ b/test/freeflow/navierstokesnc/channel/CMakeLists.txt
@@ -0,0 +1,73 @@
+dune_symlink_to_source_files(FILES "params_advection.input" "params_diffusion.input" "params_advectionni.input" "params_diffusionni.input")
+
+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
+ TARGET test_ff_stokes2c_mass
+ CMAKE_GUARD HAVE_UMFPACK
+ COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
+ CMD_ARGS --script fuzzy
+ --files ${CMAKE_SOURCE_DIR}/test/references/test_ff_stokes2c_diffusion-reference.vtu
+ ${CMAKE_CURRENT_BINARY_DIR}/test_ff_stokes2c_diffusion_mass-00014.vtu
+ --command "${CMAKE_CURRENT_BINARY_DIR}/test_ff_stokes2c_mass params_diffusion.input
+ -Problem.Name test_ff_stokes2c_diffusion_mass"
+ --zeroThreshold {"velocity_liq \(m/s\)":1e-22})
+
+add_executable(test_ff_stokes2c EXCLUDE_FROM_ALL main.cc)
+
+dune_add_test(NAME test_ff_stokes2c_diffusion_mole
+ TARGET test_ff_stokes2c
+ CMAKE_GUARD HAVE_UMFPACK
+ COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
+ CMD_ARGS --script fuzzy
+ --files ${CMAKE_SOURCE_DIR}/test/references/test_ff_stokes2c_diffusion-reference.vtu
+ ${CMAKE_CURRENT_BINARY_DIR}/test_ff_stokes2c_diffusion_mole-00013.vtu
+ --command "${CMAKE_CURRENT_BINARY_DIR}/test_ff_stokes2c params_diffusion.input
+ -Problem.Name test_ff_stokes2c_diffusion_mole"
+ --zeroThreshold {"velocity_liq \(m/s\)":1e-22})
+
+dune_add_test(NAME test_ff_stokes2c_advection
+ TARGET test_ff_stokes2c
+ CMAKE_GUARD HAVE_UMFPACK
+ COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
+ CMD_ARGS --script fuzzy
+ --files ${CMAKE_SOURCE_DIR}/test/references/test_ff_stokes2c_advection-reference.vtu
+ ${CMAKE_CURRENT_BINARY_DIR}/test_ff_stokes2c_advection-00009.vtu
+ --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
+ TARGET test_ff_stokes2c
+ CMAKE_GUARD HAVE_UMFPACK
+ COMPILE_DEFINITIONS ENABLECACHING=0
+ COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
+ CMD_ARGS --script fuzzy
+ --files ${CMAKE_SOURCE_DIR}/test/references/test_ff_stokes2c_advection-reference.vtu
+ ${CMAKE_CURRENT_BINARY_DIR}/test_ff_stokes2c_advection_nocaching-00009.vtu
+ --command "${CMAKE_CURRENT_BINARY_DIR}/test_ff_stokes2c params_advection.input
+ -Problem.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
+ TARGET test_ff_stokes2cni
+ CMAKE_GUARD HAVE_UMFPACK
+ COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
+ CMD_ARGS --script fuzzy
+ --files ${CMAKE_SOURCE_DIR}/test/references/test_ff_stokes2cni_advection-reference.vtu
+ ${CMAKE_CURRENT_BINARY_DIR}/test_ff_stokes2cni_advection-00009.vtu
+ --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
+ TARGET test_ff_stokes2cni
+ CMAKE_GUARD HAVE_UMFPACK
+ COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
+ CMD_ARGS --script fuzzy
+ --files ${CMAKE_SOURCE_DIR}/test/references/test_ff_stokes2cni_diffusion-reference.vtu
+ ${CMAKE_CURRENT_BINARY_DIR}/test_ff_stokes2cni_diffusion-00014.vtu
+ --command "${CMAKE_CURRENT_BINARY_DIR}/test_ff_stokes2cni params_diffusionni.input
+ -Problem.Name test_ff_stokes2cni_diffusion"
+ --zeroThreshold {"velocity_liq \(m/s\)":1e-13})
diff --git a/test/freeflow/navierstokesnc/test_channel.cc b/test/freeflow/navierstokesnc/channel/main.cc
similarity index 99%
rename from test/freeflow/navierstokesnc/test_channel.cc
rename to test/freeflow/navierstokesnc/channel/main.cc
index 7b3cd9548618341031b64e5d21a8cebcc9f3f1a8..5015a58265fd3e41d718bf0626280f72e5a75dd7 100644
--- a/test/freeflow/navierstokesnc/test_channel.cc
+++ b/test/freeflow/navierstokesnc/channel/main.cc
@@ -32,7 +32,7 @@
#include <dune/grid/io/file/vtk.hh>
#include <dune/istl/io.hh>
-#include "channeltestproblem.hh"
+#include "problem.hh"
#include <dumux/common/properties.hh>
#include <dumux/common/parameters.hh>
diff --git a/test/freeflow/navierstokesnc/test_stokes2c_advection.input b/test/freeflow/navierstokesnc/channel/params_advection.input
similarity index 100%
rename from test/freeflow/navierstokesnc/test_stokes2c_advection.input
rename to test/freeflow/navierstokesnc/channel/params_advection.input
diff --git a/test/freeflow/navierstokesnc/test_stokes2cni_advection.input b/test/freeflow/navierstokesnc/channel/params_advectionni.input
similarity index 100%
rename from test/freeflow/navierstokesnc/test_stokes2cni_advection.input
rename to test/freeflow/navierstokesnc/channel/params_advectionni.input
diff --git a/test/freeflow/navierstokesnc/test_stokes2c_purediffusion.input b/test/freeflow/navierstokesnc/channel/params_diffusion.input
similarity index 100%
rename from test/freeflow/navierstokesnc/test_stokes2c_purediffusion.input
rename to test/freeflow/navierstokesnc/channel/params_diffusion.input
diff --git a/test/freeflow/navierstokesnc/test_stokes2cni_diffusion.input b/test/freeflow/navierstokesnc/channel/params_diffusionni.input
similarity index 100%
rename from test/freeflow/navierstokesnc/test_stokes2cni_diffusion.input
rename to test/freeflow/navierstokesnc/channel/params_diffusionni.input
diff --git a/test/freeflow/navierstokesnc/channeltestproblem.hh b/test/freeflow/navierstokesnc/channel/problem.hh
similarity index 100%
rename from test/freeflow/navierstokesnc/channeltestproblem.hh
rename to test/freeflow/navierstokesnc/channel/problem.hh
diff --git a/test/freeflow/navierstokesnc/densitydrivenflow/CMakeLists.txt b/test/freeflow/navierstokesnc/densitydrivenflow/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..83c0dc4a7a1a5d03bc3070adac40de48877cbc45
--- /dev/null
+++ b/test/freeflow/navierstokesnc/densitydrivenflow/CMakeLists.txt
@@ -0,0 +1,16 @@
+
+dune_add_test(NAME test_ff_stokes2c_densitydrivenflow
+ SOURCES main.cc
+ CMAKE_GUARD HAVE_UMFPACK
+ COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
+ CMD_ARGS --script fuzzy
+ --files ${CMAKE_SOURCE_DIR}/test/references/test_ff_stokes2c_densitydrivenflow-reference.vtu
+ ${CMAKE_CURRENT_BINARY_DIR}/test_ff_stokes2c_densitydrivenflow-00021.vtu
+ --command "${CMAKE_CURRENT_BINARY_DIR}/test_ff_stokes2c_densitydrivenflow params.input
+ -Problem.Name test_ff_stokes2c_densitydrivenflow"
+ --zeroThreshold {"X^Air_liq":1e-12}
+ --zeroThreshold {"x^Air_liq":1e-12}
+ --zeroThreshold {"velocity_liq \(m/s\)":1e-10}
+ --zeroThreshold {"deltaRho":1e-7})
+
+dune_symlink_to_source_files(FILES "params.input")
diff --git a/test/freeflow/navierstokesnc/test_densitydrivenflow.cc b/test/freeflow/navierstokesnc/densitydrivenflow/main.cc
similarity index 99%
rename from test/freeflow/navierstokesnc/test_densitydrivenflow.cc
rename to test/freeflow/navierstokesnc/densitydrivenflow/main.cc
index bebae70faf1589dd3a5c6ff564d7f5560daabbd3..9baf172b752cd0f99e0040b830ea3b27e8c7ddc8 100644
--- a/test/freeflow/navierstokesnc/test_densitydrivenflow.cc
+++ b/test/freeflow/navierstokesnc/densitydrivenflow/main.cc
@@ -32,7 +32,7 @@
#include <dune/grid/io/file/vtk.hh>
#include <dune/istl/io.hh>
-#include "densityflowproblem.hh"
+#include "problem.hh"
#include <dumux/common/properties.hh>
#include <dumux/common/parameters.hh>
diff --git a/test/freeflow/navierstokesnc/test_stokes2c_densitydrivenflow.input b/test/freeflow/navierstokesnc/densitydrivenflow/params.input
similarity index 100%
rename from test/freeflow/navierstokesnc/test_stokes2c_densitydrivenflow.input
rename to test/freeflow/navierstokesnc/densitydrivenflow/params.input
diff --git a/test/freeflow/navierstokesnc/densityflowproblem.hh b/test/freeflow/navierstokesnc/densitydrivenflow/problem.hh
similarity index 100%
rename from test/freeflow/navierstokesnc/densityflowproblem.hh
rename to test/freeflow/navierstokesnc/densitydrivenflow/problem.hh
diff --git a/test/freeflow/navierstokesnc/maxwellstefan/CMakeLists.txt b/test/freeflow/navierstokesnc/maxwellstefan/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..4f3e7c8ba5e7a6a53a6d09c2f45248adc0496ce4
--- /dev/null
+++ b/test/freeflow/navierstokesnc/maxwellstefan/CMakeLists.txt
@@ -0,0 +1,11 @@
+dune_add_test(NAME test_ff_stokes2c_maxwellstefan
+ SOURCES main.cc
+ CMAKE_GUARD HAVE_UMFPACK
+ COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
+ CMD_ARGS --script fuzzy
+ --files ${CMAKE_SOURCE_DIR}/test/references/test_ff_stokes2c_maxwellstefan-reference.vtu
+ ${CMAKE_CURRENT_BINARY_DIR}/test_ff_stokes2c_maxwellstefan-00005.vtu
+ --command "${CMAKE_CURRENT_BINARY_DIR}/test_ff_stokes2c_maxwellstefan params.input
+ -Problem.Name test_ff_stokes2c_maxwellstefan")
+
+dune_symlink_to_source_files(FILES "params.input")
diff --git a/test/freeflow/navierstokesnc/test_msfreeflow.cc b/test/freeflow/navierstokesnc/maxwellstefan/main.cc
similarity index 99%
rename from test/freeflow/navierstokesnc/test_msfreeflow.cc
rename to test/freeflow/navierstokesnc/maxwellstefan/main.cc
index bbe525a69fae2a58bd5d813008de3f52b758d711..8fdb3c48f6006a92d4cdfe6fcd7130ca382388c9 100644
--- a/test/freeflow/navierstokesnc/test_msfreeflow.cc
+++ b/test/freeflow/navierstokesnc/maxwellstefan/main.cc
@@ -32,7 +32,7 @@
#include <dune/grid/io/file/vtk.hh>
#include <dune/istl/io.hh>
-#include "msfreeflowtestproblem.hh"
+#include "problem.hh"
#include <dumux/common/properties.hh>
#include <dumux/common/parameters.hh>
diff --git a/test/freeflow/navierstokesnc/test_msfreeflow.input b/test/freeflow/navierstokesnc/maxwellstefan/params.input
similarity index 100%
rename from test/freeflow/navierstokesnc/test_msfreeflow.input
rename to test/freeflow/navierstokesnc/maxwellstefan/params.input
diff --git a/test/freeflow/navierstokesnc/msfreeflowtestproblem.hh b/test/freeflow/navierstokesnc/maxwellstefan/problem.hh
similarity index 100%
rename from test/freeflow/navierstokesnc/msfreeflowtestproblem.hh
rename to test/freeflow/navierstokesnc/maxwellstefan/problem.hh
diff --git a/test/freeflow/rans/CMakeLists.txt b/test/freeflow/rans/CMakeLists.txt
index eaf18ec11f1bde9668dce9eea968fc297bbf2a46..8afc82c4f16ecc6e9247e3f78da0149f0f6fbd92 100644
--- a/test/freeflow/rans/CMakeLists.txt
+++ b/test/freeflow/rans/CMakeLists.txt
@@ -1,72 +1,79 @@
add_input_file_links()
dune_symlink_to_source_files(FILES laufer_re50000.csv laufer_re50000_u+y+.csv)
-add_executable(test_pipe_laufer_kepsilon EXCLUDE_FROM_ALL test_pipe_laufer.cc)
-target_compile_definitions(test_pipe_laufer_kepsilon PUBLIC "KEPSILON=1")
+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_pipe_laufer_kepsilon_twolayers
- TARGET test_pipe_laufer_kepsilon
+dune_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
CMD_ARGS --script fuzzy
- --files ${CMAKE_SOURCE_DIR}/test/references/pipe_laufer_kepsilon.vtu
- ${CMAKE_CURRENT_BINARY_DIR}/pipe_laufer_reference-00052.vtu
- --command "${CMAKE_CURRENT_BINARY_DIR}/test_pipe_laufer_kepsilon test_pipe_laufer_reference.input")
+ --files ${CMAKE_SOURCE_DIR}/test/references/test_ff_rans_lauferpipe_kepsilon_twolayers-reference.vtu
+ ${CMAKE_CURRENT_BINARY_DIR}/test_ff_rans_lauferpipe_kepsilon_twolayers-00052.vtu
+ --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_pipe_laufer_kepsilon_wallfunction
- TARGET test_pipe_laufer_kepsilon
+dune_add_test(NAME test_ff_rans_lauferpipe_kepsilon_wallfunction
+ TARGET test_ff_rans_lauferpipe_kepsilon
CMAKE_GUARD HAVE_UMFPACK
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMD_ARGS --script fuzzy
- --files ${CMAKE_SOURCE_DIR}/test/references/pipe_laufer_kepsilon_wallfunction.vtu
- ${CMAKE_CURRENT_BINARY_DIR}/pipe_laufer_reference-00029.vtu
- --command "${CMAKE_CURRENT_BINARY_DIR}/test_pipe_laufer_kepsilon test_pipe_laufer_reference_wallfunction.input")
+ --files ${CMAKE_SOURCE_DIR}/test/references/test_ff_rans_lauferpipe_kepsilon_wallfunction-reference.vtu
+ ${CMAKE_CURRENT_BINARY_DIR}/test_ff_rans_lauferpipe_kepsilon_wallfunction-00029.vtu
+ --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_pipe_laufer_lowrekepsilon
- SOURCES test_pipe_laufer.cc
+dune_add_test(NAME test_ff_rans_lauferpipe_lowrekepsilon
+ SOURCES main.cc
CMAKE_GUARD HAVE_UMFPACK
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMD_ARGS --script fuzzy
- --files ${CMAKE_SOURCE_DIR}/test/references/pipe_laufer_lowrekepsilon.vtu
- ${CMAKE_CURRENT_BINARY_DIR}/pipe_laufer_reference-00066.vtu
- --command "${CMAKE_CURRENT_BINARY_DIR}/test_pipe_laufer_lowrekepsilon test_pipe_laufer_reference.input")
-target_compile_definitions(test_pipe_laufer_lowrekepsilon PUBLIC "LOWREKEPSILON=1")
+ --files ${CMAKE_SOURCE_DIR}/test/references/test_ff_rans_lauferpipe_lowrekepsilon-reference.vtu
+ ${CMAKE_CURRENT_BINARY_DIR}/test_ff_rans_lauferpipe_lowrekepsilon-00066.vtu
+ --command "${CMAKE_CURRENT_BINARY_DIR}/test_ff_rans_lauferpipe_lowrekepsilon params.input
+ -Problem.Name test_ff_rans_lauferpipe_lowrekepsilon")
+target_compile_definitions(test_ff_rans_lauferpipe_lowrekepsilon PUBLIC "LOWREKEPSILON=1")
-dune_add_test(NAME test_pipe_laufer_komega
- SOURCES test_pipe_laufer.cc
+dune_add_test(NAME test_ff_rans_lauferpipe_komega
+ SOURCES main.cc
CMAKE_GUARD HAVE_UMFPACK
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMD_ARGS --script fuzzy
- --files ${CMAKE_SOURCE_DIR}/test/references/pipe_laufer_komega.vtu
- ${CMAKE_CURRENT_BINARY_DIR}/pipe_laufer_reference-00055.vtu
- --command "${CMAKE_CURRENT_BINARY_DIR}/test_pipe_laufer_komega test_pipe_laufer_reference.input")
-target_compile_definitions(test_pipe_laufer_komega PUBLIC "KOMEGA=1")
+ --files ${CMAKE_SOURCE_DIR}/test/references/test_ff_rans_lauferpipe_komega-reference.vtu
+ ${CMAKE_CURRENT_BINARY_DIR}/test_ff_rans_lauferpipe_komega-00055.vtu
+ --command "${CMAKE_CURRENT_BINARY_DIR}/test_ff_rans_lauferpipe_komega params.input
+ -Problem.Name test_ff_rans_lauferpipe_komega")
+target_compile_definitions(test_ff_rans_lauferpipe_komega PUBLIC "KOMEGA=1")
-dune_add_test(NAME test_pipe_laufer_oneeq
- SOURCES test_pipe_laufer.cc
+dune_add_test(NAME test_ff_rans_lauferpipe_oneeq
+ SOURCES main.cc
CMAKE_GUARD HAVE_UMFPACK
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMD_ARGS --script fuzzy
- --files ${CMAKE_SOURCE_DIR}/test/references/pipe_laufer_oneeq.vtu
- ${CMAKE_CURRENT_BINARY_DIR}/pipe_laufer_reference-00046.vtu
- --command "${CMAKE_CURRENT_BINARY_DIR}/test_pipe_laufer_oneeq test_pipe_laufer_reference.input")
-target_compile_definitions(test_pipe_laufer_oneeq PUBLIC "ONEEQ=1")
+ --files ${CMAKE_SOURCE_DIR}/test/references/test_ff_rans_lauferpipe_oneeq-reference.vtu
+ ${CMAKE_CURRENT_BINARY_DIR}/test_ff_rans_lauferpipe_oneeq-00046.vtu
+ --command "${CMAKE_CURRENT_BINARY_DIR}/test_ff_rans_lauferpipe_oneeq params.input
+ -Problem.Name test_ff_rans_lauferpipe_oneeq")
+target_compile_definitions(test_ff_rans_lauferpipe_oneeq PUBLIC "ONEEQ=1")
-dune_add_test(NAME test_pipe_laufer_zeroeq
- SOURCES test_pipe_laufer.cc
+dune_add_test(NAME test_ff_rans_lauferpipe_zeroeq
+ SOURCES main.cc
CMAKE_GUARD HAVE_UMFPACK
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMD_ARGS --script fuzzy
- --files ${CMAKE_SOURCE_DIR}/test/references/pipe_laufer_zeroeq.vtu
- ${CMAKE_CURRENT_BINARY_DIR}/pipe_laufer_reference-00044.vtu
- --command "${CMAKE_CURRENT_BINARY_DIR}/test_pipe_laufer_zeroeq test_pipe_laufer_reference.input")
+ --files ${CMAKE_SOURCE_DIR}/test/references/test_ff_rans_lauferpipe_zeroeq-reference.vtu
+ ${CMAKE_CURRENT_BINARY_DIR}/test_ff_rans_lauferpipe_zeroeq-00044.vtu
+ --command "${CMAKE_CURRENT_BINARY_DIR}/test_ff_rans_lauferpipe_zeroeq params.input
+ -Problem.Name test_ff_rans_lauferpipe_zeroeq")
-dune_add_test(NAME test_pipe_zeroeqni
- SOURCES test_pipe_laufer.cc
+dune_add_test(NAME test_ff_ransni_zeroeq
+ SOURCES main.cc
CMAKE_GUARD HAVE_UMFPACK
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMD_ARGS --script fuzzy
- --files ${CMAKE_SOURCE_DIR}/test/references/pipe_zeroeqni.vtu
- ${CMAKE_CURRENT_BINARY_DIR}/pipe_zeroeqni-00031.vtu
- --command "${CMAKE_CURRENT_BINARY_DIR}/test_pipe_zeroeqni test_pipe_zeroeqni.input")
-target_compile_definitions(test_pipe_zeroeqni PUBLIC "NONISOTHERMAL=1")
+ --files ${CMAKE_SOURCE_DIR}/test/references/test_ff_ransni_zeroeq-reference.vtu
+ ${CMAKE_CURRENT_BINARY_DIR}/test_ff_ransni_zeroeq-00031.vtu
+ --command "${CMAKE_CURRENT_BINARY_DIR}/test_ff_ransni_zeroeq params_nonisothermal.input
+ -Problem.Name test_ff_ransni_zeroeq")
+target_compile_definitions(test_ff_ransni_zeroeq PUBLIC "NONISOTHERMAL=1")
diff --git a/test/freeflow/rans/test_pipe_laufer.cc b/test/freeflow/rans/main.cc
similarity index 99%
rename from test/freeflow/rans/test_pipe_laufer.cc
rename to test/freeflow/rans/main.cc
index 2825c0a39e248a9104de17f3a0866ef0d0e07a3d..dd83e765f9f355f70aaab241d5b0037b415741e0 100644
--- a/test/freeflow/rans/test_pipe_laufer.cc
+++ b/test/freeflow/rans/main.cc
@@ -35,7 +35,7 @@
#include <dune/grid/io/file/vtk.hh>
#include <dune/istl/io.hh>
-#include "pipelauferproblem.hh"
+#include "problem.hh"
#include <dumux/common/properties.hh>
#include <dumux/common/parameters.hh>
diff --git a/test/freeflow/rans/test_pipe_laufer_reference.input b/test/freeflow/rans/params.input
similarity index 100%
rename from test/freeflow/rans/test_pipe_laufer_reference.input
rename to test/freeflow/rans/params.input
diff --git a/test/freeflow/rans/test_pipe_zeroeqni.input b/test/freeflow/rans/params_nonisothermal.input
similarity index 100%
rename from test/freeflow/rans/test_pipe_zeroeqni.input
rename to test/freeflow/rans/params_nonisothermal.input
diff --git a/test/freeflow/rans/test_pipe_laufer.input b/test/freeflow/rans/params_verbose.input
similarity index 100%
rename from test/freeflow/rans/test_pipe_laufer.input
rename to test/freeflow/rans/params_verbose.input
diff --git a/test/freeflow/rans/test_pipe_laufer_reference_wallfunction.input b/test/freeflow/rans/params_wallfunction.input
similarity index 100%
rename from test/freeflow/rans/test_pipe_laufer_reference_wallfunction.input
rename to test/freeflow/rans/params_wallfunction.input
diff --git a/test/freeflow/rans/pipelauferproblem.hh b/test/freeflow/rans/problem.hh
similarity index 100%
rename from test/freeflow/rans/pipelauferproblem.hh
rename to test/freeflow/rans/problem.hh
diff --git a/test/freeflow/ransnc/CMakeLists.txt b/test/freeflow/ransnc/CMakeLists.txt
index cb2f49f9dd0916ec2ba82390c08d0f6071079a23..6038490089e64c1a827832ca7f424af318b6fbdc 100644
--- a/test/freeflow/ransnc/CMakeLists.txt
+++ b/test/freeflow/ransnc/CMakeLists.txt
@@ -1,95 +1,99 @@
add_input_file_links()
-dune_add_test(NAME test_flatplate_kepsilon2c
- SOURCES test_flatplate.cc
+dune_add_test(NAME test_ff_rans2c_kepsilon
+ SOURCES main.cc
COMPILE_ONLY CMAKE_GUARD HAVE_UMFPACK)
-target_compile_definitions(test_flatplate_kepsilon2c PUBLIC "KEPSILON=1")
+target_compile_definitions(test_ff_rans2c_kepsilon PUBLIC "KEPSILON=1")
-add_executable(test_flatplate_kepsilon2cni EXCLUDE_FROM_ALL test_flatplate.cc)
-target_compile_definitions(test_flatplate_kepsilon2cni PUBLIC "KEPSILON=1" "NONISOTHERMAL=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_flatplate_kepsilon2cni_twolayer
- TARGET test_flatplate_kepsilon2cni
+dune_add_test(NAME test_ff_rans2cni_kepsilon_twolayer
+ TARGET test_ff_rans2cni_kepsilon
CMAKE_GUARD HAVE_UMFPACK
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMD_ARGS --script fuzzy
- --files ${CMAKE_SOURCE_DIR}/test/references/test_flatplate_kepsilon2cni.vtu
- ${CMAKE_CURRENT_BINARY_DIR}/test_flatplate2cni-00033.vtu
- --command "${CMAKE_CURRENT_BINARY_DIR}/test_flatplate_kepsilon2cni
- test_flatplate2cni.input")
+ --files ${CMAKE_SOURCE_DIR}/test/references/test_ff_rans2cni_kepsilon_twolayer-reference.vtu
+ ${CMAKE_CURRENT_BINARY_DIR}/test_ff_rans2cni_kepsilon_twolayer-00033.vtu
+ --command "${CMAKE_CURRENT_BINARY_DIR}/test_ff_rans2cni_kepsilon params_nonisothermal.input
+ -Problem.Name test_ff_rans2cni_kepsilon_twolayer")
-dune_add_test(NAME test_flatplate_kepsilon2cni_wallfunction
- TARGET test_flatplate_kepsilon2cni
+dune_add_test(NAME test_ff_rans2cni_kepsilon_wallfunction
+ TARGET test_ff_rans2cni_kepsilon
CMAKE_GUARD HAVE_UMFPACK
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMD_ARGS --script fuzzy
- --files ${CMAKE_SOURCE_DIR}/test/references/test_flatplate_kepsilon2cni_wallfunction.vtu
- ${CMAKE_CURRENT_BINARY_DIR}/test_flatplate2cni_wallfunction-00024.vtu
- --command "${CMAKE_CURRENT_BINARY_DIR}/test_flatplate_kepsilon2cni
- test_flatplate2cni_wallfunction.input")
+ --files ${CMAKE_SOURCE_DIR}/test/references/test_ff_rans2cni_kepsilon_wallfunction-reference.vtu
+ ${CMAKE_CURRENT_BINARY_DIR}/test_ff_rans2cni_kepsilon_wallfunction-00024.vtu
+ --command "${CMAKE_CURRENT_BINARY_DIR}/test_ff_rans2cni_kepsilon params_niwallfunction.input
+ -Problem.Name test_ff_rans2cni_kepsilon_wallfunction")
-dune_add_test(NAME test_flatplate_komega2c
- SOURCES test_flatplate.cc
+dune_add_test(NAME test_ff_rans2c_komega
+ SOURCES main.cc
COMPILE_ONLY CMAKE_GUARD HAVE_UMFPACK)
-target_compile_definitions(test_flatplate_komega2c PUBLIC "KOMEGA=1")
+target_compile_definitions(test_ff_rans2c_komega PUBLIC "KOMEGA=1")
-dune_add_test(NAME test_flatplate_komega2cni
- SOURCES test_flatplate.cc
+dune_add_test(NAME test_ff_rans2cni_komega
+ SOURCES main.cc
CMAKE_GUARD HAVE_UMFPACK
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMD_ARGS --script fuzzy
- --files ${CMAKE_SOURCE_DIR}/test/references/test_flatplate_komega2cni.vtu
- ${CMAKE_CURRENT_BINARY_DIR}/test_flatplate2cni-00032.vtu
- --command "${CMAKE_CURRENT_BINARY_DIR}/test_flatplate_komega2cni
- test_flatplate2cni.input
+ --files ${CMAKE_SOURCE_DIR}/test/references/test_ff_rans2cni_komega-reference.vtu
+ ${CMAKE_CURRENT_BINARY_DIR}/test_ff_rans2cni_komega-00032.vtu
+ --command "${CMAKE_CURRENT_BINARY_DIR}/test_ff_rans2cni_komega params_nonisothermal.input
+ -Problem.Name test_ff_rans2cni_komega
-Newton.TargetSteps 12")
-target_compile_definitions(test_flatplate_komega2cni PUBLIC "KOMEGA=1" "NONISOTHERMAL=1")
+target_compile_definitions(test_ff_rans2cni_komega PUBLIC "KOMEGA=1" "NONISOTHERMAL=1")
-dune_add_test(NAME test_flatplate_lowrekepsilon2c
- SOURCES test_flatplate.cc
+dune_add_test(NAME test_ff_rans2c_lowrekepsilon
+ SOURCES main.cc
COMPILE_ONLY CMAKE_GUARD HAVE_UMFPACK)
-target_compile_definitions(test_flatplate_lowrekepsilon2c PUBLIC "LOWREKEPSILON=1")
+target_compile_definitions(test_ff_rans2c_lowrekepsilon PUBLIC "LOWREKEPSILON=1")
-dune_add_test(NAME test_flatplate_lowrekepsilon2cni
- SOURCES test_flatplate.cc
+dune_add_test(NAME test_ff_rans2cni_lowrekepsilon
+ SOURCES main.cc
CMAKE_GUARD HAVE_UMFPACK
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMD_ARGS --script fuzzy
- --files ${CMAKE_SOURCE_DIR}/test/references/test_flatplate_lowrekepsilon2cni.vtu
- ${CMAKE_CURRENT_BINARY_DIR}/test_flatplate2cni-00032.vtu
- --command "${CMAKE_CURRENT_BINARY_DIR}/test_flatplate_lowrekepsilon2cni test_flatplate2cni.input")
-target_compile_definitions(test_flatplate_lowrekepsilon2cni PUBLIC "LOWREKEPSILON=1" "NONISOTHERMAL=1")
+ --files ${CMAKE_SOURCE_DIR}/test/references/test_ff_rans2cni_lowrekepsilon-reference.vtu
+ ${CMAKE_CURRENT_BINARY_DIR}/test_ff_rans2cni_lowrekepsilon-00032.vtu
+ --command "${CMAKE_CURRENT_BINARY_DIR}/test_ff_rans2cni_lowrekepsilon params_nonisothermal.input
+ -Problem.Name test_ff_rans2cni_lowrekepsilon")
+target_compile_definitions(test_ff_rans2cni_lowrekepsilon PUBLIC "LOWREKEPSILON=1" "NONISOTHERMAL=1")
-dune_add_test(NAME test_flatplate_oneeq2c
- SOURCES test_flatplate.cc
+dune_add_test(NAME test_ff_rans2c_oneeq
+ SOURCES main.cc
COMPILE_ONLY CMAKE_GUARD HAVE_UMFPACK)
-target_compile_definitions(test_flatplate_oneeq2c PUBLIC "ONEEQ=1")
+target_compile_definitions(test_ff_rans2c_oneeq PUBLIC "ONEEQ=1")
-dune_add_test(NAME test_flatplate_oneeq2cni
- SOURCES test_flatplate.cc
+dune_add_test(NAME test_ff_rans2cni_oneeq
+ SOURCES main.cc
CMAKE_GUARD HAVE_UMFPACK
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMD_ARGS --script fuzzy
- --files ${CMAKE_SOURCE_DIR}/test/references/test_flatplate_oneeq2cni.vtu
- ${CMAKE_CURRENT_BINARY_DIR}/test_flatplate2cni-00031.vtu
- --command "${CMAKE_CURRENT_BINARY_DIR}/test_flatplate_oneeq2cni test_flatplate2cni.input")
-target_compile_definitions(test_flatplate_oneeq2cni PUBLIC "ONEEQ=1" "NONISOTHERMAL=1")
+ --files ${CMAKE_SOURCE_DIR}/test/references/test_ff_rans2cni_oneeq-reference.vtu
+ ${CMAKE_CURRENT_BINARY_DIR}/test_ff_rans2cni_oneeq-00031.vtu
+ --command "${CMAKE_CURRENT_BINARY_DIR}/test_ff_rans2cni_oneeq params_nonisothermal.input
+ -Problem.Name test_ff_rans2cni_oneeq")
+target_compile_definitions(test_ff_rans2cni_oneeq PUBLIC "ONEEQ=1" "NONISOTHERMAL=1")
-dune_add_test(NAME test_flatplate_zeroeq2c
- SOURCES test_flatplate.cc
+dune_add_test(NAME test_ff_rans2c_zeroeq
+ SOURCES main.cc
CMAKE_GUARD HAVE_UMFPACK
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMD_ARGS --script fuzzy
- --files ${CMAKE_SOURCE_DIR}/test/references/test_flatplate_zeroeq2c.vtu
- ${CMAKE_CURRENT_BINARY_DIR}/test_flatplate2c-00031.vtu
- --command "${CMAKE_CURRENT_BINARY_DIR}/test_flatplate_zeroeq2c test_flatplate2c.input")
+ --files ${CMAKE_SOURCE_DIR}/test/references/test_ff_rans2c_zeroeq.vtu
+ ${CMAKE_CURRENT_BINARY_DIR}/test_ff_rans2c_zeroeq-00031.vtu
+ --command "${CMAKE_CURRENT_BINARY_DIR}/test_ff_rans2c_zeroeq params.input
+ -Problem.Name test_ff_rans2c_zeroeq")
-dune_add_test(NAME test_flatplate_zeroeq2cni
- SOURCES test_flatplate.cc
+dune_add_test(NAME test_ff_rans2cni_zeroeq
+ SOURCES main.cc
CMAKE_GUARD HAVE_UMFPACK
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMD_ARGS --script fuzzy
- --files ${CMAKE_SOURCE_DIR}/test/references/test_flatplate_zeroeq2cni.vtu
- ${CMAKE_CURRENT_BINARY_DIR}/test_flatplate2cni-00032.vtu
- --command "${CMAKE_CURRENT_BINARY_DIR}/test_flatplate_zeroeq2cni test_flatplate2cni.input")
-target_compile_definitions(test_flatplate_zeroeq2cni PUBLIC "NONISOTHERMAL=1")
+ --files ${CMAKE_SOURCE_DIR}/test/references/test_ff_rans2cni_zeroeq.vtu
+ ${CMAKE_CURRENT_BINARY_DIR}/test_ff_rans2cni_zeroeq-00032.vtu
+ --command "${CMAKE_CURRENT_BINARY_DIR}/test_ff_rans2cni_zeroeq params_nonisothermal.input
+ -Problem.Name test_ff_rans2cni_zeroeq")
+target_compile_definitions(test_ff_rans2cni_zeroeq PUBLIC "NONISOTHERMAL=1")
diff --git a/test/freeflow/ransnc/test_flatplate.cc b/test/freeflow/ransnc/main.cc
similarity index 99%
rename from test/freeflow/ransnc/test_flatplate.cc
rename to test/freeflow/ransnc/main.cc
index 5f511d5201bf3a57bc23d80afa8dbf811924d963..82e21cf07aa75abebbf6e6b17bca6c0788b2407d 100644
--- a/test/freeflow/ransnc/test_flatplate.cc
+++ b/test/freeflow/ransnc/main.cc
@@ -32,7 +32,7 @@
#include <dune/grid/io/file/vtk.hh>
#include <dune/istl/io.hh>
-#include "flatplatetestproblem.hh"
+#include "problem.hh"
#include <dumux/common/properties.hh>
#include <dumux/common/parameters.hh>
diff --git a/test/freeflow/ransnc/test_flatplate2c.input b/test/freeflow/ransnc/params.input
similarity index 87%
rename from test/freeflow/ransnc/test_flatplate2c.input
rename to test/freeflow/ransnc/params.input
index 7ebd7c9baeb919cd936f45eaf9e9027b392f3645..e6951b4c52da21f2cdc6214920cf7cc79e72e1ee 100644
--- a/test/freeflow/ransnc/test_flatplate2c.input
+++ b/test/freeflow/ransnc/params.input
@@ -11,7 +11,7 @@ Cells1 = 20
Grading1 = 1.4
[Problem]
-Name = test_flatplate2c # name passed to the output routines
+Name = test_ff_rans2c # name passed to the output routines
InletVelocity = 0.1 # [m/s]
EnableGravity = false
diff --git a/test/freeflow/ransnc/test_flatplate2cni_wallfunction.input b/test/freeflow/ransnc/params_niwallfunction.input
similarity index 85%
rename from test/freeflow/ransnc/test_flatplate2cni_wallfunction.input
rename to test/freeflow/ransnc/params_niwallfunction.input
index a39400964f9003fe7dabcbf70aae2bb0ef09ab80..c99c05cdf61ad6858c524d5bf75e4ff886c6e9c8 100644
--- a/test/freeflow/ransnc/test_flatplate2cni_wallfunction.input
+++ b/test/freeflow/ransnc/params_niwallfunction.input
@@ -10,7 +10,7 @@ Cells0 = 10
Cells1 = 5
[Problem]
-Name = test_flatplate2cni_wallfunction # name passed to the output routines
+Name = test_ff_rans2cni_wallfunction # name passed to the output routines
InletVelocity = 0.1 # [m/s]
EnableGravity = false
diff --git a/test/freeflow/ransnc/test_flatplate2cni.input b/test/freeflow/ransnc/params_nonisothermal.input
similarity index 86%
rename from test/freeflow/ransnc/test_flatplate2cni.input
rename to test/freeflow/ransnc/params_nonisothermal.input
index ed2afed061316d3bfae2075e28539d04d86d8fad..24851a0a55efce0fed9b5057ffaf11e9d3b52582 100644
--- a/test/freeflow/ransnc/test_flatplate2cni.input
+++ b/test/freeflow/ransnc/params_nonisothermal.input
@@ -11,7 +11,7 @@ Cells1 = 20
Grading1 = 1.4
[Problem]
-Name = test_flatplate2cni # name passed to the output routines
+Name = test_ff_rans2cni # name passed to the output routines
InletVelocity = 0.1 # [m/s]
EnableGravity = false
diff --git a/test/freeflow/ransnc/flatplatetestproblem.hh b/test/freeflow/ransnc/problem.hh
similarity index 100%
rename from test/freeflow/ransnc/flatplatetestproblem.hh
rename to test/freeflow/ransnc/problem.hh
diff --git a/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/horizontalflow/test_stokes1p2cdarcy1p2chorizontal.cc b/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/horizontalflow/test_stokes1p2cdarcy1p2chorizontal.cc
index 0e51f16ffbe09de84f0da54109007b1fb096e8a7..23f19df1f83b482da82269e9a037ef6144012d5e 100644
--- a/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/horizontalflow/test_stokes1p2cdarcy1p2chorizontal.cc
+++ b/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/horizontalflow/test_stokes1p2cdarcy1p2chorizontal.cc
@@ -49,8 +49,8 @@
#include <dumux/multidomain/boundary/stokesdarcy/couplingmanager.hh>
-#include "darcyproblem.hh"
-#include "stokesproblem.hh"
+#include "problem_darcy.hh"
+#include "problem_stokes.hh"
namespace Dumux {
namespace Properties {
@@ -183,14 +183,11 @@ int main(int argc, char** argv) try
darcyGridVariables->init(sol[darcyIdx], solDarcyOld);
// intialize the vtk output module
- const auto stokesName = getParam<std::string>("Problem.Name") + "_" + stokesProblem->name();
- const auto darcyName = getParam<std::string>("Problem.Name") + "_" + darcyProblem->name();
-
- StaggeredVtkOutputModule<StokesGridVariables, typename GET_PROP_TYPE(StokesTypeTag, SolutionVector)> stokesVtkWriter(*stokesGridVariables, stokesSol, stokesName);
+ StaggeredVtkOutputModule<StokesGridVariables, typename GET_PROP_TYPE(StokesTypeTag, SolutionVector)> stokesVtkWriter(*stokesGridVariables, stokesSol, stokesProblem->name());
GET_PROP_TYPE(StokesTypeTag, IOFields)::initOutputModule(stokesVtkWriter);
stokesVtkWriter.write(0.0);
- VtkOutputModule<DarcyGridVariables, typename GET_PROP_TYPE(DarcyTypeTag, SolutionVector)> darcyVtkWriter(*darcyGridVariables, sol[darcyIdx], darcyName);
+ VtkOutputModule<DarcyGridVariables, typename GET_PROP_TYPE(DarcyTypeTag, SolutionVector)> darcyVtkWriter(*darcyGridVariables, sol[darcyIdx], darcyProblem->name());
using DarcyVelocityOutput = typename GET_PROP_TYPE(DarcyTypeTag, VelocityOutput);
darcyVtkWriter.addVelocityOutput(std::make_shared<DarcyVelocityOutput>(*darcyGridVariables));
GET_PROP_TYPE(DarcyTypeTag, IOFields)::initOutputModule(darcyVtkWriter);
diff --git a/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/verticalflow/test_stokes1p2cdarcy1p2cvertical.cc b/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/verticalflow/test_stokes1p2cdarcy1p2cvertical.cc
index 946bb677b470860c7cc751b39e976860c00a4c92..36ca1bcb191ef30e7aa20a48568467378d81c668 100644
--- a/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/verticalflow/test_stokes1p2cdarcy1p2cvertical.cc
+++ b/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/verticalflow/test_stokes1p2cdarcy1p2cvertical.cc
@@ -49,8 +49,8 @@
#include <dumux/multidomain/boundary/stokesdarcy/couplingmanager.hh>
-#include "darcyproblem.hh"
-#include "stokesproblem.hh"
+#include "problem_darcy.hh"
+#include "problem_stokes.hh"
namespace Dumux {
namespace Properties {
@@ -184,14 +184,11 @@ int main(int argc, char** argv) try
darcyGridVariables->init(sol[darcyIdx], solDarcyOld);
// intialize the vtk output module
- const auto stokesName = getParam<std::string>("Problem.Name") + "_" + stokesProblem->name();
- const auto darcyName = getParam<std::string>("Problem.Name") + "_" + darcyProblem->name();
-
- StaggeredVtkOutputModule<StokesGridVariables, typename GET_PROP_TYPE(StokesTypeTag, SolutionVector)> stokesVtkWriter(*stokesGridVariables, stokesSol, stokesName);
+ StaggeredVtkOutputModule<StokesGridVariables, typename GET_PROP_TYPE(StokesTypeTag, SolutionVector)> stokesVtkWriter(*stokesGridVariables, stokesSol, stokesProblem->name());
GET_PROP_TYPE(StokesTypeTag, IOFields)::initOutputModule(stokesVtkWriter);
stokesVtkWriter.write(0.0);
- VtkOutputModule<DarcyGridVariables, typename GET_PROP_TYPE(DarcyTypeTag, SolutionVector)> darcyVtkWriter(*darcyGridVariables, sol[darcyIdx], darcyName);
+ VtkOutputModule<DarcyGridVariables, typename GET_PROP_TYPE(DarcyTypeTag, SolutionVector)> darcyVtkWriter(*darcyGridVariables, sol[darcyIdx], darcyProblem->name());
using DarcyVelocityOutput = typename GET_PROP_TYPE(DarcyTypeTag, VelocityOutput);
darcyVtkWriter.addVelocityOutput(std::make_shared<DarcyVelocityOutput>(*darcyGridVariables));
GET_PROP_TYPE(DarcyTypeTag, IOFields)::initOutputModule(darcyVtkWriter);
diff --git a/test/multidomain/boundary/stokesdarcy/1p2c_2p2c/test_stokes1p2cdarcy2p2chorizontal.cc b/test/multidomain/boundary/stokesdarcy/1p2c_2p2c/test_stokes1p2cdarcy2p2chorizontal.cc
index 9a506d0e0f18d194cb9e94ae34f90144735d342c..43c4d51ac1c2dab03233daaf032cdfe2eae00b84 100644
--- a/test/multidomain/boundary/stokesdarcy/1p2c_2p2c/test_stokes1p2cdarcy2p2chorizontal.cc
+++ b/test/multidomain/boundary/stokesdarcy/1p2c_2p2c/test_stokes1p2cdarcy2p2chorizontal.cc
@@ -49,8 +49,8 @@
#include <dumux/multidomain/boundary/stokesdarcy/couplingmanager.hh>
-#include "darcyproblem.hh"
-#include "stokesproblem.hh"
+#include "problem_darcy.hh"
+#include "problem_stokes.hh"
namespace Dumux {
namespace Properties {
@@ -176,14 +176,11 @@ int main(int argc, char** argv) try
darcyGridVariables->init(sol[darcyIdx], solDarcyOld);
// intialize the vtk output module
- const auto stokesName = getParam<std::string>("Problem.Name") + "_" + stokesProblem->name();
- const auto darcyName = getParam<std::string>("Problem.Name") + "_" + darcyProblem->name();
-
- StaggeredVtkOutputModule<StokesGridVariables, typename GET_PROP_TYPE(StokesTypeTag, SolutionVector)> stokesVtkWriter(*stokesGridVariables, stokesSol, stokesName);
+ StaggeredVtkOutputModule<StokesGridVariables, typename GET_PROP_TYPE(StokesTypeTag, SolutionVector)> stokesVtkWriter(*stokesGridVariables, stokesSol, stokesProblem->name());
GET_PROP_TYPE(StokesTypeTag, IOFields)::initOutputModule(stokesVtkWriter);
stokesVtkWriter.write(0.0);
- VtkOutputModule<DarcyGridVariables, typename GET_PROP_TYPE(DarcyTypeTag, SolutionVector)> darcyVtkWriter(*darcyGridVariables, sol[darcyIdx], darcyName);
+ VtkOutputModule<DarcyGridVariables, typename GET_PROP_TYPE(DarcyTypeTag, SolutionVector)> darcyVtkWriter(*darcyGridVariables, sol[darcyIdx], darcyProblem->name());
using DarcyVelocityOutput = typename GET_PROP_TYPE(DarcyTypeTag, VelocityOutput);
darcyVtkWriter.addVelocityOutput(std::make_shared<DarcyVelocityOutput>(*darcyGridVariables));
GET_PROP_TYPE(DarcyTypeTag, IOFields)::initOutputModule(darcyVtkWriter);
diff --git a/test/multidomain/boundary/stokesdarcy/1p_1p/horizontalflow/test_stokes1pdarcy1phorizontal.cc b/test/multidomain/boundary/stokesdarcy/1p_1p/horizontalflow/test_stokes1pdarcy1phorizontal.cc
index 70ad0085b4739c573bab372ec1a3c8279c07807f..acd69ed79c7fcead8c9c00b84e5a373ff0ca77a5 100644
--- a/test/multidomain/boundary/stokesdarcy/1p_1p/horizontalflow/test_stokes1pdarcy1phorizontal.cc
+++ b/test/multidomain/boundary/stokesdarcy/1p_1p/horizontalflow/test_stokes1pdarcy1phorizontal.cc
@@ -49,8 +49,8 @@
#include <dumux/multidomain/boundary/stokesdarcy/couplingmanager.hh>
-#include "darcyproblem.hh"
-#include "stokesproblem.hh"
+#include "problem_darcy.hh"
+#include "problem_stokes.hh"
namespace Dumux {
namespace Properties {
@@ -155,14 +155,11 @@ int main(int argc, char** argv) try
darcyGridVariables->init(sol[darcyIdx]);
// intialize the vtk output module
- const auto stokesName = getParam<std::string>("Problem.Name") + "_" + stokesProblem->name();
- const auto darcyName = getParam<std::string>("Problem.Name") + "_" + darcyProblem->name();
-
- StaggeredVtkOutputModule<StokesGridVariables, typename GET_PROP_TYPE(StokesTypeTag, SolutionVector)> stokesVtkWriter(*stokesGridVariables, stokesSol, stokesName);
+ StaggeredVtkOutputModule<StokesGridVariables, typename GET_PROP_TYPE(StokesTypeTag, SolutionVector)> stokesVtkWriter(*stokesGridVariables, stokesSol, stokesProblem->name());
GET_PROP_TYPE(StokesTypeTag, IOFields)::initOutputModule(stokesVtkWriter);
stokesVtkWriter.write(0.0);
- VtkOutputModule<DarcyGridVariables, typename GET_PROP_TYPE(DarcyTypeTag, SolutionVector)> darcyVtkWriter(*darcyGridVariables, sol[darcyIdx], darcyName);
+ VtkOutputModule<DarcyGridVariables, typename GET_PROP_TYPE(DarcyTypeTag, SolutionVector)> darcyVtkWriter(*darcyGridVariables, sol[darcyIdx], darcyProblem->name());
using DarcyVelocityOutput = typename GET_PROP_TYPE(DarcyTypeTag, VelocityOutput);
darcyVtkWriter.addVelocityOutput(std::make_shared<DarcyVelocityOutput>(*darcyGridVariables));
GET_PROP_TYPE(DarcyTypeTag, IOFields)::initOutputModule(darcyVtkWriter);
diff --git a/test/multidomain/boundary/stokesdarcy/1p_1p/verticalflow/test_stokes1pdarcy1pvertical.cc b/test/multidomain/boundary/stokesdarcy/1p_1p/verticalflow/test_stokes1pdarcy1pvertical.cc
index a51aeacd045d93dcb5ef404f622a361fe4bd6592..b80579a07a40332056650f273c009f64c8b1b534 100644
--- a/test/multidomain/boundary/stokesdarcy/1p_1p/verticalflow/test_stokes1pdarcy1pvertical.cc
+++ b/test/multidomain/boundary/stokesdarcy/1p_1p/verticalflow/test_stokes1pdarcy1pvertical.cc
@@ -49,8 +49,8 @@
#include <dumux/multidomain/boundary/stokesdarcy/couplingmanager.hh>
-#include "darcyproblem.hh"
-#include "stokesproblem.hh"
+#include "problem_darcy.hh"
+#include "problem_stokes.hh"
namespace Dumux {
namespace Properties {
@@ -158,14 +158,11 @@ int main(int argc, char** argv) try
darcyGridVariables->init(sol[darcyIdx]);
// intialize the vtk output module
- const auto stokesName = getParam<std::string>("Problem.Name") + "_" + stokesProblem->name();
- const auto darcyName = getParam<std::string>("Problem.Name") + "_" + darcyProblem->name();
-
- StaggeredVtkOutputModule<StokesGridVariables, typename GET_PROP_TYPE(StokesTypeTag, SolutionVector)> stokesVtkWriter(*stokesGridVariables, stokesSol, stokesName);
+ StaggeredVtkOutputModule<StokesGridVariables, typename GET_PROP_TYPE(StokesTypeTag, SolutionVector)> stokesVtkWriter(*stokesGridVariables, stokesSol, stokesProblem->name());
GET_PROP_TYPE(StokesTypeTag, IOFields)::initOutputModule(stokesVtkWriter);
stokesVtkWriter.write(0.0);
- VtkOutputModule<DarcyGridVariables, typename GET_PROP_TYPE(DarcyTypeTag, SolutionVector)> darcyVtkWriter(*darcyGridVariables, sol[darcyIdx], darcyName);
+ VtkOutputModule<DarcyGridVariables, typename GET_PROP_TYPE(DarcyTypeTag, SolutionVector)> darcyVtkWriter(*darcyGridVariables, sol[darcyIdx], darcyProblem->name());
using DarcyVelocityOutput = typename GET_PROP_TYPE(DarcyTypeTag, VelocityOutput);
darcyVtkWriter.addVelocityOutput(std::make_shared<DarcyVelocityOutput>(*darcyGridVariables));
GET_PROP_TYPE(DarcyTypeTag, IOFields)::initOutputModule(darcyVtkWriter);
diff --git a/test/multidomain/boundary/stokesdarcy/1p_2p/test_stokes1pdarcy2pvertical.cc b/test/multidomain/boundary/stokesdarcy/1p_2p/test_stokes1pdarcy2pvertical.cc
index 9d6712d2b6de2f90a1284888ca9d131ea3f2ef49..c7f3a82cbb59c7d4623a8e93ec29c3d52149b29e 100644
--- a/test/multidomain/boundary/stokesdarcy/1p_2p/test_stokes1pdarcy2pvertical.cc
+++ b/test/multidomain/boundary/stokesdarcy/1p_2p/test_stokes1pdarcy2pvertical.cc
@@ -57,8 +57,8 @@
#include <dumux/material/components/tabulatedcomponent.hh>
#include <dumux/material/fluidsystems/1padapter.hh>
-#include "darcyproblem.hh"
-#include "stokesproblem.hh"
+#include "problem_darcy.hh"
+#include "problem_stokes.hh"
namespace Dumux {
namespace Properties {
@@ -207,14 +207,11 @@ int main(int argc, char** argv) try
auto dt = getParam<Scalar>("TimeLoop.DtInitial");
// intialize the vtk output module
- const auto stokesName = getParam<std::string>("Problem.Name") + "_" + stokesProblem->name();
- const auto darcyName = getParam<std::string>("Problem.Name") + "_" + darcyProblem->name();
-
- StaggeredVtkOutputModule<StokesGridVariables, typename GET_PROP_TYPE(StokesTypeTag, SolutionVector)> stokesVtkWriter(*stokesGridVariables, stokesSol, stokesName);
+ StaggeredVtkOutputModule<StokesGridVariables, typename GET_PROP_TYPE(StokesTypeTag, SolutionVector)> stokesVtkWriter(*stokesGridVariables, stokesSol, stokesProblem->name());
GET_PROP_TYPE(StokesTypeTag, IOFields)::initOutputModule(stokesVtkWriter);
stokesVtkWriter.write(0.0);
- VtkOutputModule<DarcyGridVariables, typename GET_PROP_TYPE(DarcyTypeTag, SolutionVector)> darcyVtkWriter(*darcyGridVariables, sol[darcyIdx], darcyName);
+ VtkOutputModule<DarcyGridVariables, typename GET_PROP_TYPE(DarcyTypeTag, SolutionVector)> darcyVtkWriter(*darcyGridVariables, sol[darcyIdx], darcyProblem->name());
using DarcyVelocityOutput = typename GET_PROP_TYPE(DarcyTypeTag, VelocityOutput);
darcyVtkWriter.addVelocityOutput(std::make_shared<DarcyVelocityOutput>(*darcyGridVariables));
GET_PROP_TYPE(DarcyTypeTag, IOFields)::initOutputModule(darcyVtkWriter);
diff --git a/test/references/test_navierstokes_1d.vtp b/test/references/test_ff_navierstokes_1d-reference.vtp
similarity index 100%
rename from test/references/test_navierstokes_1d.vtp
rename to test/references/test_ff_navierstokes_1d-reference.vtp
diff --git a/test/references/test_angeli-reference.vtu b/test/references/test_ff_navierstokes_angeli-reference.vtu
similarity index 100%
rename from test/references/test_angeli-reference.vtu
rename to test/references/test_ff_navierstokes_angeli-reference.vtu
diff --git a/test/references/channel-navierstokes-reference.vtu b/test/references/test_ff_navierstokes_channel-reference.vtu
similarity index 100%
rename from test/references/channel-navierstokes-reference.vtu
rename to test/references/test_ff_navierstokes_channel-reference.vtu
diff --git a/test/references/stokeshydrostaticpressure-reference.vtu b/test/references/test_ff_navierstokes_closedsystem_hydrostaticpressure-reference.vtu
similarity index 100%
rename from test/references/stokeshydrostaticpressure-reference.vtu
rename to test/references/test_ff_navierstokes_closedsystem_hydrostaticpressure-reference.vtu
diff --git a/test/references/liddrivencavity-low-re-reference.vtu b/test/references/test_ff_navierstokes_closedsystem_ldc_re1-reference.vtu
similarity index 100%
rename from test/references/liddrivencavity-low-re-reference.vtu
rename to test/references/test_ff_navierstokes_closedsystem_ldc_re1-reference.vtu
diff --git a/test/references/liddrivencavity-high-re-reference.vtu b/test/references/test_ff_navierstokes_closedsystem_ldc_re1000-reference.vtu
similarity index 100%
rename from test/references/liddrivencavity-high-re-reference.vtu
rename to test/references/test_ff_navierstokes_closedsystem_ldc_re1000-reference.vtu
diff --git a/test/references/test_kovasznay-reference.vtu b/test/references/test_ff_navierstokes_kovasznay-reference.vtu
similarity index 100%
rename from test/references/test_kovasznay-reference.vtu
rename to test/references/test_ff_navierstokes_kovasznay-reference.vtu
diff --git a/test/references/test_flatplate_zeroeq2c.vtu b/test/references/test_ff_rans2c_zeroeq.vtu
similarity index 100%
rename from test/references/test_flatplate_zeroeq2c.vtu
rename to test/references/test_ff_rans2c_zeroeq.vtu
diff --git a/test/references/test_flatplate_kepsilon2cni.vtu b/test/references/test_ff_rans2cni_kepsilon_twolayer-reference.vtu
similarity index 100%
rename from test/references/test_flatplate_kepsilon2cni.vtu
rename to test/references/test_ff_rans2cni_kepsilon_twolayer-reference.vtu
diff --git a/test/references/test_flatplate_kepsilon2cni_wallfunction.vtu b/test/references/test_ff_rans2cni_kepsilon_wallfunction-reference.vtu
similarity index 100%
rename from test/references/test_flatplate_kepsilon2cni_wallfunction.vtu
rename to test/references/test_ff_rans2cni_kepsilon_wallfunction-reference.vtu
diff --git a/test/references/test_flatplate_komega2cni.vtu b/test/references/test_ff_rans2cni_komega-reference.vtu
similarity index 100%
rename from test/references/test_flatplate_komega2cni.vtu
rename to test/references/test_ff_rans2cni_komega-reference.vtu
diff --git a/test/references/test_flatplate_lowrekepsilon2cni.vtu b/test/references/test_ff_rans2cni_lowrekepsilon-reference.vtu
similarity index 100%
rename from test/references/test_flatplate_lowrekepsilon2cni.vtu
rename to test/references/test_ff_rans2cni_lowrekepsilon-reference.vtu
diff --git a/test/references/test_flatplate_oneeq2cni.vtu b/test/references/test_ff_rans2cni_oneeq-reference.vtu
similarity index 100%
rename from test/references/test_flatplate_oneeq2cni.vtu
rename to test/references/test_ff_rans2cni_oneeq-reference.vtu
diff --git a/test/references/test_flatplate_zeroeq2cni.vtu b/test/references/test_ff_rans2cni_zeroeq.vtu
similarity index 100%
rename from test/references/test_flatplate_zeroeq2cni.vtu
rename to test/references/test_ff_rans2cni_zeroeq.vtu
diff --git a/test/references/pipe_laufer_kepsilon.vtu b/test/references/test_ff_rans_lauferpipe_kepsilon_twolayers-reference.vtu
similarity index 100%
rename from test/references/pipe_laufer_kepsilon.vtu
rename to test/references/test_ff_rans_lauferpipe_kepsilon_twolayers-reference.vtu
diff --git a/test/references/pipe_laufer_kepsilon_wallfunction.vtu b/test/references/test_ff_rans_lauferpipe_kepsilon_wallfunction-reference.vtu
similarity index 100%
rename from test/references/pipe_laufer_kepsilon_wallfunction.vtu
rename to test/references/test_ff_rans_lauferpipe_kepsilon_wallfunction-reference.vtu
diff --git a/test/references/pipe_laufer_komega.vtu b/test/references/test_ff_rans_lauferpipe_komega-reference.vtu
similarity index 100%
rename from test/references/pipe_laufer_komega.vtu
rename to test/references/test_ff_rans_lauferpipe_komega-reference.vtu
diff --git a/test/references/pipe_laufer_lowrekepsilon.vtu b/test/references/test_ff_rans_lauferpipe_lowrekepsilon-reference.vtu
similarity index 100%
rename from test/references/pipe_laufer_lowrekepsilon.vtu
rename to test/references/test_ff_rans_lauferpipe_lowrekepsilon-reference.vtu
diff --git a/test/references/pipe_laufer_oneeq.vtu b/test/references/test_ff_rans_lauferpipe_oneeq-reference.vtu
similarity index 100%
rename from test/references/pipe_laufer_oneeq.vtu
rename to test/references/test_ff_rans_lauferpipe_oneeq-reference.vtu
diff --git a/test/references/pipe_laufer_zeroeq.vtu b/test/references/test_ff_rans_lauferpipe_zeroeq-reference.vtu
similarity index 100%
rename from test/references/pipe_laufer_zeroeq.vtu
rename to test/references/test_ff_rans_lauferpipe_zeroeq-reference.vtu
diff --git a/test/references/pipe_zeroeqni.vtu b/test/references/test_ff_ransni_zeroeq-reference.vtu
similarity index 100%
rename from test/references/pipe_zeroeqni.vtu
rename to test/references/test_ff_ransni_zeroeq-reference.vtu
diff --git a/test/references/stokes2c-advection.vtu b/test/references/test_ff_stokes2c_advection-reference.vtu
similarity index 100%
rename from test/references/stokes2c-advection.vtu
rename to test/references/test_ff_stokes2c_advection-reference.vtu
diff --git a/test/references/stokes2c-densitydriven-reference.vtu b/test/references/test_ff_stokes2c_densitydrivenflow-reference.vtu
similarity index 100%
rename from test/references/stokes2c-densitydriven-reference.vtu
rename to test/references/test_ff_stokes2c_densitydrivenflow-reference.vtu
diff --git a/test/references/stokes2c-purediffusion.vtu b/test/references/test_ff_stokes2c_diffusion-reference.vtu
similarity index 100%
rename from test/references/stokes2c-purediffusion.vtu
rename to test/references/test_ff_stokes2c_diffusion-reference.vtu
diff --git a/test/references/maxwellstefanfreeflow-reference.vtu b/test/references/test_ff_stokes2c_maxwellstefan-reference.vtu
similarity index 100%
rename from test/references/maxwellstefanfreeflow-reference.vtu
rename to test/references/test_ff_stokes2c_maxwellstefan-reference.vtu
diff --git a/test/references/stokes2cni-advection.vtu b/test/references/test_ff_stokes2cni_advection-reference.vtu
similarity index 100%
rename from test/references/stokes2cni-advection.vtu
rename to test/references/test_ff_stokes2cni_advection-reference.vtu
diff --git a/test/references/stokes2cni-diffusion.vtu b/test/references/test_ff_stokes2cni_diffusion-reference.vtu
similarity index 100%
rename from test/references/stokes2cni-diffusion.vtu
rename to test/references/test_ff_stokes2cni_diffusion-reference.vtu
diff --git a/test/references/channel-stokes.vtu b/test/references/test_ff_stokes_channel-reference.vtu
similarity index 100%
rename from test/references/channel-stokes.vtu
rename to test/references/test_ff_stokes_channel-reference.vtu
diff --git a/test/references/stokes_channel_3d-reference.vtu b/test/references/test_ff_stokes_channel_3d-reference.vtu
similarity index 100%
rename from test/references/stokes_channel_3d-reference.vtu
rename to test/references/test_ff_stokes_channel_3d-reference.vtu
diff --git a/test/references/stokes_channel_pseudo3d-reference.vtu b/test/references/test_ff_stokes_channel_pseudo3d-reference.vtu
similarity index 100%
rename from test/references/stokes_channel_pseudo3d-reference.vtu
rename to test/references/test_ff_stokes_channel_pseudo3d-reference.vtu
diff --git a/test/references/stokes-donea-reference.vtu b/test/references/test_ff_stokes_donea-reference.vtu
similarity index 100%
rename from test/references/stokes-donea-reference.vtu
rename to test/references/test_ff_stokes_donea-reference.vtu
diff --git a/test/references/stokesni-conduction-reference.vtu b/test/references/test_ff_stokesni_channel_conduction-reference.vtu
similarity index 100%
rename from test/references/stokesni-conduction-reference.vtu
rename to test/references/test_ff_stokesni_channel_conduction-reference.vtu
diff --git a/test/references/stokesni-convection-reference.vtu b/test/references/test_ff_stokesni_channel_convection-reference.vtu
similarity index 100%
rename from test/references/stokesni-convection-reference.vtu
rename to test/references/test_ff_stokesni_channel_convection-reference.vtu