From 70f5cc150374ebcac39847e0bfc01fe86b841879 Mon Sep 17 00:00:00 2001
From: Ned Coltman <edward.coltman@iws.uni-stuttgart.de>
Date: Fri, 2 Nov 2018 16:55:57 +0100
Subject: [PATCH] [Cleanup][Multidomain][boundary] rename boundary multidomain
tests
---
.../boundary/darcydarcy/1p_1p/CMakeLists.txt | 18 +++++------
.../boundary/darcydarcy/1p_1p/main.cc | 2 +-
...dary_equaldim_1p_1p.input => params.input} | 3 ++
.../boundary/darcydarcy/1p_1p/problem.hh | 15 ++++++++-
.../boundary/darcydarcy/1p_2p/CMakeLists.txt | 15 +++++----
...dary_equaldim_1p_2p.input => params.input} | 3 ++
.../boundary/darcydarcy/1p_2p/problem.hh | 10 ++++++
.../1p2c_1p2c/horizontalflow/CMakeLists.txt | 15 +++++----
...okes1p2cdarcy1p2chorizontal.cc => main.cc} | 0
...darcy1p2chorizontal.input => params.input} | 2 +-
.../{darcyproblem.hh => problem_darcy.hh} | 13 ++++++--
.../{stokesproblem.hh => problem_stokes.hh} | 11 ++++++-
.../{1pspatialparams.hh => spatialparams.hh} | 0
.../1p2c_1p2c/verticalflow/CMakeLists.txt | 32 ++++++++++---------
...stokes1p2cdarcy1p2cvertical.cc => main.cc} | 0
...2cdarcy1p2cvertical.input => params.input} | 2 +-
...diffusion.input => params_diffusion.input} | 2 +-
.../{darcyproblem.hh => problem_darcy.hh} | 13 ++++++--
.../{stokesproblem.hh => problem_stokes.hh} | 10 ++++++
.../stokesdarcy/1p2c_2p2c/CMakeLists.txt | 30 +++++++++--------
...okes1p2cdarcy2p2chorizontal.cc => main.cc} | 0
...darcy2p2chorizontal.input => params.input} | 1 +
...ontal.input => params_nonisothermal.input} | 1 +
.../{darcyproblem.hh => problem_darcy.hh} | 11 ++++++-
.../{stokesproblem.hh => problem_stokes.hh} | 11 ++++++-
.../1p_1p/horizontalflow/CMakeLists.txt | 15 +++++----
...t_stokes1pdarcy1phorizontal.cc => main.cc} | 0
...1pdarcy1phorizontal.input => params.input} | 3 +-
.../{darcyproblem.hh => problem_darcy.hh} | 16 ++++++++--
.../{stokesproblem.hh => problem_stokes.hh} | 10 ++++++
.../{1pspatialparams.hh => spatialparams.hh} | 0
.../1p_1p/verticalflow/CMakeLists.txt | 15 +++++----
...est_stokes1pdarcy1pvertical.cc => main.cc} | 0
...es1pdarcy1pvertical.input => params.input} | 4 ++-
.../{darcyproblem.hh => problem_darcy.hh} | 13 ++++++--
.../{stokesproblem.hh => problem_stokes.hh} | 11 ++++++-
.../boundary/stokesdarcy/1p_2p/CMakeLists.txt | 15 +++++----
...est_stokes1pdarcy2pvertical.cc => main.cc} | 0
...es1pdarcy2pvertical.input => params.input} | 2 +-
.../{darcyproblem.hh => problem_darcy.hh} | 11 ++++++-
.../{stokesproblem.hh => problem_stokes.hh} | 11 ++++++-
...stokes1p2c_horizontal_darcy-reference.vtu} | 0
...tokes1p2c_horizontal_stokes-reference.vtu} | 0
...2c_vertical_advection_darcy-reference.vtu} | 0
...c_vertical_advection_stokes-reference.vtu} | 0
...2c_vertical_diffusion_darcy-reference.vtu} | 0
...c_vertical_diffusion_stokes-reference.vtu} | 0
...boundary_darcy1p_darcy2p_1p-reference.vtu} | 0
...boundary_darcy1p_darcy2p_2p-reference.vtu} | 0
...p_stokes1p_horizontal_darcy-reference.vtu} | 0
..._stokes1p_horizontal_stokes-reference.vtu} | 0
...y1p_stokes1p_vertical_darcy-reference.vtu} | 0
...1p_stokes1p_vertical_stokes-reference.vtu} | 0
...stokes1p2c_horizontal_darcy-reference.vtu} | 0
...tokes1p2c_horizontal_stokes-reference.vtu} | 0
...c_stokes1p2c_vertical_darcy-reference.vtu} | 0
..._stokes1p2c_vertical_stokes-reference.vtu} | 0
...okes1p2cni_horizontal_darcy-reference.vtu} | 0
...kes1p2cni_horizontal_stokes-reference.vtu} | 0
...stokes1p2cni_vertical_darcy-reference.vtu} | 0
...tokes1p2cni_vertical_stokes-reference.vtu} | 0
...y2p_stokes1p_vertical_darcy-reference.vtu} | 0
...2p_stokes1p_vertical_stokes-reference.vtu} | 0
63 files changed, 251 insertions(+), 95 deletions(-)
rename test/multidomain/boundary/darcydarcy/1p_1p/{test_boundary_equaldim_1p_1p.input => params.input} (88%)
rename test/multidomain/boundary/darcydarcy/1p_2p/{test_boundary_equaldim_1p_2p.input => params.input} (83%)
rename test/multidomain/boundary/stokesdarcy/1p2c_1p2c/horizontalflow/{test_stokes1p2cdarcy1p2chorizontal.cc => main.cc} (100%)
rename test/multidomain/boundary/stokesdarcy/1p2c_1p2c/horizontalflow/{test_stokes1p2cdarcy1p2chorizontal.input => params.input} (90%)
rename test/multidomain/boundary/stokesdarcy/1p2c_1p2c/horizontalflow/{darcyproblem.hh => problem_darcy.hh} (96%)
rename test/multidomain/boundary/stokesdarcy/1p2c_1p2c/horizontalflow/{stokesproblem.hh => problem_stokes.hh} (97%)
rename test/multidomain/boundary/stokesdarcy/1p2c_1p2c/{1pspatialparams.hh => spatialparams.hh} (100%)
rename test/multidomain/boundary/stokesdarcy/1p2c_1p2c/verticalflow/{test_stokes1p2cdarcy1p2cvertical.cc => main.cc} (100%)
rename test/multidomain/boundary/stokesdarcy/1p2c_1p2c/verticalflow/{test_stokes1p2cdarcy1p2cvertical.input => params.input} (89%)
rename test/multidomain/boundary/stokesdarcy/1p2c_1p2c/verticalflow/{test_stokes1p2cdarcy1p2cvertical_diffusion.input => params_diffusion.input} (86%)
rename test/multidomain/boundary/stokesdarcy/1p2c_1p2c/verticalflow/{darcyproblem.hh => problem_darcy.hh} (96%)
rename test/multidomain/boundary/stokesdarcy/1p2c_1p2c/verticalflow/{stokesproblem.hh => problem_stokes.hh} (97%)
rename test/multidomain/boundary/stokesdarcy/1p2c_2p2c/{test_stokes1p2cdarcy2p2chorizontal.cc => main.cc} (100%)
rename test/multidomain/boundary/stokesdarcy/1p2c_2p2c/{test_stokes1p2cdarcy2p2chorizontal.input => params.input} (94%)
rename test/multidomain/boundary/stokesdarcy/1p2c_2p2c/{test_stokes1p2cnidarcy2p2cnihorizontal.input => params_nonisothermal.input} (93%)
rename test/multidomain/boundary/stokesdarcy/1p2c_2p2c/{darcyproblem.hh => problem_darcy.hh} (97%)
rename test/multidomain/boundary/stokesdarcy/1p2c_2p2c/{stokesproblem.hh => problem_stokes.hh} (98%)
rename test/multidomain/boundary/stokesdarcy/1p_1p/horizontalflow/{test_stokes1pdarcy1phorizontal.cc => main.cc} (100%)
rename test/multidomain/boundary/stokesdarcy/1p_1p/horizontalflow/{test_stokes1pdarcy1phorizontal.input => params.input} (84%)
rename test/multidomain/boundary/stokesdarcy/1p_1p/horizontalflow/{darcyproblem.hh => problem_darcy.hh} (96%)
rename test/multidomain/boundary/stokesdarcy/1p_1p/horizontalflow/{stokesproblem.hh => problem_stokes.hh} (96%)
rename test/multidomain/boundary/stokesdarcy/1p_1p/{1pspatialparams.hh => spatialparams.hh} (100%)
rename test/multidomain/boundary/stokesdarcy/1p_1p/verticalflow/{test_stokes1pdarcy1pvertical.cc => main.cc} (100%)
rename test/multidomain/boundary/stokesdarcy/1p_1p/verticalflow/{test_stokes1pdarcy1pvertical.input => params.input} (86%)
rename test/multidomain/boundary/stokesdarcy/1p_1p/verticalflow/{darcyproblem.hh => problem_darcy.hh} (96%)
rename test/multidomain/boundary/stokesdarcy/1p_1p/verticalflow/{stokesproblem.hh => problem_stokes.hh} (97%)
rename test/multidomain/boundary/stokesdarcy/1p_2p/{test_stokes1pdarcy2pvertical.cc => main.cc} (100%)
rename test/multidomain/boundary/stokesdarcy/1p_2p/{test_stokes1pdarcy2pvertical.input => params.input} (91%)
rename test/multidomain/boundary/stokesdarcy/1p_2p/{darcyproblem.hh => problem_darcy.hh} (97%)
rename test/multidomain/boundary/stokesdarcy/1p_2p/{stokesproblem.hh => problem_stokes.hh} (97%)
rename test/references/{test_stokes1p2cdarcy1p2chorizontal_darcy-reference.vtu => test_md_boundary_darcy1p2c_stokes1p2c_horizontal_darcy-reference.vtu} (100%)
rename test/references/{test_stokes1p2cdarcy1p2chorizontal_stokes-reference.vtu => test_md_boundary_darcy1p2c_stokes1p2c_horizontal_stokes-reference.vtu} (100%)
rename test/references/{test_stokes1p2cdarcy1p2cvertical_advection_darcy-reference.vtu => test_md_boundary_darcy1p2c_stokes1p2c_vertical_advection_darcy-reference.vtu} (100%)
rename test/references/{test_stokes1p2cdarcy1p2cvertical_advection_stokes-reference.vtu => test_md_boundary_darcy1p2c_stokes1p2c_vertical_advection_stokes-reference.vtu} (100%)
rename test/references/{test_stokes1p2cdarcy1p2cvertical_diffusion_darcy-reference.vtu => test_md_boundary_darcy1p2c_stokes1p2c_vertical_diffusion_darcy-reference.vtu} (100%)
rename test/references/{test_stokes1p2cdarcy1p2cvertical_diffusion_stokes-reference.vtu => test_md_boundary_darcy1p2c_stokes1p2c_vertical_diffusion_stokes-reference.vtu} (100%)
rename test/references/{md-boundary-1p2p-injection-1p-reference.vtu => test_md_boundary_darcy1p_darcy2p_1p-reference.vtu} (100%)
rename test/references/{md-boundary-1p2p-injection-2p-reference.vtu => test_md_boundary_darcy1p_darcy2p_2p-reference.vtu} (100%)
rename test/references/{test_stokes1pdarcy1phorizontal_darcy-reference.vtu => test_md_boundary_darcy1p_stokes1p_horizontal_darcy-reference.vtu} (100%)
rename test/references/{test_stokes1pdarcy1phorizontal_stokes-reference.vtu => test_md_boundary_darcy1p_stokes1p_horizontal_stokes-reference.vtu} (100%)
rename test/references/{test_stokes1pdarcy1pvertical_darcy-reference.vtu => test_md_boundary_darcy1p_stokes1p_vertical_darcy-reference.vtu} (100%)
rename test/references/{test_stokes1pdarcy1pvertical_stokes-reference.vtu => test_md_boundary_darcy1p_stokes1p_vertical_stokes-reference.vtu} (100%)
rename test/references/{test_stokes1p2cdarcy2p2chorizontal_darcy-reference.vtu => test_md_boundary_darcy2p2c_stokes1p2c_horizontal_darcy-reference.vtu} (100%)
rename test/references/{test_stokes1p2cdarcy2p2chorizontal_stokes-reference.vtu => test_md_boundary_darcy2p2c_stokes1p2c_horizontal_stokes-reference.vtu} (100%)
rename test/references/{test_stokes1p2cdarcy2p2cvertical_darcy-reference.vtu => test_md_boundary_darcy2p2c_stokes1p2c_vertical_darcy-reference.vtu} (100%)
rename test/references/{test_stokes1p2cdarcy2p2cvertical_stokes-reference.vtu => test_md_boundary_darcy2p2c_stokes1p2c_vertical_stokes-reference.vtu} (100%)
rename test/references/{test_stokes1p2cnidarcy2p2cnihorizontal_darcy-reference.vtu => test_md_boundary_darcy2p2cni_stokes1p2cni_horizontal_darcy-reference.vtu} (100%)
rename test/references/{test_stokes1p2cnidarcy2p2cnihorizontal_stokes-reference.vtu => test_md_boundary_darcy2p2cni_stokes1p2cni_horizontal_stokes-reference.vtu} (100%)
rename test/references/{test_stokes1p2cnidarcy2p2cni_vertical_darcy-reference.vtu => test_md_boundary_darcy2p2cni_stokes1p2cni_vertical_darcy-reference.vtu} (100%)
rename test/references/{test_stokes1p2cnidarcy2p2cni_vertical_stokes-reference.vtu => test_md_boundary_darcy2p2cni_stokes1p2cni_vertical_stokes-reference.vtu} (100%)
rename test/references/{test_stokes1pdarcy2pvertical_darcy-reference.vtu => test_md_boundary_darcy2p_stokes1p_vertical_darcy-reference.vtu} (100%)
rename test/references/{test_stokes1pdarcy2pvertical_stokes-reference.vtu => test_md_boundary_darcy2p_stokes1p_vertical_stokes-reference.vtu} (100%)
diff --git a/test/multidomain/boundary/darcydarcy/1p_1p/CMakeLists.txt b/test/multidomain/boundary/darcydarcy/1p_1p/CMakeLists.txt
index 510844ae3d..1554116a03 100644
--- a/test/multidomain/boundary/darcydarcy/1p_1p/CMakeLists.txt
+++ b/test/multidomain/boundary/darcydarcy/1p_1p/CMakeLists.txt
@@ -1,22 +1,22 @@
-dune_add_test(NAME test_boundary_equaldim_1p_1p_half
+dune_add_test(NAME test_md_boundary_darcy1p_darcy1p_half
SOURCES main.cc
COMPILE_DEFINITIONS DOMAINSPLIT=0
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMD_ARGS --script fuzzy
--files ${CMAKE_SOURCE_DIR}/test/references/1ptestcc-reference.vtu
- ${CMAKE_CURRENT_BINARY_DIR}/md_1p_half_combined.vtu
- --command "${CMAKE_CURRENT_BINARY_DIR}/test_boundary_equaldim_1p_1p_half test_boundary_equaldim_1p_1p.input \
- -Problem.Name md_1p_half")
+ ${CMAKE_CURRENT_BINARY_DIR}/test_md_boundary_darcy1p_darcy1p_half_combined.vtu
+ --command "${CMAKE_CURRENT_BINARY_DIR}/test_md_boundary_darcy1p_darcy1p_half params.input \
+ -Vtk.OutputName test_md_boundary_darcy1p_darcy1p_half")
-dune_add_test(NAME test_boundary_equaldim_1p_1p_lens
+dune_add_test(NAME test_md_boundary_darcy1p_darcy1p_lens
SOURCES main.cc
COMPILE_DEFINITIONS DOMAINSPLIT=1
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMAKE_GUARD dune-subgrid_FOUND
CMD_ARGS --script fuzzy
--files ${CMAKE_SOURCE_DIR}/test/references/1ptestcc-reference.vtu
- ${CMAKE_CURRENT_BINARY_DIR}/md_1p_lens_combined.vtu
- --command "${CMAKE_CURRENT_BINARY_DIR}/test_boundary_equaldim_1p_1p_lens test_boundary_equaldim_1p_1p.input \
- -Problem.Name md_1p_lens")
+ ${CMAKE_CURRENT_BINARY_DIR}/test_md_boundary_darcy1p_darcy1p_lens_combined.vtu
+ --command "${CMAKE_CURRENT_BINARY_DIR}/test_md_boundary_darcy1p_darcy1p_lens params.input \
+ -Vtk.OutputName test_md_boundary_darcy1p_darcy1p_lens")
-dune_symlink_to_source_files(FILES "test_boundary_equaldim_1p_1p.input")
+dune_symlink_to_source_files(FILES "params.input")
diff --git a/test/multidomain/boundary/darcydarcy/1p_1p/main.cc b/test/multidomain/boundary/darcydarcy/1p_1p/main.cc
index 2a9686fbe0..4db3eb7566 100644
--- a/test/multidomain/boundary/darcydarcy/1p_1p/main.cc
+++ b/test/multidomain/boundary/darcydarcy/1p_1p/main.cc
@@ -311,7 +311,7 @@ int main(int argc, char** argv) try
Dune::VTKWriter<typename FullDomainGrid::LeafGridView> vtkWriter(gridView);
vtkWriter.addCellData(processRank, "process rank");
vtkWriter.addCellData(pressure, "pressure");
- const auto filename = getParam<std::string>("Problem.Name") + "_combined";
+ const auto filename = getParam<std::string>("Vtk.OutputName") + "_combined";
vtkWriter.write(filename);
////////////////////////////////////////////////////////////
diff --git a/test/multidomain/boundary/darcydarcy/1p_1p/test_boundary_equaldim_1p_1p.input b/test/multidomain/boundary/darcydarcy/1p_1p/params.input
similarity index 88%
rename from test/multidomain/boundary/darcydarcy/1p_1p/test_boundary_equaldim_1p_1p.input
rename to test/multidomain/boundary/darcydarcy/1p_1p/params.input
index 4db37b49c2..b85ae540b3 100644
--- a/test/multidomain/boundary/darcydarcy/1p_1p/test_boundary_equaldim_1p_1p.input
+++ b/test/multidomain/boundary/darcydarcy/1p_1p/params.input
@@ -5,6 +5,9 @@ DtInitial = 1.0
[Problem]
EnableGravity = true
+[Vtk]
+OutputName = test_md_boundary_darcy1p_darcy1p
+
[1.Problem]
Name = 1p_0
diff --git a/test/multidomain/boundary/darcydarcy/1p_1p/problem.hh b/test/multidomain/boundary/darcydarcy/1p_1p/problem.hh
index 35f82fa8d2..580a261fcf 100644
--- a/test/multidomain/boundary/darcydarcy/1p_1p/problem.hh
+++ b/test/multidomain/boundary/darcydarcy/1p_1p/problem.hh
@@ -60,7 +60,18 @@ public:
const std::string& paramGroup = "")
: ParentType(fvGridGeometry, paramGroup)
, couplingManager_(couplingManager)
- {}
+ {
+ // set a default name for the problem
+ problemName_ = getParam<std::string>("Vtk.OutputName")+ "_" + getParamFromGroup<std::string>(paramGroup, "Problem.Name");
+ }
+
+ /*!
+ * \brief The problem name.
+ */
+ const std::string& name() const
+ {
+ return problemName_;
+ }
/*!
* \brief Specifies which kind of boundary condition should be
@@ -156,6 +167,8 @@ public:
private:
std::shared_ptr<CouplingManager> couplingManager_;
static constexpr Scalar eps_ = 1e-7;
+ std::string problemName_;
+
};
} // end namespace Dumux
diff --git a/test/multidomain/boundary/darcydarcy/1p_2p/CMakeLists.txt b/test/multidomain/boundary/darcydarcy/1p_2p/CMakeLists.txt
index 5269028b9c..ef30c20bc6 100644
--- a/test/multidomain/boundary/darcydarcy/1p_2p/CMakeLists.txt
+++ b/test/multidomain/boundary/darcydarcy/1p_2p/CMakeLists.txt
@@ -1,12 +1,13 @@
-dune_add_test(NAME test_boundary_equaldim_1p_2p
+dune_add_test(NAME test_md_boundary_darcy1p_darcy2p
SOURCES main.cc
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMAKE_GUARD dune-subgrid_FOUND
CMD_ARGS --script fuzzy
- --files ${CMAKE_SOURCE_DIR}/test/references/md-boundary-1p2p-injection-2p-reference.vtu
- ${CMAKE_CURRENT_BINARY_DIR}/2p-00017.vtu
- ${CMAKE_SOURCE_DIR}/test/references/md-boundary-1p2p-injection-1p-reference.vtu
- ${CMAKE_CURRENT_BINARY_DIR}/1p-00017.vtu
- --command "${CMAKE_CURRENT_BINARY_DIR}/test_boundary_equaldim_1p_2p test_boundary_equaldim_1p_2p.input")
+ --files ${CMAKE_SOURCE_DIR}/test/references/test_md_boundary_darcy1p_darcy2p_2p-reference.vtu
+ ${CMAKE_CURRENT_BINARY_DIR}/test_md_boundary_darcy1p_darcy2p_2p-00017.vtu
+ ${CMAKE_SOURCE_DIR}/test/references/test_md_boundary_darcy1p_darcy2p_1p-reference.vtu
+ ${CMAKE_CURRENT_BINARY_DIR}/test_md_boundary_darcy1p_darcy2p_1p-00017.vtu
+ --command "${CMAKE_CURRENT_BINARY_DIR}/test_md_boundary_darcy1p_darcy2p params.input
+ -Vtk.OutputName test_md_boundary_darcy1p_darcy2p")
-dune_symlink_to_source_files(FILES "test_boundary_equaldim_1p_2p.input")
+dune_symlink_to_source_files(FILES "params.input")
diff --git a/test/multidomain/boundary/darcydarcy/1p_2p/test_boundary_equaldim_1p_2p.input b/test/multidomain/boundary/darcydarcy/1p_2p/params.input
similarity index 83%
rename from test/multidomain/boundary/darcydarcy/1p_2p/test_boundary_equaldim_1p_2p.input
rename to test/multidomain/boundary/darcydarcy/1p_2p/params.input
index 5534936730..28d525347c 100644
--- a/test/multidomain/boundary/darcydarcy/1p_2p/test_boundary_equaldim_1p_2p.input
+++ b/test/multidomain/boundary/darcydarcy/1p_2p/params.input
@@ -7,6 +7,9 @@ EnableGravity = false # horizontal layer
TwoPhaseDomainRadius = 1000 # 1km
InjectionRate = 1.0 # kg/s
+[Vtk]
+OutputName = test_md_boundary_darcy1p_darcy2p
+
[1.Problem]
Name = 1p
diff --git a/test/multidomain/boundary/darcydarcy/1p_2p/problem.hh b/test/multidomain/boundary/darcydarcy/1p_2p/problem.hh
index 69b5b217d8..dbcc8d7184 100644
--- a/test/multidomain/boundary/darcydarcy/1p_2p/problem.hh
+++ b/test/multidomain/boundary/darcydarcy/1p_2p/problem.hh
@@ -63,6 +63,15 @@ public:
, couplingManager_(couplingManager)
{
injectionRate_ = getParam<double>("Problem.InjectionRate");
+ problemName_ = getParam<std::string>("Vtk.OutputName") + "_" + getParamFromGroup<std::string>(paramGroup, "Problem.Name");
+ }
+
+ /*!
+ * \brief The problem name.
+ */
+ const std::string& name() const
+ {
+ return problemName_;
}
/*!
@@ -179,6 +188,7 @@ private:
Scalar injectionRate_;
std::shared_ptr<CouplingManager> couplingManager_;
static constexpr Scalar eps_ = 1e-7;
+ std::string problemName_;
};
} // end namespace Dumux
diff --git a/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/horizontalflow/CMakeLists.txt b/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/horizontalflow/CMakeLists.txt
index dbc8db69f0..0daa855e6b 100644
--- a/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/horizontalflow/CMakeLists.txt
+++ b/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/horizontalflow/CMakeLists.txt
@@ -1,13 +1,14 @@
add_input_file_links()
-dune_add_test(NAME test_stokes1p2cdarcy1p2chorizontal
- SOURCES test_stokes1p2cdarcy1p2chorizontal.cc
+dune_add_test(NAME test_md_boundary_darcy1p2c_stokes1p2c_horizontal
+ 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_stokes1p2cdarcy1p2chorizontal_stokes-reference.vtu
- ${CMAKE_CURRENT_BINARY_DIR}/test_stokes1p2cdarcy1p2chorizontal_stokes-00020.vtu
- ${CMAKE_SOURCE_DIR}/test/references/test_stokes1p2cdarcy1p2chorizontal_darcy-reference.vtu
- ${CMAKE_CURRENT_BINARY_DIR}/test_stokes1p2cdarcy1p2chorizontal_darcy-00020.vtu
+ --files ${CMAKE_SOURCE_DIR}/test/references/test_md_boundary_darcy1p2c_stokes1p2c_horizontal_stokes-reference.vtu
+ ${CMAKE_CURRENT_BINARY_DIR}/test_md_boundary_darcy1p2c_stokes1p2c_horizontal_stokes-00020.vtu
+ ${CMAKE_SOURCE_DIR}/test/references/test_md_boundary_darcy1p2c_stokes1p2c_horizontal_darcy-reference.vtu
+ ${CMAKE_CURRENT_BINARY_DIR}/test_md_boundary_darcy1p2c_stokes1p2c_horizontal_darcy-00020.vtu
- --command "${CMAKE_CURRENT_BINARY_DIR}/test_stokes1p2cdarcy1p2chorizontal test_stokes1p2cdarcy1p2chorizontal.input")
+ --command "${CMAKE_CURRENT_BINARY_DIR}/test_md_boundary_darcy1p2c_stokes1p2c_horizontal params.input
+ -Vtk.OutputName test_md_boundary_darcy1p2c_stokes1p2c_horizontal")
diff --git a/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/horizontalflow/test_stokes1p2cdarcy1p2chorizontal.cc b/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/horizontalflow/main.cc
similarity index 100%
rename from test/multidomain/boundary/stokesdarcy/1p2c_1p2c/horizontalflow/test_stokes1p2cdarcy1p2chorizontal.cc
rename to test/multidomain/boundary/stokesdarcy/1p2c_1p2c/horizontalflow/main.cc
diff --git a/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/horizontalflow/test_stokes1p2cdarcy1p2chorizontal.input b/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/horizontalflow/params.input
similarity index 90%
rename from test/multidomain/boundary/stokesdarcy/1p2c_1p2c/horizontalflow/test_stokes1p2cdarcy1p2chorizontal.input
rename to test/multidomain/boundary/stokesdarcy/1p2c_1p2c/horizontalflow/params.input
index 5e7d7becc0..36c9624800 100644
--- a/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/horizontalflow/test_stokes1p2cdarcy1p2chorizontal.input
+++ b/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/horizontalflow/params.input
@@ -31,12 +31,12 @@ Porosity = 0.3
Tortuosity = 0.5
[Problem]
-Name = test_stokes1p2cdarcy1p2chorizontal
EnableGravity = false
EnableInertiaTerms = true
[Vtk]
AddVelocity = 1
+OutputName = test_md_boundary_darcy1p2c_stokes1p2c_horizontal
[Assembly.NumericDifference]
BaseEpsilon = 1e-6
diff --git a/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/horizontalflow/darcyproblem.hh b/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/horizontalflow/problem_darcy.hh
similarity index 96%
rename from test/multidomain/boundary/stokesdarcy/1p2c_1p2c/horizontalflow/darcyproblem.hh
rename to test/multidomain/boundary/stokesdarcy/1p2c_1p2c/horizontalflow/problem_darcy.hh
index c5fcda2150..2d1811480f 100644
--- a/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/horizontalflow/darcyproblem.hh
+++ b/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/horizontalflow/problem_darcy.hh
@@ -31,7 +31,7 @@
#include <dumux/porousmediumflow/1pnc/model.hh>
#include <dumux/porousmediumflow/problem.hh>
-#include "./../1pspatialparams.hh"
+#include "./../spatialparams.hh"
#include <dumux/material/fluidsystems/1padapter.hh>
#include <dumux/material/fluidsystems/h2oair.hh>
@@ -118,6 +118,15 @@ public:
{
pressure_ = getParamFromGroup<Scalar>(this->paramGroup(), "Problem.Pressure");
initialMoleFraction_ = getParamFromGroup<Scalar>(this->paramGroup(), "Problem.InitialMoleFraction");
+ problemName_ = getParam<std::string>("Vtk.OutputName") + "_" + getParamFromGroup<std::string>(this->paramGroup(), "Problem.Name");
+ }
+
+ /*!
+ * \brief The problem name.
+ */
+ const std::string& name() const
+ {
+ return problemName_;
}
/*!
@@ -262,7 +271,7 @@ private:
Scalar eps_;
Scalar pressure_;
Scalar initialMoleFraction_;
-
+ std::string problemName_;
std::shared_ptr<CouplingManager> couplingManager_;
};
} //end namespace
diff --git a/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/horizontalflow/stokesproblem.hh b/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/horizontalflow/problem_stokes.hh
similarity index 97%
rename from test/multidomain/boundary/stokesdarcy/1p2c_1p2c/horizontalflow/stokesproblem.hh
rename to test/multidomain/boundary/stokesdarcy/1p2c_1p2c/horizontalflow/problem_stokes.hh
index c44dd876bf..beefb1a1d7 100644
--- a/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/horizontalflow/stokesproblem.hh
+++ b/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/horizontalflow/problem_stokes.hh
@@ -100,6 +100,15 @@ public:
inletVelocity_ = getParamFromGroup<Scalar>(this->paramGroup(), "Problem.Velocity");
pressure_ = getParamFromGroup<Scalar>(this->paramGroup(), "Problem.Pressure");
inletMoleFraction_ = getParamFromGroup<Scalar>(this->paramGroup(), "Problem.InletMoleFraction");
+ problemName_ = getParam<std::string>("Vtk.OutputName") + "_" + getParamFromGroup<std::string>(this->paramGroup(), "Problem.Name");
+ }
+
+ /*!
+ * \brief The problem name.
+ */
+ const std::string& name() const
+ {
+ return problemName_;
}
/*!
@@ -301,7 +310,7 @@ private:
Scalar pressure_;
Scalar inletMoleFraction_;
bool injectionState_;
-
+ std::string problemName_;
std::shared_ptr<CouplingManager> couplingManager_;
};
} //end namespace
diff --git a/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/1pspatialparams.hh b/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/spatialparams.hh
similarity index 100%
rename from test/multidomain/boundary/stokesdarcy/1p2c_1p2c/1pspatialparams.hh
rename to test/multidomain/boundary/stokesdarcy/1p2c_1p2c/spatialparams.hh
diff --git a/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/verticalflow/CMakeLists.txt b/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/verticalflow/CMakeLists.txt
index 386bc3ca8d..01153d2847 100644
--- a/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/verticalflow/CMakeLists.txt
+++ b/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/verticalflow/CMakeLists.txt
@@ -1,27 +1,29 @@
add_input_file_links()
-add_executable(test_stokes1p2cdarcy1p2cvertical EXCLUDE_FROM_ALL test_stokes1p2cdarcy1p2cvertical.cc)
+add_executable(test_md_boundary_darcy1p2c_stokes1p2c_vertical EXCLUDE_FROM_ALL main.cc)
-dune_add_test(NAME test_stokes1p2cdarcy1p2cvertical_diffusion
- TARGET test_stokes1p2cdarcy1p2cvertical
+dune_add_test(NAME test_md_boundary_darcy1p2c_stokes1p2c_vertical_diffusion
+ TARGET test_md_boundary_darcy1p2c_stokes1p2c_vertical
CMAKE_GUARD HAVE_UMFPACK
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMD_ARGS --script fuzzy
--zeroThreshold {"velocity_liq \(m/s\)":1e-20}
- --files ${CMAKE_SOURCE_DIR}/test/references/test_stokes1p2cdarcy1p2cvertical_diffusion_stokes-reference.vtu
- ${CMAKE_CURRENT_BINARY_DIR}/test_stokes1p2cdarcy1p2cvertical_diffusion_stokes-00003.vtu
- ${CMAKE_SOURCE_DIR}/test/references/test_stokes1p2cdarcy1p2cvertical_diffusion_darcy-reference.vtu
- ${CMAKE_CURRENT_BINARY_DIR}/test_stokes1p2cdarcy1p2cvertical_diffusion_darcy-00003.vtu
- --command "${CMAKE_CURRENT_BINARY_DIR}/test_stokes1p2cdarcy1p2cvertical test_stokes1p2cdarcy1p2cvertical_diffusion.input")
+ --files ${CMAKE_SOURCE_DIR}/test/references/test_md_boundary_darcy1p2c_stokes1p2c_vertical_diffusion_stokes-reference.vtu
+ ${CMAKE_CURRENT_BINARY_DIR}/test_md_boundary_darcy1p2c_stokes1p2c_vertical_diffusion_stokes-00003.vtu
+ ${CMAKE_SOURCE_DIR}/test/references/test_md_boundary_darcy1p2c_stokes1p2c_vertical_diffusion_darcy-reference.vtu
+ ${CMAKE_CURRENT_BINARY_DIR}/test_md_boundary_darcy1p2c_stokes1p2c_vertical_diffusion_darcy-00003.vtu
+ --command "${CMAKE_CURRENT_BINARY_DIR}/test_md_boundary_darcy1p2c_stokes1p2c_vertical params_diffusion.input
+ -Vtk.OutputName test_md_boundary_darcy1p2c_stokes1p2c_vertical_diffusion")
-dune_add_test(NAME test_stokes1p2cdarcy1p2cvertical_advection
- TARGET test_stokes1p2cdarcy1p2cvertical
+dune_add_test(NAME test_md_boundary_darcy1p2c_stokes1p2c_vertical_advection
+ TARGET test_md_boundary_darcy1p2c_stokes1p2c_vertical
CMAKE_GUARD HAVE_UMFPACK
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMD_ARGS --script fuzzy
--zeroThreshold {"velocity_liq \(m/s\)":1e-15}
- --files ${CMAKE_SOURCE_DIR}/test/references/test_stokes1p2cdarcy1p2cvertical_advection_stokes-reference.vtu
- ${CMAKE_CURRENT_BINARY_DIR}/test_stokes1p2cdarcy1p2cvertical_stokes-00030.vtu
- ${CMAKE_SOURCE_DIR}/test/references/test_stokes1p2cdarcy1p2cvertical_advection_darcy-reference.vtu
- ${CMAKE_CURRENT_BINARY_DIR}/test_stokes1p2cdarcy1p2cvertical_darcy-00030.vtu
- --command "${CMAKE_CURRENT_BINARY_DIR}/test_stokes1p2cdarcy1p2cvertical test_stokes1p2cdarcy1p2cvertical.input")
+ --files ${CMAKE_SOURCE_DIR}/test/references/test_md_boundary_darcy1p2c_stokes1p2c_vertical_advection_stokes-reference.vtu
+ ${CMAKE_CURRENT_BINARY_DIR}/test_md_boundary_darcy1p2c_stokes1p2c_vertical_stokes-00030.vtu
+ ${CMAKE_SOURCE_DIR}/test/references/test_md_boundary_darcy1p2c_stokes1p2c_vertical_advection_darcy-reference.vtu
+ ${CMAKE_CURRENT_BINARY_DIR}/test_md_boundary_darcy1p2c_stokes1p2c_vertical_darcy-00030.vtu
+ --command "${CMAKE_CURRENT_BINARY_DIR}/test_md_boundary_darcy1p2c_stokes1p2c_vertical params.input
+ -Vtk.OutputName test_md_boundary_darcy1p2c_stokes1p2c_vertical")
diff --git a/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/verticalflow/test_stokes1p2cdarcy1p2cvertical.cc b/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/verticalflow/main.cc
similarity index 100%
rename from test/multidomain/boundary/stokesdarcy/1p2c_1p2c/verticalflow/test_stokes1p2cdarcy1p2cvertical.cc
rename to test/multidomain/boundary/stokesdarcy/1p2c_1p2c/verticalflow/main.cc
diff --git a/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/verticalflow/test_stokes1p2cdarcy1p2cvertical.input b/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/verticalflow/params.input
similarity index 89%
rename from test/multidomain/boundary/stokesdarcy/1p2c_1p2c/verticalflow/test_stokes1p2cdarcy1p2cvertical.input
rename to test/multidomain/boundary/stokesdarcy/1p2c_1p2c/verticalflow/params.input
index 21a53d3b2e..a7b9dedb47 100644
--- a/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/verticalflow/test_stokes1p2cdarcy1p2cvertical.input
+++ b/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/verticalflow/params.input
@@ -27,12 +27,12 @@ Porosity = 1.0
Tortuosity = 0.5
[Problem]
-Name = test_stokes1p2cdarcy1p2cvertical
EnableGravity = false
EnableInertiaTerms = false
[Vtk]
AddVelocity = 1
+OutputName = test_md_boundary_darcy1p2c_stokes1p2c_vertical
[Assembly.NumericDifference]
BaseEpsilon = 1e-6
diff --git a/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/verticalflow/test_stokes1p2cdarcy1p2cvertical_diffusion.input b/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/verticalflow/params_diffusion.input
similarity index 86%
rename from test/multidomain/boundary/stokesdarcy/1p2c_1p2c/verticalflow/test_stokes1p2cdarcy1p2cvertical_diffusion.input
rename to test/multidomain/boundary/stokesdarcy/1p2c_1p2c/verticalflow/params_diffusion.input
index 5c9e75c74d..a989063c20 100644
--- a/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/verticalflow/test_stokes1p2cdarcy1p2cvertical_diffusion.input
+++ b/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/verticalflow/params_diffusion.input
@@ -26,10 +26,10 @@ Porosity = 1.0
Tortuosity = 1.0
[Problem]
-Name = test_stokes1p2cdarcy1p2cvertical_diffusion
EnableGravity = false
OnlyDiffusion = true
EnableInertiaTerms = false
[Vtk]
AddVelocity = 1
+OutputName = test_md_boundary_darcy1p2c_stokes1p2c_vertical_diffusion
diff --git a/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/verticalflow/darcyproblem.hh b/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/verticalflow/problem_darcy.hh
similarity index 96%
rename from test/multidomain/boundary/stokesdarcy/1p2c_1p2c/verticalflow/darcyproblem.hh
rename to test/multidomain/boundary/stokesdarcy/1p2c_1p2c/verticalflow/problem_darcy.hh
index 36e5e2255b..fe00a54ad7 100644
--- a/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/verticalflow/darcyproblem.hh
+++ b/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/verticalflow/problem_darcy.hh
@@ -31,7 +31,7 @@
#include <dumux/porousmediumflow/1pnc/model.hh>
#include <dumux/porousmediumflow/problem.hh>
-#include "./../1pspatialparams.hh"
+#include "./../spatialparams.hh"
#include <dumux/material/fluidsystems/1padapter.hh>
#include <dumux/material/fluidsystems/h2oair.hh>
@@ -119,6 +119,15 @@ public:
: ParentType(fvGridGeometry, "Darcy"), eps_(1e-7), couplingManager_(couplingManager), xBottom_(0.0)
{
pressure_ = getParamFromGroup<Scalar>(this->paramGroup(), "Problem.Pressure", 0.0);
+ problemName_ = getParam<std::string>("Vtk.OutputName") + "_" + getParamFromGroup<std::string>(this->paramGroup(), "Problem.Name");
+ }
+
+ /*!
+ * \brief The problem name.
+ */
+ const std::string& name() const
+ {
+ return problemName_;
}
/*!
@@ -295,7 +304,7 @@ private:
std::shared_ptr<CouplingManager> couplingManager_;
Scalar xBottom_;
Scalar pressure_;
-
+ std::string problemName_;
};
} //end namespace
diff --git a/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/verticalflow/stokesproblem.hh b/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/verticalflow/problem_stokes.hh
similarity index 97%
rename from test/multidomain/boundary/stokesdarcy/1p2c_1p2c/verticalflow/stokesproblem.hh
rename to test/multidomain/boundary/stokesdarcy/1p2c_1p2c/verticalflow/problem_stokes.hh
index f2f254df03..a207ce050a 100644
--- a/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/verticalflow/stokesproblem.hh
+++ b/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/verticalflow/problem_stokes.hh
@@ -104,6 +104,15 @@ public:
: ParentType(fvGridGeometry, "Stokes"), eps_(1e-6), couplingManager_(couplingManager), xTop_(1e-3)
{
inletVelocity_ = getParamFromGroup<Scalar>(this->paramGroup(), "Problem.Velocity");
+ problemName_ = getParam<std::string>("Vtk.OutputName") + "_" + getParamFromGroup<std::string>(this->paramGroup(), "Problem.Name");
+ }
+
+ /*!
+ * \brief The problem name.
+ */
+ const std::string& name() const
+ {
+ return problemName_;
}
/*!
@@ -329,6 +338,7 @@ private:
Scalar eps_;
Scalar inletVelocity_;
+ std::string problemName_;
std::shared_ptr<CouplingManager> couplingManager_;
Scalar xTop_;
diff --git a/test/multidomain/boundary/stokesdarcy/1p2c_2p2c/CMakeLists.txt b/test/multidomain/boundary/stokesdarcy/1p2c_2p2c/CMakeLists.txt
index 7f516e583d..4b57fe785f 100644
--- a/test/multidomain/boundary/stokesdarcy/1p2c_2p2c/CMakeLists.txt
+++ b/test/multidomain/boundary/stokesdarcy/1p2c_2p2c/CMakeLists.txt
@@ -1,26 +1,28 @@
add_input_file_links()
-dune_add_test(NAME test_stokes1p2cdarcy2p2chorizontal
- SOURCES test_stokes1p2cdarcy2p2chorizontal.cc
+dune_add_test(NAME test_md_boundary_darcy2p2c_stokes1p2c_horizontal
+ 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_stokes1p2cdarcy2p2chorizontal_stokes-reference.vtu
- ${CMAKE_CURRENT_BINARY_DIR}/test_stokes1p2cdarcy2p2chorizontal_stokes-00040.vtu
- ${CMAKE_SOURCE_DIR}/test/references/test_stokes1p2cdarcy2p2chorizontal_darcy-reference.vtu
- ${CMAKE_CURRENT_BINARY_DIR}/test_stokes1p2cdarcy2p2chorizontal_darcy-00040.vtu
+ --files ${CMAKE_SOURCE_DIR}/test/references/test_md_boundary_darcy2p2c_stokes1p2c_horizontal_stokes-reference.vtu
+ ${CMAKE_CURRENT_BINARY_DIR}/test_md_boundary_darcy2p2c_stokes1p2c_horizontal_stokes-00040.vtu
+ ${CMAKE_SOURCE_DIR}/test/references/test_md_boundary_darcy2p2c_stokes1p2c_horizontal_darcy-reference.vtu
+ ${CMAKE_CURRENT_BINARY_DIR}/test_md_boundary_darcy2p2c_stokes1p2c_horizontal_darcy-00040.vtu
- --command "${CMAKE_CURRENT_BINARY_DIR}/test_stokes1p2cdarcy2p2chorizontal test_stokes1p2cdarcy2p2chorizontal.input")
+ --command "${CMAKE_CURRENT_BINARY_DIR}/test_md_boundary_darcy2p2c_stokes1p2c_horizontal params.input
+ -Vtk.OutputName test_md_boundary_darcy2p2c_stokes1p2c_horizontal")
-dune_add_test(NAME test_stokes1p2cnidarcy2p2cnihorizontal
- SOURCES test_stokes1p2cdarcy2p2chorizontal.cc
+dune_add_test(NAME test_md_boundary_darcy2p2cni_stokes1p2cni_horizontal
+ SOURCES main.cc
COMPILE_DEFINITIONS NONISOTHERMAL=1
CMAKE_GUARD HAVE_UMFPACK
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMD_ARGS --script fuzzy
- --files ${CMAKE_SOURCE_DIR}/test/references/test_stokes1p2cnidarcy2p2cnihorizontal_stokes-reference.vtu
- ${CMAKE_CURRENT_BINARY_DIR}/test_stokes1p2cnidarcy2p2cnihorizontal_stokes-00040.vtu
- ${CMAKE_SOURCE_DIR}/test/references/test_stokes1p2cnidarcy2p2cnihorizontal_darcy-reference.vtu
- ${CMAKE_CURRENT_BINARY_DIR}/test_stokes1p2cnidarcy2p2cnihorizontal_darcy-00040.vtu
+ --files ${CMAKE_SOURCE_DIR}/test/references/test_md_boundary_darcy2p2cni_stokes1p2cni_horizontal_stokes-reference.vtu
+ ${CMAKE_CURRENT_BINARY_DIR}/test_md_boundary_darcy2p2cni_stokes1p2cni_horizontal_stokes-00040.vtu
+ ${CMAKE_SOURCE_DIR}/test/references/test_md_boundary_darcy2p2cni_stokes1p2cni_horizontal_darcy-reference.vtu
+ ${CMAKE_CURRENT_BINARY_DIR}/test_md_boundary_darcy2p2cni_stokes1p2cni_horizontal_darcy-00040.vtu
- --command "${CMAKE_CURRENT_BINARY_DIR}/test_stokes1p2cnidarcy2p2cnihorizontal test_stokes1p2cdarcy2p2chorizontal.input -Problem.Name test_stokes1p2cnidarcy2p2cnihorizontal")
+ --command "${CMAKE_CURRENT_BINARY_DIR}/test_md_boundary_darcy2p2cni_stokes1p2cni_horizontal params_nonisothermal.input
+ -Vtk.OutputName test_md_boundary_darcy2p2cni_stokes1p2cni_horizontal")
diff --git a/test/multidomain/boundary/stokesdarcy/1p2c_2p2c/test_stokes1p2cdarcy2p2chorizontal.cc b/test/multidomain/boundary/stokesdarcy/1p2c_2p2c/main.cc
similarity index 100%
rename from test/multidomain/boundary/stokesdarcy/1p2c_2p2c/test_stokes1p2cdarcy2p2chorizontal.cc
rename to test/multidomain/boundary/stokesdarcy/1p2c_2p2c/main.cc
diff --git a/test/multidomain/boundary/stokesdarcy/1p2c_2p2c/test_stokes1p2cdarcy2p2chorizontal.input b/test/multidomain/boundary/stokesdarcy/1p2c_2p2c/params.input
similarity index 94%
rename from test/multidomain/boundary/stokesdarcy/1p2c_2p2c/test_stokes1p2cdarcy2p2chorizontal.input
rename to test/multidomain/boundary/stokesdarcy/1p2c_2p2c/params.input
index 021d75a2c5..3730da1b95 100644
--- a/test/multidomain/boundary/stokesdarcy/1p2c_2p2c/test_stokes1p2cdarcy2p2chorizontal.input
+++ b/test/multidomain/boundary/stokesdarcy/1p2c_2p2c/params.input
@@ -51,6 +51,7 @@ EnableInertiaTerms = false
[Vtk]
AddVelocity = true
WriteFaceData = false
+OutputName = test_md_boundary_darcy2p2c_stokes1p2c_horizontal
[Newton]
MaxSteps = 12
diff --git a/test/multidomain/boundary/stokesdarcy/1p2c_2p2c/test_stokes1p2cnidarcy2p2cnihorizontal.input b/test/multidomain/boundary/stokesdarcy/1p2c_2p2c/params_nonisothermal.input
similarity index 93%
rename from test/multidomain/boundary/stokesdarcy/1p2c_2p2c/test_stokes1p2cnidarcy2p2cnihorizontal.input
rename to test/multidomain/boundary/stokesdarcy/1p2c_2p2c/params_nonisothermal.input
index 605981e244..22379f9a7f 100644
--- a/test/multidomain/boundary/stokesdarcy/1p2c_2p2c/test_stokes1p2cnidarcy2p2cnihorizontal.input
+++ b/test/multidomain/boundary/stokesdarcy/1p2c_2p2c/params_nonisothermal.input
@@ -51,6 +51,7 @@ EnableInertiaTerms = false
[Vtk]
AddVelocity = true
WriteFaceData = false
+OutputName = test_md_boundary_darcy2p2cni_stokes1p2cni_horizontal
[Newton]
MaxSteps = 12
diff --git a/test/multidomain/boundary/stokesdarcy/1p2c_2p2c/darcyproblem.hh b/test/multidomain/boundary/stokesdarcy/1p2c_2p2c/problem_darcy.hh
similarity index 97%
rename from test/multidomain/boundary/stokesdarcy/1p2c_2p2c/darcyproblem.hh
rename to test/multidomain/boundary/stokesdarcy/1p2c_2p2c/problem_darcy.hh
index eccbb8bd2d..836aca4033 100644
--- a/test/multidomain/boundary/stokesdarcy/1p2c_2p2c/darcyproblem.hh
+++ b/test/multidomain/boundary/stokesdarcy/1p2c_2p2c/problem_darcy.hh
@@ -123,6 +123,15 @@ public:
diffCoeffAvgType_ = StokesDarcyCouplingOptions::stringToEnum(DiffusionCoefficientAveragingType{},
getParamFromGroup<std::string>(this->paramGroup(), "Problem.InterfaceDiffusionCoefficientAvg"));
+ problemName_ = getParam<std::string>("Vtk.OutputName") + "_" + getParamFromGroup<std::string>(this->paramGroup(), "Problem.Name");
+ }
+
+ /*!
+ * \brief The problem name.
+ */
+ const std::string& name() const
+ {
+ return problemName_;
}
/*!
@@ -335,7 +344,7 @@ private:
Scalar initialSw_;
Scalar temperature_;
int initialPhasePresence_;
-
+ std::string problemName_;
Scalar eps_;
std::shared_ptr<CouplingManager> couplingManager_;
diff --git a/test/multidomain/boundary/stokesdarcy/1p2c_2p2c/stokesproblem.hh b/test/multidomain/boundary/stokesdarcy/1p2c_2p2c/problem_stokes.hh
similarity index 98%
rename from test/multidomain/boundary/stokesdarcy/1p2c_2p2c/stokesproblem.hh
rename to test/multidomain/boundary/stokesdarcy/1p2c_2p2c/problem_stokes.hh
index be15859207..02a7b7d291 100644
--- a/test/multidomain/boundary/stokesdarcy/1p2c_2p2c/stokesproblem.hh
+++ b/test/multidomain/boundary/stokesdarcy/1p2c_2p2c/problem_stokes.hh
@@ -120,6 +120,15 @@ public:
diffCoeffAvgType_ = StokesDarcyCouplingOptions::stringToEnum(DiffusionCoefficientAveragingType{},
getParamFromGroup<std::string>(this->paramGroup(), "Problem.InterfaceDiffusionCoefficientAvg"));
+ problemName_ = getParam<std::string>("Vtk.OutputName") + "_" + getParamFromGroup<std::string>(this->paramGroup(), "Problem.Name");
+ }
+
+ /*!
+ * \brief The problem name.
+ */
+ const std::string& name() const
+ {
+ return problemName_;
}
/*!
@@ -396,7 +405,7 @@ private:
Scalar refPressure_;
Scalar refMoleFrac_;
Scalar refTemperature_;
-
+ std::string problemName_;
TimeLoopPtr timeLoop_;
std::shared_ptr<CouplingManager> couplingManager_;
diff --git a/test/multidomain/boundary/stokesdarcy/1p_1p/horizontalflow/CMakeLists.txt b/test/multidomain/boundary/stokesdarcy/1p_1p/horizontalflow/CMakeLists.txt
index 7dbc81c611..f634116af9 100644
--- a/test/multidomain/boundary/stokesdarcy/1p_1p/horizontalflow/CMakeLists.txt
+++ b/test/multidomain/boundary/stokesdarcy/1p_1p/horizontalflow/CMakeLists.txt
@@ -1,13 +1,14 @@
add_input_file_links()
-dune_add_test(NAME test_stokes1pdarcy1phorizontal
- SOURCES test_stokes1pdarcy1phorizontal.cc
+dune_add_test(NAME test_md_boundary_darcy1p_stokes1p_horizontal
+ 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_stokes1pdarcy1phorizontal_stokes-reference.vtu
- ${CMAKE_CURRENT_BINARY_DIR}/test_stokes1pdarcy1phorizontal_stokes-00001.vtu
- ${CMAKE_SOURCE_DIR}/test/references/test_stokes1pdarcy1phorizontal_darcy-reference.vtu
- ${CMAKE_CURRENT_BINARY_DIR}/test_stokes1pdarcy1phorizontal_darcy-00001.vtu
+ --files ${CMAKE_SOURCE_DIR}/test/references/test_md_boundary_darcy1p_stokes1p_horizontal_stokes-reference.vtu
+ ${CMAKE_CURRENT_BINARY_DIR}/test_md_boundary_darcy1p_stokes1p_horizontal_stokes-00001.vtu
+ ${CMAKE_SOURCE_DIR}/test/references/test_md_boundary_darcy1p_stokes1p_horizontal_darcy-reference.vtu
+ ${CMAKE_CURRENT_BINARY_DIR}/test_md_boundary_darcy1p_stokes1p_horizontal_darcy-00001.vtu
- --command "${CMAKE_CURRENT_BINARY_DIR}/test_stokes1pdarcy1phorizontal test_stokes1pdarcy1phorizontal.input")
+ --command "${CMAKE_CURRENT_BINARY_DIR}/test_md_boundary_darcy1p_stokes1p_horizontal params.input
+ -Vtk.OutputName test_md_boundary_darcy1p_stokes1p_horizontal")
diff --git a/test/multidomain/boundary/stokesdarcy/1p_1p/horizontalflow/test_stokes1pdarcy1phorizontal.cc b/test/multidomain/boundary/stokesdarcy/1p_1p/horizontalflow/main.cc
similarity index 100%
rename from test/multidomain/boundary/stokesdarcy/1p_1p/horizontalflow/test_stokes1pdarcy1phorizontal.cc
rename to test/multidomain/boundary/stokesdarcy/1p_1p/horizontalflow/main.cc
diff --git a/test/multidomain/boundary/stokesdarcy/1p_1p/horizontalflow/test_stokes1pdarcy1phorizontal.input b/test/multidomain/boundary/stokesdarcy/1p_1p/horizontalflow/params.input
similarity index 84%
rename from test/multidomain/boundary/stokesdarcy/1p_1p/horizontalflow/test_stokes1pdarcy1phorizontal.input
rename to test/multidomain/boundary/stokesdarcy/1p_1p/horizontalflow/params.input
index 733159e0a5..efc0963b12 100644
--- a/test/multidomain/boundary/stokesdarcy/1p_1p/horizontalflow/test_stokes1pdarcy1phorizontal.input
+++ b/test/multidomain/boundary/stokesdarcy/1p_1p/horizontalflow/params.input
@@ -18,9 +18,10 @@ Name = darcy
Permeability = 1e-6 # m^2
AlphaBeaversJoseph = 1.0
+[Vtk]
+OutputName = test_md_boundary_stokes1p_darcy1p_horizontal
[Problem]
-Name = test_stokes1pdarcy1phorizontal
EnableGravity = false
EnableInertiaTerms = false
diff --git a/test/multidomain/boundary/stokesdarcy/1p_1p/horizontalflow/darcyproblem.hh b/test/multidomain/boundary/stokesdarcy/1p_1p/horizontalflow/problem_darcy.hh
similarity index 96%
rename from test/multidomain/boundary/stokesdarcy/1p_1p/horizontalflow/darcyproblem.hh
rename to test/multidomain/boundary/stokesdarcy/1p_1p/horizontalflow/problem_darcy.hh
index 4e9885ace5..725ff9beab 100644
--- a/test/multidomain/boundary/stokesdarcy/1p_1p/horizontalflow/darcyproblem.hh
+++ b/test/multidomain/boundary/stokesdarcy/1p_1p/horizontalflow/problem_darcy.hh
@@ -31,7 +31,7 @@
#include <dumux/porousmediumflow/1p/model.hh>
#include <dumux/porousmediumflow/problem.hh>
-#include "./../1pspatialparams.hh"
+#include "./../spatialparams.hh"
#include <dumux/material/components/simpleh2o.hh>
#include <dumux/material/fluidsystems/1pliquid.hh>
@@ -92,7 +92,18 @@ public:
DarcySubProblem(std::shared_ptr<const FVGridGeometry> fvGridGeometry,
std::shared_ptr<CouplingManager> couplingManager)
: ParentType(fvGridGeometry, "Darcy"), eps_(1e-7), couplingManager_(couplingManager)
- {}
+ {
+ problemName_ = getParam<std::string>("Vtk.OutputName") + "_" + getParamFromGroup<std::string>(this->paramGroup(), "Problem.Name");
+ }
+
+ /*!
+ * \brief The problem name.
+ */
+ const std::string& name() const
+ {
+ return problemName_;
+ }
+
/*!
* \name Simulation steering
@@ -247,6 +258,7 @@ private:
Scalar eps_;
std::shared_ptr<CouplingManager> couplingManager_;
+ std::string problemName_;
};
} //end namespace
diff --git a/test/multidomain/boundary/stokesdarcy/1p_1p/horizontalflow/stokesproblem.hh b/test/multidomain/boundary/stokesdarcy/1p_1p/horizontalflow/problem_stokes.hh
similarity index 96%
rename from test/multidomain/boundary/stokesdarcy/1p_1p/horizontalflow/stokesproblem.hh
rename to test/multidomain/boundary/stokesdarcy/1p_1p/horizontalflow/problem_stokes.hh
index c09d5991d8..06dee95386 100644
--- a/test/multidomain/boundary/stokesdarcy/1p_1p/horizontalflow/stokesproblem.hh
+++ b/test/multidomain/boundary/stokesdarcy/1p_1p/horizontalflow/problem_stokes.hh
@@ -95,6 +95,15 @@ public:
: ParentType(fvGridGeometry, "Stokes"), eps_(1e-6), couplingManager_(couplingManager)
{
deltaP_ = getParamFromGroup<Scalar>(this->paramGroup(), "Problem.PressureDifference");
+ problemName_ = getParam<std::string>("Vtk.OutputName") + "_" + getParamFromGroup<std::string>(this->paramGroup(), "Problem.Name");
+ }
+
+ /*!
+ * \brief The problem name.
+ */
+ const std::string& name() const
+ {
+ return problemName_;
}
/*!
@@ -262,6 +271,7 @@ private:
Scalar eps_;
Scalar deltaP_;
+ std::string problemName_;
std::shared_ptr<CouplingManager> couplingManager_;
};
diff --git a/test/multidomain/boundary/stokesdarcy/1p_1p/1pspatialparams.hh b/test/multidomain/boundary/stokesdarcy/1p_1p/spatialparams.hh
similarity index 100%
rename from test/multidomain/boundary/stokesdarcy/1p_1p/1pspatialparams.hh
rename to test/multidomain/boundary/stokesdarcy/1p_1p/spatialparams.hh
diff --git a/test/multidomain/boundary/stokesdarcy/1p_1p/verticalflow/CMakeLists.txt b/test/multidomain/boundary/stokesdarcy/1p_1p/verticalflow/CMakeLists.txt
index 2eb1f7d1f0..5f05e970cf 100644
--- a/test/multidomain/boundary/stokesdarcy/1p_1p/verticalflow/CMakeLists.txt
+++ b/test/multidomain/boundary/stokesdarcy/1p_1p/verticalflow/CMakeLists.txt
@@ -1,14 +1,15 @@
add_input_file_links()
-dune_add_test(NAME test_stokes1pdarcy1pvertical
- SOURCES test_stokes1pdarcy1pvertical.cc
+dune_add_test(NAME test_md_boundary_darcy1p_stokes1p_vertical
+ 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_stokes1pdarcy1pvertical_stokes-reference.vtu
- ${CMAKE_CURRENT_BINARY_DIR}/test_stokes1pdarcy1pvertical_stokes-00001.vtu
- ${CMAKE_SOURCE_DIR}/test/references/test_stokes1pdarcy1pvertical_darcy-reference.vtu
- ${CMAKE_CURRENT_BINARY_DIR}/test_stokes1pdarcy1pvertical_darcy-00001.vtu
+ --files ${CMAKE_SOURCE_DIR}/test/references/test_md_boundary_darcy1p_stokes1p_vertical_stokes-reference.vtu
+ ${CMAKE_CURRENT_BINARY_DIR}/test_md_boundary_darcy1p_stokes1p_vertical_stokes-00001.vtu
+ ${CMAKE_SOURCE_DIR}/test/references/test_md_boundary_darcy1p_stokes1p_vertical_darcy-reference.vtu
+ ${CMAKE_CURRENT_BINARY_DIR}/test_md_boundary_darcy1p_stokes1p_vertical_darcy-00001.vtu
- --command "${CMAKE_CURRENT_BINARY_DIR}/test_stokes1pdarcy1pvertical test_stokes1pdarcy1pvertical.input"
+ --command "${CMAKE_CURRENT_BINARY_DIR}/test_md_boundary_darcy1p_stokes1p_vertical params.input
+ -Vtk.OutputName test_md_boundary_darcy1p_stokes1p_vertical"
--zeroThreshold {"velocity_liq \(m/s\)_0":6e-17})
diff --git a/test/multidomain/boundary/stokesdarcy/1p_1p/verticalflow/test_stokes1pdarcy1pvertical.cc b/test/multidomain/boundary/stokesdarcy/1p_1p/verticalflow/main.cc
similarity index 100%
rename from test/multidomain/boundary/stokesdarcy/1p_1p/verticalflow/test_stokes1pdarcy1pvertical.cc
rename to test/multidomain/boundary/stokesdarcy/1p_1p/verticalflow/main.cc
diff --git a/test/multidomain/boundary/stokesdarcy/1p_1p/verticalflow/test_stokes1pdarcy1pvertical.input b/test/multidomain/boundary/stokesdarcy/1p_1p/verticalflow/params.input
similarity index 86%
rename from test/multidomain/boundary/stokesdarcy/1p_1p/verticalflow/test_stokes1pdarcy1pvertical.input
rename to test/multidomain/boundary/stokesdarcy/1p_1p/verticalflow/params.input
index 1668c9f102..b5f39b858a 100644
--- a/test/multidomain/boundary/stokesdarcy/1p_1p/verticalflow/test_stokes1pdarcy1pvertical.input
+++ b/test/multidomain/boundary/stokesdarcy/1p_1p/verticalflow/params.input
@@ -20,10 +20,12 @@ Permeability = 1e-10 # m^2
AlphaBeaversJoseph = 1.0
[Problem]
-Name = test_stokes1pdarcy1pvertical
EnableGravity = false
EnableInertiaTerms = false
+[Vtk]
+OutputName = test_md_boundary_darcy1p_stokes1p_vertical
+
[Vtk]
AddVelocity = 1
diff --git a/test/multidomain/boundary/stokesdarcy/1p_1p/verticalflow/darcyproblem.hh b/test/multidomain/boundary/stokesdarcy/1p_1p/verticalflow/problem_darcy.hh
similarity index 96%
rename from test/multidomain/boundary/stokesdarcy/1p_1p/verticalflow/darcyproblem.hh
rename to test/multidomain/boundary/stokesdarcy/1p_1p/verticalflow/problem_darcy.hh
index d5ce2822e1..dcf978d92c 100644
--- a/test/multidomain/boundary/stokesdarcy/1p_1p/verticalflow/darcyproblem.hh
+++ b/test/multidomain/boundary/stokesdarcy/1p_1p/verticalflow/problem_darcy.hh
@@ -31,7 +31,7 @@
#include <dumux/porousmediumflow/1p/model.hh>
#include <dumux/porousmediumflow/problem.hh>
-#include "./../1pspatialparams.hh"
+#include "./../spatialparams.hh"
#include <dumux/material/components/simpleh2o.hh>
#include <dumux/material/fluidsystems/1pliquid.hh>
@@ -105,6 +105,15 @@ public:
: ParentType(fvGridGeometry, "Darcy"), eps_(1e-7), couplingManager_(couplingManager)
{
pressure_ = getParamFromGroup<Scalar>(this->paramGroup(), "Problem.Pressure", 0.0);
+ problemName_ = getParam<std::string>("Vtk.OutputName") + "_" + getParamFromGroup<std::string>(this->paramGroup(), "Problem.Name");
+ }
+
+ /*!
+ * \brief The problem name.
+ */
+ const std::string& name() const
+ {
+ return problemName_;
}
/*!
@@ -266,7 +275,7 @@ private:
Scalar eps_;
Scalar pressure_;
-
+ std::string problemName_;
std::shared_ptr<CouplingManager> couplingManager_;
};
} //end namespace
diff --git a/test/multidomain/boundary/stokesdarcy/1p_1p/verticalflow/stokesproblem.hh b/test/multidomain/boundary/stokesdarcy/1p_1p/verticalflow/problem_stokes.hh
similarity index 97%
rename from test/multidomain/boundary/stokesdarcy/1p_1p/verticalflow/stokesproblem.hh
rename to test/multidomain/boundary/stokesdarcy/1p_1p/verticalflow/problem_stokes.hh
index 488f69171e..9299a48ebe 100644
--- a/test/multidomain/boundary/stokesdarcy/1p_1p/verticalflow/stokesproblem.hh
+++ b/test/multidomain/boundary/stokesdarcy/1p_1p/verticalflow/problem_stokes.hh
@@ -98,6 +98,15 @@ public:
: ParentType(fvGridGeometry, "Stokes"), eps_(1e-6), couplingManager_(couplingManager)
{
inletVelocity_ = getParamFromGroup<Scalar>(this->paramGroup(), "Problem.Velocity");
+ problemName_ = getParam<std::string>("Vtk.OutputName") + "_" + getParamFromGroup<std::string>(this->paramGroup(), "Problem.Name");
+ }
+
+ /*!
+ * \brief The problem name.
+ */
+ const std::string& name() const
+ {
+ return problemName_;
}
/*!
@@ -285,7 +294,7 @@ private:
Scalar eps_;
Scalar inletVelocity_;
-
+ std::string problemName_;
std::shared_ptr<CouplingManager> couplingManager_;
};
} //end namespace
diff --git a/test/multidomain/boundary/stokesdarcy/1p_2p/CMakeLists.txt b/test/multidomain/boundary/stokesdarcy/1p_2p/CMakeLists.txt
index 69c173688d..4de5307e55 100644
--- a/test/multidomain/boundary/stokesdarcy/1p_2p/CMakeLists.txt
+++ b/test/multidomain/boundary/stokesdarcy/1p_2p/CMakeLists.txt
@@ -1,14 +1,15 @@
add_input_file_links()
-dune_add_test(NAME test_stokes1pdarcy2pvertical
- SOURCES test_stokes1pdarcy2pvertical.cc
+dune_add_test(NAME test_md_boundary_darcy2p_stokes1p_vertical
+ 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_stokes1pdarcy2pvertical_stokes-reference.vtu
- ${CMAKE_CURRENT_BINARY_DIR}/test_stokes1pdarcy2pvertical_stokes-00024.vtu
- ${CMAKE_SOURCE_DIR}/test/references/test_stokes1pdarcy2pvertical_darcy-reference.vtu
- ${CMAKE_CURRENT_BINARY_DIR}/test_stokes1pdarcy2pvertical_darcy-00024.vtu
+ --files ${CMAKE_SOURCE_DIR}/test/references/test_md_boundary_darcy2p_stokes1p_vertical_stokes-reference.vtu
+ ${CMAKE_CURRENT_BINARY_DIR}/test_md_boundary_darcy2p_stokes1p_vertical_stokes-00024.vtu
+ ${CMAKE_SOURCE_DIR}/test/references/test_md_boundary_darcy2p_stokes1p_vertical_darcy-reference.vtu
+ ${CMAKE_CURRENT_BINARY_DIR}/test_md_boundary_darcy2p_stokes1p_vertical_darcy-00024.vtu
- --command "${CMAKE_CURRENT_BINARY_DIR}/test_stokes1pdarcy2pvertical test_stokes1pdarcy2pvertical.input"
+ --command "${CMAKE_CURRENT_BINARY_DIR}/test_md_boundary_darcy2p_stokes1p_vertical params.input
+ -Vtk.OutputName test_md_boundary_darcy2p_stokes1p_vertical"
--zeroThreshold {"velocity_liq \(m/s\)_0":1e-14,"velocity_gas \(m/s\)":1e-15})
diff --git a/test/multidomain/boundary/stokesdarcy/1p_2p/test_stokes1pdarcy2pvertical.cc b/test/multidomain/boundary/stokesdarcy/1p_2p/main.cc
similarity index 100%
rename from test/multidomain/boundary/stokesdarcy/1p_2p/test_stokes1pdarcy2pvertical.cc
rename to test/multidomain/boundary/stokesdarcy/1p_2p/main.cc
diff --git a/test/multidomain/boundary/stokesdarcy/1p_2p/test_stokes1pdarcy2pvertical.input b/test/multidomain/boundary/stokesdarcy/1p_2p/params.input
similarity index 91%
rename from test/multidomain/boundary/stokesdarcy/1p_2p/test_stokes1pdarcy2pvertical.input
rename to test/multidomain/boundary/stokesdarcy/1p_2p/params.input
index 7cb75e9002..a5532ea868 100644
--- a/test/multidomain/boundary/stokesdarcy/1p_2p/test_stokes1pdarcy2pvertical.input
+++ b/test/multidomain/boundary/stokesdarcy/1p_2p/params.input
@@ -34,12 +34,12 @@ VgAlpha = 6.371e-4
VgN = 8.0
[Problem]
-Name = test_stokes1pdarcy2pvertical
EnableGravity = false
EnableInertiaTerms = false
[Vtk]
AddVelocity = 1
+OutputName = test_md_boundary_darcy2p_stokes1p_vertical
[Assembly.NumericDifference]
BaseEpsilon = 1e-6
diff --git a/test/multidomain/boundary/stokesdarcy/1p_2p/darcyproblem.hh b/test/multidomain/boundary/stokesdarcy/1p_2p/problem_darcy.hh
similarity index 97%
rename from test/multidomain/boundary/stokesdarcy/1p_2p/darcyproblem.hh
rename to test/multidomain/boundary/stokesdarcy/1p_2p/problem_darcy.hh
index 84d81d0548..84adb36f7a 100644
--- a/test/multidomain/boundary/stokesdarcy/1p_2p/darcyproblem.hh
+++ b/test/multidomain/boundary/stokesdarcy/1p_2p/problem_darcy.hh
@@ -106,6 +106,15 @@ public:
pressure_ = getParamFromGroup<Scalar>(this->paramGroup(), "Problem.Pressure");
saturation_ = getParamFromGroup<Scalar>(this->paramGroup(), "Problem.Saturation");
temperature_ = getParamFromGroup<Scalar>(this->paramGroup(), "Problem.Temperature");
+ problemName_ = getParam<std::string>("Vtk.OutputName") + "_" + getParamFromGroup<std::string>(this->paramGroup(), "Problem.Name");
+ }
+
+ /*!
+ * \brief The problem name.
+ */
+ const std::string& name() const
+ {
+ return problemName_;
}
/*!
@@ -281,7 +290,7 @@ private:
Scalar pressure_;
Scalar saturation_;
Scalar temperature_;
-
+ std::string problemName_;
std::shared_ptr<CouplingManager> couplingManager_;
};
} //end namespace
diff --git a/test/multidomain/boundary/stokesdarcy/1p_2p/stokesproblem.hh b/test/multidomain/boundary/stokesdarcy/1p_2p/problem_stokes.hh
similarity index 97%
rename from test/multidomain/boundary/stokesdarcy/1p_2p/stokesproblem.hh
rename to test/multidomain/boundary/stokesdarcy/1p_2p/problem_stokes.hh
index a0bcaa5898..2d0366021f 100644
--- a/test/multidomain/boundary/stokesdarcy/1p_2p/stokesproblem.hh
+++ b/test/multidomain/boundary/stokesdarcy/1p_2p/problem_stokes.hh
@@ -92,6 +92,15 @@ public:
inletVelocity_ = getParamFromGroup<Scalar>(this->paramGroup(), "Problem.Velocity");
pressure_ = getParamFromGroup<Scalar>(this->paramGroup(), "Problem.Pressure");
temperature_ = getParamFromGroup<Scalar>(this->paramGroup(), "Problem.Temperature");
+ problemName_ = getParam<std::string>("Vtk.OutputName") + "_" + getParamFromGroup<std::string>(this->paramGroup(), "Problem.Name");
+ }
+
+ /*!
+ * \brief The problem name.
+ */
+ const std::string& name() const
+ {
+ return problemName_;
}
/*!
@@ -260,7 +269,7 @@ private:
Scalar inletVelocity_;
Scalar pressure_;
Scalar temperature_;
-
+ std::string problemName_;
std::shared_ptr<CouplingManager> couplingManager_;
};
} //end namespace
diff --git a/test/references/test_stokes1p2cdarcy1p2chorizontal_darcy-reference.vtu b/test/references/test_md_boundary_darcy1p2c_stokes1p2c_horizontal_darcy-reference.vtu
similarity index 100%
rename from test/references/test_stokes1p2cdarcy1p2chorizontal_darcy-reference.vtu
rename to test/references/test_md_boundary_darcy1p2c_stokes1p2c_horizontal_darcy-reference.vtu
diff --git a/test/references/test_stokes1p2cdarcy1p2chorizontal_stokes-reference.vtu b/test/references/test_md_boundary_darcy1p2c_stokes1p2c_horizontal_stokes-reference.vtu
similarity index 100%
rename from test/references/test_stokes1p2cdarcy1p2chorizontal_stokes-reference.vtu
rename to test/references/test_md_boundary_darcy1p2c_stokes1p2c_horizontal_stokes-reference.vtu
diff --git a/test/references/test_stokes1p2cdarcy1p2cvertical_advection_darcy-reference.vtu b/test/references/test_md_boundary_darcy1p2c_stokes1p2c_vertical_advection_darcy-reference.vtu
similarity index 100%
rename from test/references/test_stokes1p2cdarcy1p2cvertical_advection_darcy-reference.vtu
rename to test/references/test_md_boundary_darcy1p2c_stokes1p2c_vertical_advection_darcy-reference.vtu
diff --git a/test/references/test_stokes1p2cdarcy1p2cvertical_advection_stokes-reference.vtu b/test/references/test_md_boundary_darcy1p2c_stokes1p2c_vertical_advection_stokes-reference.vtu
similarity index 100%
rename from test/references/test_stokes1p2cdarcy1p2cvertical_advection_stokes-reference.vtu
rename to test/references/test_md_boundary_darcy1p2c_stokes1p2c_vertical_advection_stokes-reference.vtu
diff --git a/test/references/test_stokes1p2cdarcy1p2cvertical_diffusion_darcy-reference.vtu b/test/references/test_md_boundary_darcy1p2c_stokes1p2c_vertical_diffusion_darcy-reference.vtu
similarity index 100%
rename from test/references/test_stokes1p2cdarcy1p2cvertical_diffusion_darcy-reference.vtu
rename to test/references/test_md_boundary_darcy1p2c_stokes1p2c_vertical_diffusion_darcy-reference.vtu
diff --git a/test/references/test_stokes1p2cdarcy1p2cvertical_diffusion_stokes-reference.vtu b/test/references/test_md_boundary_darcy1p2c_stokes1p2c_vertical_diffusion_stokes-reference.vtu
similarity index 100%
rename from test/references/test_stokes1p2cdarcy1p2cvertical_diffusion_stokes-reference.vtu
rename to test/references/test_md_boundary_darcy1p2c_stokes1p2c_vertical_diffusion_stokes-reference.vtu
diff --git a/test/references/md-boundary-1p2p-injection-1p-reference.vtu b/test/references/test_md_boundary_darcy1p_darcy2p_1p-reference.vtu
similarity index 100%
rename from test/references/md-boundary-1p2p-injection-1p-reference.vtu
rename to test/references/test_md_boundary_darcy1p_darcy2p_1p-reference.vtu
diff --git a/test/references/md-boundary-1p2p-injection-2p-reference.vtu b/test/references/test_md_boundary_darcy1p_darcy2p_2p-reference.vtu
similarity index 100%
rename from test/references/md-boundary-1p2p-injection-2p-reference.vtu
rename to test/references/test_md_boundary_darcy1p_darcy2p_2p-reference.vtu
diff --git a/test/references/test_stokes1pdarcy1phorizontal_darcy-reference.vtu b/test/references/test_md_boundary_darcy1p_stokes1p_horizontal_darcy-reference.vtu
similarity index 100%
rename from test/references/test_stokes1pdarcy1phorizontal_darcy-reference.vtu
rename to test/references/test_md_boundary_darcy1p_stokes1p_horizontal_darcy-reference.vtu
diff --git a/test/references/test_stokes1pdarcy1phorizontal_stokes-reference.vtu b/test/references/test_md_boundary_darcy1p_stokes1p_horizontal_stokes-reference.vtu
similarity index 100%
rename from test/references/test_stokes1pdarcy1phorizontal_stokes-reference.vtu
rename to test/references/test_md_boundary_darcy1p_stokes1p_horizontal_stokes-reference.vtu
diff --git a/test/references/test_stokes1pdarcy1pvertical_darcy-reference.vtu b/test/references/test_md_boundary_darcy1p_stokes1p_vertical_darcy-reference.vtu
similarity index 100%
rename from test/references/test_stokes1pdarcy1pvertical_darcy-reference.vtu
rename to test/references/test_md_boundary_darcy1p_stokes1p_vertical_darcy-reference.vtu
diff --git a/test/references/test_stokes1pdarcy1pvertical_stokes-reference.vtu b/test/references/test_md_boundary_darcy1p_stokes1p_vertical_stokes-reference.vtu
similarity index 100%
rename from test/references/test_stokes1pdarcy1pvertical_stokes-reference.vtu
rename to test/references/test_md_boundary_darcy1p_stokes1p_vertical_stokes-reference.vtu
diff --git a/test/references/test_stokes1p2cdarcy2p2chorizontal_darcy-reference.vtu b/test/references/test_md_boundary_darcy2p2c_stokes1p2c_horizontal_darcy-reference.vtu
similarity index 100%
rename from test/references/test_stokes1p2cdarcy2p2chorizontal_darcy-reference.vtu
rename to test/references/test_md_boundary_darcy2p2c_stokes1p2c_horizontal_darcy-reference.vtu
diff --git a/test/references/test_stokes1p2cdarcy2p2chorizontal_stokes-reference.vtu b/test/references/test_md_boundary_darcy2p2c_stokes1p2c_horizontal_stokes-reference.vtu
similarity index 100%
rename from test/references/test_stokes1p2cdarcy2p2chorizontal_stokes-reference.vtu
rename to test/references/test_md_boundary_darcy2p2c_stokes1p2c_horizontal_stokes-reference.vtu
diff --git a/test/references/test_stokes1p2cdarcy2p2cvertical_darcy-reference.vtu b/test/references/test_md_boundary_darcy2p2c_stokes1p2c_vertical_darcy-reference.vtu
similarity index 100%
rename from test/references/test_stokes1p2cdarcy2p2cvertical_darcy-reference.vtu
rename to test/references/test_md_boundary_darcy2p2c_stokes1p2c_vertical_darcy-reference.vtu
diff --git a/test/references/test_stokes1p2cdarcy2p2cvertical_stokes-reference.vtu b/test/references/test_md_boundary_darcy2p2c_stokes1p2c_vertical_stokes-reference.vtu
similarity index 100%
rename from test/references/test_stokes1p2cdarcy2p2cvertical_stokes-reference.vtu
rename to test/references/test_md_boundary_darcy2p2c_stokes1p2c_vertical_stokes-reference.vtu
diff --git a/test/references/test_stokes1p2cnidarcy2p2cnihorizontal_darcy-reference.vtu b/test/references/test_md_boundary_darcy2p2cni_stokes1p2cni_horizontal_darcy-reference.vtu
similarity index 100%
rename from test/references/test_stokes1p2cnidarcy2p2cnihorizontal_darcy-reference.vtu
rename to test/references/test_md_boundary_darcy2p2cni_stokes1p2cni_horizontal_darcy-reference.vtu
diff --git a/test/references/test_stokes1p2cnidarcy2p2cnihorizontal_stokes-reference.vtu b/test/references/test_md_boundary_darcy2p2cni_stokes1p2cni_horizontal_stokes-reference.vtu
similarity index 100%
rename from test/references/test_stokes1p2cnidarcy2p2cnihorizontal_stokes-reference.vtu
rename to test/references/test_md_boundary_darcy2p2cni_stokes1p2cni_horizontal_stokes-reference.vtu
diff --git a/test/references/test_stokes1p2cnidarcy2p2cni_vertical_darcy-reference.vtu b/test/references/test_md_boundary_darcy2p2cni_stokes1p2cni_vertical_darcy-reference.vtu
similarity index 100%
rename from test/references/test_stokes1p2cnidarcy2p2cni_vertical_darcy-reference.vtu
rename to test/references/test_md_boundary_darcy2p2cni_stokes1p2cni_vertical_darcy-reference.vtu
diff --git a/test/references/test_stokes1p2cnidarcy2p2cni_vertical_stokes-reference.vtu b/test/references/test_md_boundary_darcy2p2cni_stokes1p2cni_vertical_stokes-reference.vtu
similarity index 100%
rename from test/references/test_stokes1p2cnidarcy2p2cni_vertical_stokes-reference.vtu
rename to test/references/test_md_boundary_darcy2p2cni_stokes1p2cni_vertical_stokes-reference.vtu
diff --git a/test/references/test_stokes1pdarcy2pvertical_darcy-reference.vtu b/test/references/test_md_boundary_darcy2p_stokes1p_vertical_darcy-reference.vtu
similarity index 100%
rename from test/references/test_stokes1pdarcy2pvertical_darcy-reference.vtu
rename to test/references/test_md_boundary_darcy2p_stokes1p_vertical_darcy-reference.vtu
diff --git a/test/references/test_stokes1pdarcy2pvertical_stokes-reference.vtu b/test/references/test_md_boundary_darcy2p_stokes1p_vertical_stokes-reference.vtu
similarity index 100%
rename from test/references/test_stokes1pdarcy2pvertical_stokes-reference.vtu
rename to test/references/test_md_boundary_darcy2p_stokes1p_vertical_stokes-reference.vtu
--
GitLab