From 5314461b58d34366cdb09e083b3e8bd4f4db1b15 Mon Sep 17 00:00:00 2001
From: Ned Coltman <edward.coltman@iws.uni-stuttgart.de>
Date: Fri, 2 Nov 2018 09:16:56 +0100
Subject: [PATCH] [Cleanup][Multidomain][Embedded] rename all embedded
multidomain tests
---
.../1d3d/1p2c_richards2c/CMakeLists.txt | 17 ++--
.../{test_1p2c_richards2c.cc => main.cc} | 4 +-
...est_1p2c_richards2c.input => params.input} | 18 ++--
.../{rootproblem.hh => problem_root.hh} | 6 +-
.../{soilproblem.hh => problem_soil.hh} | 6 +-
...spatialparams.hh => spatialparams_root.hh} | 0
...spatialparams.hh => spatialparams_soil.hh} | 0
.../embedded/1d3d/1p_1p/CMakeLists.txt | 90 +++++++++----------
.../1d3d/1p_1p/{test_1p_1p.cc => main.cc} | 4 +-
.../1p_1p/{test_1p_1p.input => params.input} | 10 ++-
...oodflowproblem.hh => problem_bloodflow.hh} | 6 +-
.../{tissueproblem.hh => problem_tissue.hh} | 11 +--
...alparams.hh => spatialparams_bloodflow.hh} | 0
...atialparams.hh => spatialparams_tissue.hh} | 0
.../embedded/1d3d/1p_richards/CMakeLists.txt | 34 +++----
.../{test_1p_richards.cc => main.cc} | 4 +-
.../{test_1p_richards.input => params.input} | 18 ++--
.../{rootproblem.hh => problem_root.hh} | 6 +-
.../{soilproblem.hh => problem_soil.hh} | 6 +-
...spatialparams.hh => spatialparams_root.hh} | 0
...spatialparams.hh => spatialparams_soil.hh} | 0
.../embedded/2d3d/1p_1p/CMakeLists.txt | 36 ++++----
.../2d3d/1p_1p/{test_1p_1p.cc => main.cc} | 4 +-
...embedded_fracture1p.input => params.input} | 16 ++--
...fractureproblem.hh => problem_fracture.hh} | 4 +-
.../{matrixproblem.hh => problem_matrix.hh} | 4 +-
...1d3d_1p1p_boxbox_average_1d-reference.vtp} | 0
...1d3d_1p1p_boxbox_average_3d-reference.vtu} | 0
...3d_1p1p_tpfatpfa_average_1d-reference.vtp} | 0
...3d_1p1p_tpfatpfa_average_3d-reference.vtu} | 0
...dded1d3d_1p2c_richards2c_1d-reference.vtp} | 0
...dded1d3d_1p2c_richards2c_3d-reference.vtu} | 0
...1d3d_1p_richards_tpfabox_3d-reference.vtu} | 0
...d3d_1p_richards_tpfatpfa_1d-reference.vtp} | 0
...d3d_1p_richards_tpfatpfa_3d-reference.vtu} | 0
...dded2d3d_fracture1p_tpfa_2d-reference.vtu} | 0
...dded2d3d_fracture1p_tpfa_3d-reference.vtu} | 0
37 files changed, 160 insertions(+), 144 deletions(-)
rename test/multidomain/embedded/1d3d/1p2c_richards2c/{test_1p2c_richards2c.cc => main.cc} (99%)
rename test/multidomain/embedded/1d3d/1p2c_richards2c/{test_1p2c_richards2c.input => params.input} (76%)
rename test/multidomain/embedded/1d3d/1p2c_richards2c/{rootproblem.hh => problem_root.hh} (98%)
rename test/multidomain/embedded/1d3d/1p2c_richards2c/{soilproblem.hh => problem_soil.hh} (98%)
rename test/multidomain/embedded/1d3d/1p2c_richards2c/{rootspatialparams.hh => spatialparams_root.hh} (100%)
rename test/multidomain/embedded/1d3d/1p2c_richards2c/{soilspatialparams.hh => spatialparams_soil.hh} (100%)
rename test/multidomain/embedded/1d3d/1p_1p/{test_1p_1p.cc => main.cc} (99%)
rename test/multidomain/embedded/1d3d/1p_1p/{test_1p_1p.input => params.input} (85%)
rename test/multidomain/embedded/1d3d/1p_1p/{bloodflowproblem.hh => problem_bloodflow.hh} (98%)
rename test/multidomain/embedded/1d3d/1p_1p/{tissueproblem.hh => problem_tissue.hh} (98%)
rename test/multidomain/embedded/1d3d/1p_1p/{bloodflowspatialparams.hh => spatialparams_bloodflow.hh} (100%)
rename test/multidomain/embedded/1d3d/1p_1p/{tissuespatialparams.hh => spatialparams_tissue.hh} (100%)
rename test/multidomain/embedded/1d3d/1p_richards/{test_1p_richards.cc => main.cc} (99%)
rename test/multidomain/embedded/1d3d/1p_richards/{test_1p_richards.input => params.input} (64%)
rename test/multidomain/embedded/1d3d/1p_richards/{rootproblem.hh => problem_root.hh} (98%)
rename test/multidomain/embedded/1d3d/1p_richards/{soilproblem.hh => problem_soil.hh} (98%)
rename test/multidomain/embedded/1d3d/1p_richards/{rootspatialparams.hh => spatialparams_root.hh} (100%)
rename test/multidomain/embedded/1d3d/1p_richards/{soilspatialparams.hh => spatialparams_soil.hh} (100%)
rename test/multidomain/embedded/2d3d/1p_1p/{test_1p_1p.cc => main.cc} (99%)
rename test/multidomain/embedded/2d3d/1p_1p/{test_embedded_fracture1p.input => params.input} (61%)
rename test/multidomain/embedded/2d3d/1p_1p/{fractureproblem.hh => problem_fracture.hh} (98%)
rename test/multidomain/embedded/2d3d/1p_1p/{matrixproblem.hh => problem_matrix.hh} (98%)
rename test/references/{test_embedded_1d3d_1p1p_boxbox_average_1d.vtp => test_md_embedded1d3d_1p1p_boxbox_average_1d-reference.vtp} (100%)
rename test/references/{test_embedded_1d3d_1p1p_boxbox_average_3d.vtu => test_md_embedded1d3d_1p1p_boxbox_average_3d-reference.vtu} (100%)
rename test/references/{test_embedded_1d3d_1p1p_tpfatpfa_average_1d.vtp => test_md_embedded1d3d_1p1p_tpfatpfa_average_1d-reference.vtp} (100%)
rename test/references/{test_embedded_1d3d_1p1p_tpfatpfa_average_3d.vtu => test_md_embedded1d3d_1p1p_tpfatpfa_average_3d-reference.vtu} (100%)
rename test/references/{test_embedded_1d3d_1p2c_richards2c_1d-reference.vtp => test_md_embedded1d3d_1p2c_richards2c_1d-reference.vtp} (100%)
rename test/references/{test_embedded_1d3d_1p2c_richards2c_3d-reference.vtu => test_md_embedded1d3d_1p2c_richards2c_3d-reference.vtu} (100%)
rename test/references/{test_embedded_1p_richards_box_3d.vtu => test_md_embedded1d3d_1p_richards_tpfabox_3d-reference.vtu} (100%)
rename test/references/{test_embedded_1p_richards_tpfa_1d.vtp => test_md_embedded1d3d_1p_richards_tpfatpfa_1d-reference.vtp} (100%)
rename test/references/{test_embedded_1p_richards_tpfa_3d.vtu => test_md_embedded1d3d_1p_richards_tpfatpfa_3d-reference.vtu} (100%)
rename test/references/{test_embedded_fracture_tpfa_2d.vtu => test_md_embedded2d3d_fracture1p_tpfa_2d-reference.vtu} (100%)
rename test/references/{test_embedded_fracture_tpfa_3d.vtu => test_md_embedded2d3d_fracture1p_tpfa_3d-reference.vtu} (100%)
diff --git a/test/multidomain/embedded/1d3d/1p2c_richards2c/CMakeLists.txt b/test/multidomain/embedded/1d3d/1p2c_richards2c/CMakeLists.txt
index 9d4667a2d8..ecb2cf3ccb 100644
--- a/test/multidomain/embedded/1d3d/1p2c_richards2c/CMakeLists.txt
+++ b/test/multidomain/embedded/1d3d/1p2c_richards2c/CMakeLists.txt
@@ -1,12 +1,13 @@
-dune_add_test(NAME test_embedded_1d3d_1p2c_richards2c
- SOURCES test_1p2c_richards2c.cc
+dune_add_test(NAME test_md_embedded1d3d_1p2c_richards2c
+ SOURCES main.cc
CMAKE_GUARD "( dune-foamgrid_FOUND AND HAVE_UG )"
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMD_ARGS --script fuzzy
- --files ${CMAKE_SOURCE_DIR}/test/references/test_embedded_1d3d_1p2c_richards2c_1d-reference.vtp
- ${CMAKE_CURRENT_BINARY_DIR}/test_soilroot_1d-00003.vtp
- ${CMAKE_SOURCE_DIR}/test/references/test_embedded_1d3d_1p2c_richards2c_3d-reference.vtu
- ${CMAKE_CURRENT_BINARY_DIR}/test_soilroot_3d-00003.vtu
- --command "${CMAKE_CURRENT_BINARY_DIR}/test_embedded_1d3d_1p2c_richards2c test_1p2c_richards2c.input")
-dune_symlink_to_source_files(FILES "test_1p2c_richards2c.input")
+ --files ${CMAKE_SOURCE_DIR}/test/references/test_md_embedded1d3d_1p2c_richards2c_1d-reference.vtp
+ ${CMAKE_CURRENT_BINARY_DIR}/test_md_embedded1d3d_1p2c_richards2c_1d-00003.vtp
+ ${CMAKE_SOURCE_DIR}/test/references/test_md_embedded1d3d_1p2c_richards2c_3d-reference.vtu
+ ${CMAKE_CURRENT_BINARY_DIR}/test_md_embedded1d3d_1p2c_richards2c_3d-00003.vtu
+ --command "${CMAKE_CURRENT_BINARY_DIR}/test_md_embedded1d3d_1p2c_richards2c params.input
+ -Vtk.OutputName test_md_embedded1d3d_1p2c_richards2c")
+dune_symlink_to_source_files(FILES "params.input")
set(CMAKE_BUILD_TYPE Release)
diff --git a/test/multidomain/embedded/1d3d/1p2c_richards2c/test_1p2c_richards2c.cc b/test/multidomain/embedded/1d3d/1p2c_richards2c/main.cc
similarity index 99%
rename from test/multidomain/embedded/1d3d/1p2c_richards2c/test_1p2c_richards2c.cc
rename to test/multidomain/embedded/1d3d/1p2c_richards2c/main.cc
index 4ad2895076..0c38779aee 100644
--- a/test/multidomain/embedded/1d3d/1p2c_richards2c/test_1p2c_richards2c.cc
+++ b/test/multidomain/embedded/1d3d/1p2c_richards2c/main.cc
@@ -47,8 +47,8 @@
#include <dumux/multidomain/embedded/couplingmanager1d3d.hh>
#include <dumux/multidomain/embedded/mixeddimensionglue.hh>
-#include "rootproblem.hh"
-#include "soilproblem.hh"
+#include "problem_root.hh"
+#include "problem_soil.hh"
namespace Dumux {
namespace Properties {
diff --git a/test/multidomain/embedded/1d3d/1p2c_richards2c/test_1p2c_richards2c.input b/test/multidomain/embedded/1d3d/1p2c_richards2c/params.input
similarity index 76%
rename from test/multidomain/embedded/1d3d/1p2c_richards2c/test_1p2c_richards2c.input
rename to test/multidomain/embedded/1d3d/1p2c_richards2c/params.input
index 58fbd978d5..48d97f0393 100644
--- a/test/multidomain/embedded/1d3d/1p2c_richards2c/test_1p2c_richards2c.input
+++ b/test/multidomain/embedded/1d3d/1p2c_richards2c/params.input
@@ -19,20 +19,21 @@ Refinement = 0
LocalRefinement = 1
[Problem]
-Name = test_soilroot
ContaminantMoleFraction = 3e-7
OutFile = "tracermass_fine.out"
EnableVtkOutput = true
EnableGravity = true
InitTopSaturation = 0.3
-[Soil.SpatialParams]
-Permeability = 2.57e-12 # [m^2]
-Porosity = 0.4 # [-]
+[Soil]
+SpatialParams.Permeability = 2.57e-12 # [m^2]
+SpatialParams.Porosity = 0.4 # [-]
+Problem.Name = 3d
-[Root.SpatialParams]
-Kx = 5.0968e-17
-Kr = 2.04e-13
+[Root]
+SpatialParams.Kx = 5.0968e-17
+SpatialParams.Kr = 2.04e-13
+Problem.Name = 1d
[Component]
LiquidDiffusionCoefficient = 2.3e-9
@@ -49,3 +50,6 @@ PriVarMagnitude = 1e6 1
[LinearSolver]
MaxIterations = 20000
Verbosity = 0
+
+[Vtk]
+OutputName = test_md_embedded1d3d_1p2c_richards2c
diff --git a/test/multidomain/embedded/1d3d/1p2c_richards2c/rootproblem.hh b/test/multidomain/embedded/1d3d/1p2c_richards2c/problem_root.hh
similarity index 98%
rename from test/multidomain/embedded/1d3d/1p2c_richards2c/rootproblem.hh
rename to test/multidomain/embedded/1d3d/1p2c_richards2c/problem_root.hh
index c1616e3f1b..b0b2344218 100644
--- a/test/multidomain/embedded/1d3d/1p2c_richards2c/rootproblem.hh
+++ b/test/multidomain/embedded/1d3d/1p2c_richards2c/problem_root.hh
@@ -37,7 +37,7 @@
#include <dumux/material/components/constant.hh>
#include <dumux/material/fluidsystems/liquidphase2c.hh>
-#include "rootspatialparams.hh"
+#include "spatialparams_root.hh"
namespace Dumux {
// forward declaration
@@ -122,11 +122,11 @@ public:
RootProblem(std::shared_ptr<const FVGridGeometry> fvGridGeometry,
std::shared_ptr<SpatialParams> spatialParams,
std::shared_ptr<CouplingManager> couplingManager)
- : ParentType(fvGridGeometry, spatialParams)
+ : ParentType(fvGridGeometry, spatialParams, "Root")
, couplingManager_(couplingManager)
{
//read parameters from input file
- name_ = getParam<std::string>("Problem.Name") + "_1d";
+ name_ = getParam<std::string>("Vtk.OutputName") + "_" + getParamFromGroup<std::string>(this->paramGroup(), "Problem.Name");
transpirationRate_ = getParam<Scalar>("BoundaryConditions.TranspirationRate");
initPressure_ = getParam<Scalar>("BoundaryConditions.InitialRootPressure");
}
diff --git a/test/multidomain/embedded/1d3d/1p2c_richards2c/soilproblem.hh b/test/multidomain/embedded/1d3d/1p2c_richards2c/problem_soil.hh
similarity index 98%
rename from test/multidomain/embedded/1d3d/1p2c_richards2c/soilproblem.hh
rename to test/multidomain/embedded/1d3d/1p2c_richards2c/problem_soil.hh
index 8f906bff40..ba82e7a42b 100644
--- a/test/multidomain/embedded/1d3d/1p2c_richards2c/soilproblem.hh
+++ b/test/multidomain/embedded/1d3d/1p2c_richards2c/problem_soil.hh
@@ -42,7 +42,7 @@
#include <dumux/material/components/constant.hh>
#include <dumux/material/fluidsystems/liquidphase2c.hh>
-#include "soilspatialparams.hh"
+#include "spatialparams_soil.hh"
namespace Dumux {
@@ -124,11 +124,11 @@ public:
SoilProblem(std::shared_ptr<const FVGridGeometry> fvGridGeometry,
std::shared_ptr<CouplingManager> couplingManager)
- : ParentType(fvGridGeometry)
+ : ParentType(fvGridGeometry, "Soil")
, couplingManager_(couplingManager)
{
//read parameters from input file
- name_ = getParam<std::string>("Problem.Name") + "_3d";
+ name_ = getParam<std::string>("Vtk.OutputName") + "_" + getParamFromGroup<std::string>(this->paramGroup(), "Problem.Name");
contaminantMoleFraction_ = getParam<Scalar>("Problem.ContaminantMoleFraction");
// for initial conditions
diff --git a/test/multidomain/embedded/1d3d/1p2c_richards2c/rootspatialparams.hh b/test/multidomain/embedded/1d3d/1p2c_richards2c/spatialparams_root.hh
similarity index 100%
rename from test/multidomain/embedded/1d3d/1p2c_richards2c/rootspatialparams.hh
rename to test/multidomain/embedded/1d3d/1p2c_richards2c/spatialparams_root.hh
diff --git a/test/multidomain/embedded/1d3d/1p2c_richards2c/soilspatialparams.hh b/test/multidomain/embedded/1d3d/1p2c_richards2c/spatialparams_soil.hh
similarity index 100%
rename from test/multidomain/embedded/1d3d/1p2c_richards2c/soilspatialparams.hh
rename to test/multidomain/embedded/1d3d/1p2c_richards2c/spatialparams_soil.hh
diff --git a/test/multidomain/embedded/1d3d/1p_1p/CMakeLists.txt b/test/multidomain/embedded/1d3d/1p_1p/CMakeLists.txt
index b60d6cddff..7e2d693e22 100644
--- a/test/multidomain/embedded/1d3d/1p_1p/CMakeLists.txt
+++ b/test/multidomain/embedded/1d3d/1p_1p/CMakeLists.txt
@@ -1,76 +1,76 @@
-dune_add_test(NAME test_embedded_1d3d_1p1p_tpfatpfa_average
- SOURCES test_1p_1p.cc
+dune_add_test(NAME test_md_embedded1d3d_1p1p_tpfatpfa_average
+ SOURCES main.cc
COMPILE_DEFINITIONS BULKTYPETAG=TissueCC LOWDIMTYPETAG=BloodFlowCC COUPLINGMODE=EmbeddedCouplingMode::average
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMAKE_GUARD dune-foamgrid_FOUND
CMD_ARGS --script fuzzy
- --files ${CMAKE_SOURCE_DIR}/test/references/test_embedded_1d3d_1p1p_tpfatpfa_average_1d.vtp
- ${CMAKE_CURRENT_BINARY_DIR}/test_embedded_1d3d_1p1p_tpfatpfa_average_1d-00001.vtp
- ${CMAKE_SOURCE_DIR}/test/references/test_embedded_1d3d_1p1p_tpfatpfa_average_3d.vtu
- ${CMAKE_CURRENT_BINARY_DIR}/test_embedded_1d3d_1p1p_tpfatpfa_average_3d-00001.vtu
- --command "${CMAKE_CURRENT_BINARY_DIR}/test_embedded_1d3d_1p1p_tpfatpfa_average test_1p_1p.input \
- -Problem.Name test_embedded_1d3d_1p1p_tpfatpfa_average")
+ --files ${CMAKE_SOURCE_DIR}/test/references/test_md_embedded1d3d_1p1p_tpfatpfa_average_1d-reference.vtp
+ ${CMAKE_CURRENT_BINARY_DIR}/test_md_embedded1d3d_1p1p_tpfatpfa_average_1d-00001.vtp
+ ${CMAKE_SOURCE_DIR}/test/references/test_md_embedded1d3d_1p1p_tpfatpfa_average_3d-reference.vtu
+ ${CMAKE_CURRENT_BINARY_DIR}/test_md_embedded1d3d_1p1p_tpfatpfa_average_3d-00001.vtu
+ --command "${CMAKE_CURRENT_BINARY_DIR}/test_md_embedded1d3d_1p1p_tpfatpfa_average params.input \
+ -Vtk.OutputName test_md_embedded1d3d_1p1p_tpfatpfa_average")
-dune_add_test(NAME test_embedded_1d3d_1p1p_boxtpfa_average
- SOURCES test_1p_1p.cc
+dune_add_test(NAME test_md_embedded1d3d_1p1p_boxtpfa_average
+ SOURCES main.cc
COMPILE_DEFINITIONS BULKTYPETAG=TissueBox LOWDIMTYPETAG=BloodFlowCC COUPLINGMODE=EmbeddedCouplingMode::average
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMAKE_GUARD dune-foamgrid_FOUND
CMD_ARGS --script fuzzy
- --files ${CMAKE_SOURCE_DIR}/test/references/test_embedded_1d3d_1p1p_tpfatpfa_average_1d.vtp
- ${CMAKE_CURRENT_BINARY_DIR}/test_embedded_1d3d_1p1p_boxtpfa_average_1d-00001.vtp
- ${CMAKE_SOURCE_DIR}/test/references/test_embedded_1d3d_1p1p_boxbox_average_3d.vtu
- ${CMAKE_CURRENT_BINARY_DIR}/test_embedded_1d3d_1p1p_boxtpfa_average_3d-00001.vtu
- --command "${CMAKE_CURRENT_BINARY_DIR}/test_embedded_1d3d_1p1p_boxtpfa_average test_1p_1p.input \
- -Problem.Name test_embedded_1d3d_1p1p_boxtpfa_average -Tissue.Grid.Cells \"19 19 19\"")
+ --files ${CMAKE_SOURCE_DIR}/test/references/test_md_embedded1d3d_1p1p_tpfatpfa_average_1d-reference.vtp
+ ${CMAKE_CURRENT_BINARY_DIR}/test_md_embedded1d3d_1p1p_boxtpfa_average_1d-00001.vtp
+ ${CMAKE_SOURCE_DIR}/test/references/test_md_embedded1d3d_1p1p_boxbox_average_3d-reference.vtu
+ ${CMAKE_CURRENT_BINARY_DIR}/test_md_embedded1d3d_1p1p_boxtpfa_average_3d-00001.vtu
+ --command "${CMAKE_CURRENT_BINARY_DIR}/test_md_embedded1d3d_1p1p_boxtpfa_average params.input \
+ -Vtk.OutputName test_md_embedded1d3d_1p1p_boxtpfa_average -Tissue.Grid.Cells \"19 19 19\"")
-dune_add_test(NAME test_embedded_1d3d_1p1p_tpfabox_average
- SOURCES test_1p_1p.cc
+dune_add_test(NAME test_md_embedded1d3d_1p1p_tpfabox_average
+ SOURCES main.cc
COMPILE_DEFINITIONS BULKTYPETAG=TissueCC LOWDIMTYPETAG=BloodFlowBox COUPLINGMODE=EmbeddedCouplingMode::average
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMAKE_GUARD dune-foamgrid_FOUND
CMD_ARGS --script fuzzy
- --files ${CMAKE_SOURCE_DIR}/test/references/test_embedded_1d3d_1p1p_boxbox_average_1d.vtp
- ${CMAKE_CURRENT_BINARY_DIR}/test_embedded_1d3d_1p1p_tpfabox_average_1d-00001.vtp
- ${CMAKE_SOURCE_DIR}/test/references/test_embedded_1d3d_1p1p_tpfatpfa_average_3d.vtu
- ${CMAKE_CURRENT_BINARY_DIR}/test_embedded_1d3d_1p1p_tpfabox_average_3d-00001.vtu
- --command "${CMAKE_CURRENT_BINARY_DIR}/test_embedded_1d3d_1p1p_tpfabox_average test_1p_1p.input \
- -Problem.Name test_embedded_1d3d_1p1p_tpfabox_average")
+ --files ${CMAKE_SOURCE_DIR}/test/references/test_md_embedded1d3d_1p1p_boxbox_average_1d-reference.vtp
+ ${CMAKE_CURRENT_BINARY_DIR}/test_md_embedded1d3d_1p1p_tpfabox_average_1d-00001.vtp
+ ${CMAKE_SOURCE_DIR}/test/references/test_md_embedded1d3d_1p1p_tpfatpfa_average_3d-reference.vtu
+ ${CMAKE_CURRENT_BINARY_DIR}/test_md_embedded1d3d_1p1p_tpfabox_average_3d-00001.vtu
+ --command "${CMAKE_CURRENT_BINARY_DIR}/test_md_embedded1d3d_1p1p_tpfabox_average params.input \
+ -Vtk.OutputName test_md_embedded1d3d_1p1p_tpfabox_average")
-dune_add_test(NAME test_embedded_1d3d_1p1p_boxbox_average
- SOURCES test_1p_1p.cc
+dune_add_test(NAME test_md_embedded1d3d_1p1p_boxbox_average
+ SOURCES main.cc
COMPILE_DEFINITIONS BULKTYPETAG=TissueBox LOWDIMTYPETAG=BloodFlowBox COUPLINGMODE=EmbeddedCouplingMode::average
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMAKE_GUARD dune-foamgrid_FOUND
CMD_ARGS --script fuzzy
- --files ${CMAKE_SOURCE_DIR}/test/references/test_embedded_1d3d_1p1p_boxbox_average_1d.vtp
- ${CMAKE_CURRENT_BINARY_DIR}/test_embedded_1d3d_1p1p_boxbox_average_1d-00001.vtp
- ${CMAKE_SOURCE_DIR}/test/references/test_embedded_1d3d_1p1p_boxbox_average_3d.vtu
- ${CMAKE_CURRENT_BINARY_DIR}/test_embedded_1d3d_1p1p_boxbox_average_3d-00001.vtu
- --command "${CMAKE_CURRENT_BINARY_DIR}/test_embedded_1d3d_1p1p_boxbox_average test_1p_1p.input \
- -Problem.Name test_embedded_1d3d_1p1p_boxbox_average -Tissue.Grid.Cells \"19 19 19\"")
+ --files ${CMAKE_SOURCE_DIR}/test/references/test_md_embedded1d3d_1p1p_boxbox_average_1d-reference.vtp
+ ${CMAKE_CURRENT_BINARY_DIR}/test_md_embedded1d3d_1p1p_boxbox_average_1d-00001.vtp
+ ${CMAKE_SOURCE_DIR}/test/references/test_md_embedded1d3d_1p1p_boxbox_average_3d-reference.vtu
+ ${CMAKE_CURRENT_BINARY_DIR}/test_md_embedded1d3d_1p1p_boxbox_average_3d-00001.vtu
+ --command "${CMAKE_CURRENT_BINARY_DIR}/test_md_embedded1d3d_1p1p_boxbox_average params.input \
+ -Vtk.OutputName test_md_embedded1d3d_1p1p_boxbox_average -Tissue.Grid.Cells \"19 19 19\"")
# make sure these configurations compile and run too
-dune_add_test(NAME test_embedded_1d3d_1p1p_tpfatpfa_cylindersources
- SOURCES test_1p_1p.cc
+dune_add_test(NAME test_md_embedded1d3d_1p1p_tpfatpfa_cylindersources
+ SOURCES main.cc
COMPILE_DEFINITIONS BULKTYPETAG=TissueCC LOWDIMTYPETAG=BloodFlowCC COUPLINGMODE=EmbeddedCouplingMode::cylindersources
- COMMAND ./test_embedded_1d3d_1p1p_tpfatpfa_cylindersources
+ COMMAND ./test_md_embedded1d3d_1p1p_tpfatpfa_cylindersources
CMAKE_GUARD dune-foamgrid_FOUND
- CMD_ARGS test_1p_1p.input)
+ CMD_ARGS params.input)
-dune_add_test(NAME test_embedded_1d3d_1p1p_tpfatpfa_line
- SOURCES test_1p_1p.cc
+dune_add_test(NAME test_md_embedded1d3d_1p1p_tpfatpfa_line
+ SOURCES main.cc
COMPILE_DEFINITIONS BULKTYPETAG=TissueCC LOWDIMTYPETAG=BloodFlowCC COUPLINGMODE=EmbeddedCouplingMode::line
- COMMAND ./test_embedded_1d3d_1p1p_tpfatpfa_line
+ COMMAND ./test_md_embedded1d3d_1p1p_tpfatpfa_line
CMAKE_GUARD dune-foamgrid_FOUND
- CMD_ARGS test_1p_1p.input)
+ CMD_ARGS params.input)
-dune_add_test(NAME test_embedded_1d3d_1p1p_tpfatpfa_kernel
- SOURCES test_1p_1p.cc
+dune_add_test(NAME test_md_embedded1d3d_1p1p_tpfatpfa_kernel
+ SOURCES main.cc
COMPILE_DEFINITIONS BULKTYPETAG=TissueCC LOWDIMTYPETAG=BloodFlowCC COUPLINGMODE=EmbeddedCouplingMode::kernel
- COMMAND ./test_embedded_1d3d_1p1p_tpfatpfa_kernel
+ COMMAND ./test_md_embedded1d3d_1p1p_tpfatpfa_kernel
CMAKE_GUARD dune-foamgrid_FOUND
- CMD_ARGS test_1p_1p.input)
+ CMD_ARGS params.input)
-dune_symlink_to_source_files(FILES "grids" "test_1p_1p.input")
+dune_symlink_to_source_files(FILES "params.input")
set(CMAKE_BUILD_TYPE Release)
diff --git a/test/multidomain/embedded/1d3d/1p_1p/test_1p_1p.cc b/test/multidomain/embedded/1d3d/1p_1p/main.cc
similarity index 99%
rename from test/multidomain/embedded/1d3d/1p_1p/test_1p_1p.cc
rename to test/multidomain/embedded/1d3d/1p_1p/main.cc
index 93e29f7992..dd7260503e 100644
--- a/test/multidomain/embedded/1d3d/1p_1p/test_1p_1p.cc
+++ b/test/multidomain/embedded/1d3d/1p_1p/main.cc
@@ -47,8 +47,8 @@
#include <dumux/multidomain/newtonsolver.hh>
#include <dumux/multidomain/embedded/couplingmanager1d3d.hh>
-#include "bloodflowproblem.hh"
-#include "tissueproblem.hh"
+#include "problem_bloodflow.hh"
+#include "problem_tissue.hh"
#include "l2norm.hh"
// default to tpfa for both domains
diff --git a/test/multidomain/embedded/1d3d/1p_1p/test_1p_1p.input b/test/multidomain/embedded/1d3d/1p_1p/params.input
similarity index 85%
rename from test/multidomain/embedded/1d3d/1p_1p/test_1p_1p.input
rename to test/multidomain/embedded/1d3d/1p_1p/params.input
index 05f4890bf2..5ba10acd67 100644
--- a/test/multidomain/embedded/1d3d/1p_1p/test_1p_1p.input
+++ b/test/multidomain/embedded/1d3d/1p_1p/params.input
@@ -13,12 +13,20 @@ LowerLeft = -1 -1 0
UpperRight = 1 1 1
Cells = 20 20 20
+[Vessel.Problem]
+Name = 1d
+
+[Tissue.Problem]
+Name = 3d
+
[Problem]
-Name = test_1p1p_embedded
NormIntegrationOrder = 2
NormExcludeInnerBulk = true
EnableGravity = false
+[Vtk]
+OutputName = test_md_embedded1d3d_1p1p
+
[Component]
LiquidKinematicViscosity = 1 # [m^2/s]
LiquidDensity = 1 # [kg/m^3]
diff --git a/test/multidomain/embedded/1d3d/1p_1p/bloodflowproblem.hh b/test/multidomain/embedded/1d3d/1p_1p/problem_bloodflow.hh
similarity index 98%
rename from test/multidomain/embedded/1d3d/1p_1p/bloodflowproblem.hh
rename to test/multidomain/embedded/1d3d/1p_1p/problem_bloodflow.hh
index 996f54442e..62fb5fc16f 100644
--- a/test/multidomain/embedded/1d3d/1p_1p/bloodflowproblem.hh
+++ b/test/multidomain/embedded/1d3d/1p_1p/problem_bloodflow.hh
@@ -39,7 +39,7 @@
#include <dumux/material/components/constant.hh>
#include <dumux/material/fluidsystems/1pliquid.hh>
-#include "bloodflowspatialparams.hh"
+#include "spatialparams_bloodflow.hh"
namespace Dumux {
// forward declaration
@@ -106,11 +106,11 @@ class BloodFlowProblem : public PorousMediumFlowProblem<TypeTag>
public:
BloodFlowProblem(std::shared_ptr<const FVGridGeometry> fvGridGeometry,
std::shared_ptr<CouplingManager> couplingManager)
- : ParentType(fvGridGeometry)
+ : ParentType(fvGridGeometry, "Vessel")
, couplingManager_(couplingManager)
{
//read parameters from input file
- name_ = getParam<std::string>("Problem.Name") + "_1d";
+ name_ = getParam<std::string>("Vtk.OutputName") + "_" + getParamFromGroup<std::string>(this->paramGroup(), "Problem.Name");
p_in_ = getParam<Scalar>("BoundaryConditions1D.PressureInput");
delta_p_ = getParam<Scalar>("BoundaryConditions1D.DeltaPressure");
exactPressure_.resize(this->fvGridGeometry().numDofs());
diff --git a/test/multidomain/embedded/1d3d/1p_1p/tissueproblem.hh b/test/multidomain/embedded/1d3d/1p_1p/problem_tissue.hh
similarity index 98%
rename from test/multidomain/embedded/1d3d/1p_1p/tissueproblem.hh
rename to test/multidomain/embedded/1d3d/1p_1p/problem_tissue.hh
index 31cc4bc8cc..d47d0231b9 100644
--- a/test/multidomain/embedded/1d3d/1p_1p/tissueproblem.hh
+++ b/test/multidomain/embedded/1d3d/1p_1p/problem_tissue.hh
@@ -44,7 +44,7 @@
#include <dumux/material/components/constant.hh>
#include <dumux/material/fluidsystems/1pliquid.hh>
-#include "tissuespatialparams.hh"
+#include "spatialparams_tissue.hh"
namespace Dumux {
@@ -114,11 +114,11 @@ class TissueProblem : public PorousMediumFlowProblem<TypeTag>
public:
TissueProblem(std::shared_ptr<const FVGridGeometry> fvGridGeometry,
std::shared_ptr<CouplingManager> couplingManager)
- : ParentType(fvGridGeometry)
+ : ParentType(fvGridGeometry, "Tissue")
, couplingManager_(couplingManager)
{
//read parameters from input file
- name_ = getParam<std::string>("Problem.Name") + "_3d";
+ name_ = getParam<std::string>("Vtk.OutputName") + "_" + getParamFromGroup<std::string>(this->paramGroup(), "Problem.Name");
exactPressure_.resize(this->fvGridGeometry().numDofs());
for (const auto& element : elements(this->fvGridGeometry().gridView()))
@@ -131,11 +131,6 @@ public:
}
}
- /*!
- * \name Problem parameters
- */
- // \{
-
/*!
* \brief The problem name.
*
diff --git a/test/multidomain/embedded/1d3d/1p_1p/bloodflowspatialparams.hh b/test/multidomain/embedded/1d3d/1p_1p/spatialparams_bloodflow.hh
similarity index 100%
rename from test/multidomain/embedded/1d3d/1p_1p/bloodflowspatialparams.hh
rename to test/multidomain/embedded/1d3d/1p_1p/spatialparams_bloodflow.hh
diff --git a/test/multidomain/embedded/1d3d/1p_1p/tissuespatialparams.hh b/test/multidomain/embedded/1d3d/1p_1p/spatialparams_tissue.hh
similarity index 100%
rename from test/multidomain/embedded/1d3d/1p_1p/tissuespatialparams.hh
rename to test/multidomain/embedded/1d3d/1p_1p/spatialparams_tissue.hh
diff --git a/test/multidomain/embedded/1d3d/1p_richards/CMakeLists.txt b/test/multidomain/embedded/1d3d/1p_richards/CMakeLists.txt
index a53a2ed002..75788bc882 100644
--- a/test/multidomain/embedded/1d3d/1p_richards/CMakeLists.txt
+++ b/test/multidomain/embedded/1d3d/1p_richards/CMakeLists.txt
@@ -1,27 +1,27 @@
-dune_add_test(NAME test_embedded_1p_richards_tpfatpfa
- SOURCES test_1p_richards.cc
+dune_add_test(NAME test_md_embedded1d3d_1p_richards_tpfatpfa
+ SOURCES main.cc
COMPILE_DEFINITIONS SOILTYPETAG=SoilCC
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMAKE_GUARD dune-foamgrid_FOUND
CMD_ARGS --script fuzzy
- --files ${CMAKE_SOURCE_DIR}/test/references/test_embedded_1p_richards_tpfa_1d.vtp
- ${CMAKE_CURRENT_BINARY_DIR}/test_embedded_1p_richards_tpfatpfa_1d-00004.vtp
- ${CMAKE_SOURCE_DIR}/test/references/test_embedded_1p_richards_tpfa_3d.vtu
- ${CMAKE_CURRENT_BINARY_DIR}/test_embedded_1p_richards_tpfatpfa_3d-00004.vtu
- --command "${CMAKE_CURRENT_BINARY_DIR}/test_embedded_1p_richards_tpfatpfa test_1p_richards.input \
- -Problem.Name test_embedded_1p_richards_tpfatpfa")
+ --files ${CMAKE_SOURCE_DIR}/test/references/test_md_embedded1d3d_1p_richards_tpfatpfa_1d-reference.vtp
+ ${CMAKE_CURRENT_BINARY_DIR}/test_md_embedded1d3d_1p_richards_tpfatpfa_1d-00004.vtp
+ ${CMAKE_SOURCE_DIR}/test/references/test_md_embedded1d3d_1p_richards_tpfatpfa_3d-reference.vtu
+ ${CMAKE_CURRENT_BINARY_DIR}/test_md_embedded1d3d_1p_richards_tpfatpfa_3d-00004.vtu
+ --command "${CMAKE_CURRENT_BINARY_DIR}/test_md_embedded1d3d_1p_richards_tpfatpfa params.input \
+ -Vtk.OutputName test_md_embedded1d3d_1p_richards_tpfatpfa")
-dune_add_test(NAME test_embedded_1p_richards_tpfabox
- SOURCES test_1p_richards.cc
+dune_add_test(NAME test_md_embedded1d3d_1p_richards_tpfabox
+ SOURCES main.cc
COMPILE_DEFINITIONS SOILTYPETAG=SoilBox
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMAKE_GUARD dune-foamgrid_FOUND
CMD_ARGS --script fuzzy
- --files ${CMAKE_SOURCE_DIR}/test/references/test_embedded_1p_richards_tpfa_1d.vtp
- ${CMAKE_CURRENT_BINARY_DIR}/test_embedded_1p_richards_tpfabox_1d-00004.vtp
- ${CMAKE_SOURCE_DIR}/test/references/test_embedded_1p_richards_box_3d.vtu
- ${CMAKE_CURRENT_BINARY_DIR}/test_embedded_1p_richards_tpfabox_3d-00004.vtu
- --command "${CMAKE_CURRENT_BINARY_DIR}/test_embedded_1p_richards_tpfabox test_1p_richards.input \
- -Problem.Name test_embedded_1p_richards_tpfabox")
-dune_symlink_to_source_files(FILES "lupine.dgf" "test_1p_richards.input")
+ --files ${CMAKE_SOURCE_DIR}/test/references/test_md_embedded1d3d_1p_richards_tpfatpfa_1d-reference.vtp
+ ${CMAKE_CURRENT_BINARY_DIR}/test_md_embedded1d3d_1p_richards_tpfabox_1d-00004.vtp
+ ${CMAKE_SOURCE_DIR}/test/references/test_md_embedded1d3d_1p_richards_tpfabox_3d-reference.vtu
+ ${CMAKE_CURRENT_BINARY_DIR}/test_md_embedded1d3d_1p_richards_tpfabox_3d-00004.vtu
+ --command "${CMAKE_CURRENT_BINARY_DIR}/test_md_embedded1d3d_1p_richards_tpfabox params.input \
+ -Vtk.OutputName test_md_embedded1d3d_1p_richards_tpfabox")
+dune_symlink_to_source_files(FILES "params.input")
set(CMAKE_BUILD_TYPE Release)
diff --git a/test/multidomain/embedded/1d3d/1p_richards/test_1p_richards.cc b/test/multidomain/embedded/1d3d/1p_richards/main.cc
similarity index 99%
rename from test/multidomain/embedded/1d3d/1p_richards/test_1p_richards.cc
rename to test/multidomain/embedded/1d3d/1p_richards/main.cc
index f224443224..b3d7eb4c86 100644
--- a/test/multidomain/embedded/1d3d/1p_richards/test_1p_richards.cc
+++ b/test/multidomain/embedded/1d3d/1p_richards/main.cc
@@ -46,8 +46,8 @@
#include <dumux/multidomain/newtonsolver.hh>
#include <dumux/multidomain/embedded/couplingmanager1d3d.hh>
-#include "rootproblem.hh"
-#include "soilproblem.hh"
+#include "problem_root.hh"
+#include "problem_soil.hh"
namespace Dumux {
namespace Properties {
diff --git a/test/multidomain/embedded/1d3d/1p_richards/test_1p_richards.input b/test/multidomain/embedded/1d3d/1p_richards/params.input
similarity index 64%
rename from test/multidomain/embedded/1d3d/1p_richards/test_1p_richards.input
rename to test/multidomain/embedded/1d3d/1p_richards/params.input
index 473f9821a0..fe09ff1a66 100644
--- a/test/multidomain/embedded/1d3d/1p_richards/test_1p_richards.input
+++ b/test/multidomain/embedded/1d3d/1p_richards/params.input
@@ -16,16 +16,20 @@ UpperRight = 0.035 0.035 0
Cells = 12 12 12
[Problem]
-Name = test_soilroot
EnableGravity = false
-[Soil.SpatialParams]
-Permeability = 2.57e-12 # [m^2]
-Porosity = 0.3 # [-]
+[Vtk]
+OutputName = test_md_embedded1d3d_1p_richards
-[Root.SpatialParams]
-Kx = 5.0968e-17
-Kr = 2.04e-13
+[Soil]
+SpatialParams.Permeability = 2.57e-12 # [m^2]
+SpatialParams.Porosity = 0.3 # [-]
+Problem.Name = 3d
+
+[Root]
+SpatialParams.Kx = 5.0968e-17
+SpatialParams.Kr = 2.04e-13
+Problem.Name = 1d
[BoundaryConditions]
InitialSoilPressure = -0.9429e4 # [Pa]
diff --git a/test/multidomain/embedded/1d3d/1p_richards/rootproblem.hh b/test/multidomain/embedded/1d3d/1p_richards/problem_root.hh
similarity index 98%
rename from test/multidomain/embedded/1d3d/1p_richards/rootproblem.hh
rename to test/multidomain/embedded/1d3d/1p_richards/problem_root.hh
index b1be50ba03..31f08030d5 100644
--- a/test/multidomain/embedded/1d3d/1p_richards/rootproblem.hh
+++ b/test/multidomain/embedded/1d3d/1p_richards/problem_root.hh
@@ -38,7 +38,7 @@
#include <dumux/material/components/simpleh2o.hh>
#include <dumux/material/fluidsystems/1pliquid.hh>
-#include "rootspatialparams.hh"
+#include "spatialparams_root.hh"
namespace Dumux {
// forward declaration
@@ -108,11 +108,11 @@ public:
RootProblem(std::shared_ptr<const FVGridGeometry> fvGridGeometry,
std::shared_ptr<SpatialParams> spatialParams,
std::shared_ptr<CouplingManager> couplingManager)
- : ParentType(fvGridGeometry, spatialParams)
+ : ParentType(fvGridGeometry, spatialParams, "Root")
, couplingManager_(couplingManager)
{
//read parameters from input file
- name_ = getParam<std::string>("Problem.Name") + "_1d";
+ name_ = getParam<std::string>("Vtk.OutputName") + "_" + getParamFromGroup<std::string>(this->paramGroup(), "Problem.Name");
transpirationRate_ = getParam<Scalar>("BoundaryConditions.TranspirationRate");
}
diff --git a/test/multidomain/embedded/1d3d/1p_richards/soilproblem.hh b/test/multidomain/embedded/1d3d/1p_richards/problem_soil.hh
similarity index 98%
rename from test/multidomain/embedded/1d3d/1p_richards/soilproblem.hh
rename to test/multidomain/embedded/1d3d/1p_richards/problem_soil.hh
index 63a63ee718..0354251e3d 100644
--- a/test/multidomain/embedded/1d3d/1p_richards/soilproblem.hh
+++ b/test/multidomain/embedded/1d3d/1p_richards/problem_soil.hh
@@ -38,7 +38,7 @@
#include <dumux/porousmediumflow/richards/model.hh>
#include <dumux/porousmediumflow/problem.hh>
-#include "soilspatialparams.hh"
+#include "spatialparams_soil.hh"
namespace Dumux {
@@ -96,11 +96,11 @@ class SoilProblem : public PorousMediumFlowProblem<TypeTag>
public:
SoilProblem(std::shared_ptr<const FVGridGeometry> fvGridGeometry,
std::shared_ptr<CouplingManager> couplingManager)
- : ParentType(fvGridGeometry)
+ : ParentType(fvGridGeometry, "Soil")
, couplingManager_(couplingManager)
{
//read parameters from input file
- name_ = getParam<std::string>("Problem.Name") + "_3d";
+ name_ = getParam<std::string>("Vtk.OutputName") + "_" + getParamFromGroup<std::string>(this->paramGroup(), "Problem.Name");
initPressure_ = getParam<Scalar>("BoundaryConditions.InitialSoilPressure");
}
diff --git a/test/multidomain/embedded/1d3d/1p_richards/rootspatialparams.hh b/test/multidomain/embedded/1d3d/1p_richards/spatialparams_root.hh
similarity index 100%
rename from test/multidomain/embedded/1d3d/1p_richards/rootspatialparams.hh
rename to test/multidomain/embedded/1d3d/1p_richards/spatialparams_root.hh
diff --git a/test/multidomain/embedded/1d3d/1p_richards/soilspatialparams.hh b/test/multidomain/embedded/1d3d/1p_richards/spatialparams_soil.hh
similarity index 100%
rename from test/multidomain/embedded/1d3d/1p_richards/soilspatialparams.hh
rename to test/multidomain/embedded/1d3d/1p_richards/spatialparams_soil.hh
diff --git a/test/multidomain/embedded/2d3d/1p_1p/CMakeLists.txt b/test/multidomain/embedded/2d3d/1p_1p/CMakeLists.txt
index 87fe52ec33..72dfa0417d 100644
--- a/test/multidomain/embedded/2d3d/1p_1p/CMakeLists.txt
+++ b/test/multidomain/embedded/2d3d/1p_1p/CMakeLists.txt
@@ -1,27 +1,27 @@
-add_executable(test_embedded_fracture1p_tpfa EXCLUDE_FROM_ALL test_1p_1p.cc)
+add_executable(test_md_embedded2d3d_fracture1p_tpfa EXCLUDE_FROM_ALL main.cc)
-dune_add_test(NAME test_embedded_fracture1p_tpfa_linearsolver
- TARGET test_embedded_fracture1p_tpfa
+dune_add_test(NAME test_md_embedded2d3d_fracture1p_tpfa_linearsolver
+ TARGET test_md_embedded2d3d_fracture1p_tpfa
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMAKE_GUARD dune-foamgrid_FOUND
CMD_ARGS --script fuzzy
- --files ${CMAKE_SOURCE_DIR}/test/references/test_embedded_fracture_tpfa_2d.vtu
- ${CMAKE_CURRENT_BINARY_DIR}/test_embedded_fracture_tpfa_linearsolver_2d-00001.vtu
- ${CMAKE_SOURCE_DIR}/test/references/test_embedded_fracture_tpfa_3d.vtu
- ${CMAKE_CURRENT_BINARY_DIR}/test_embedded_fracture_tpfa_linearsolver_3d-00001.vtu
- --command "${CMAKE_CURRENT_BINARY_DIR}/test_embedded_fracture1p_tpfa test_embedded_fracture1p.input \
- -Problem.Name test_embedded_fracture_tpfa_linearsolver -Problem.SolverType linear")
+ --files ${CMAKE_SOURCE_DIR}/test/references/test_md_embedded2d3d_fracture1p_tpfa_2d-reference.vtu
+ ${CMAKE_CURRENT_BINARY_DIR}/test_md_embedded2d3d_fracture1p_tpfa_linearsolver_2d-00001.vtu
+ ${CMAKE_SOURCE_DIR}/test/references/test_md_embedded2d3d_fracture1p_tpfa_3d-reference.vtu
+ ${CMAKE_CURRENT_BINARY_DIR}/test_md_embedded2d3d_fracture1p_tpfa_linearsolver_3d-00001.vtu
+ --command "${CMAKE_CURRENT_BINARY_DIR}/test_md_embedded2d3d_fracture1p_tpfa params.input \
+ -Vtk.OutputName test_md_embedded2d3d_fracture1p_tpfa_linearsolver -Problem.SolverType linear")
-dune_add_test(NAME test_embedded_fracture1p_tpfa_nonlinearsolver
- TARGET test_embedded_fracture1p_tpfa
+dune_add_test(NAME test_md_embedded2d3d_fracture1p_tpfa_nonlinearsolver
+ TARGET test_md_embedded2d3d_fracture1p_tpfa
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMAKE_GUARD dune-foamgrid_FOUND
CMD_ARGS --script fuzzy
- --files ${CMAKE_SOURCE_DIR}/test/references/test_embedded_fracture_tpfa_2d.vtu
- ${CMAKE_CURRENT_BINARY_DIR}/test_embedded_fracture_tpfa_nonlinearsolver_2d-00001.vtu
- ${CMAKE_SOURCE_DIR}/test/references/test_embedded_fracture_tpfa_3d.vtu
- ${CMAKE_CURRENT_BINARY_DIR}/test_embedded_fracture_tpfa_nonlinearsolver_3d-00001.vtu
- --command "${CMAKE_CURRENT_BINARY_DIR}/test_embedded_fracture1p_tpfa test_embedded_fracture1p.input \
- -Problem.Name test_embedded_fracture_tpfa_nonlinearsolver -Problem.SolverType nonlinear")
-dune_symlink_to_source_files(FILES "fracture.msh" "test_embedded_fracture1p.input")
+ --files ${CMAKE_SOURCE_DIR}/test/references/test_md_embedded2d3d_fracture1p_tpfa_2d-reference.vtu
+ ${CMAKE_CURRENT_BINARY_DIR}/test_md_embedded2d3d_fracture1p_tpfa_nonlinearsolver_2d-00001.vtu
+ ${CMAKE_SOURCE_DIR}/test/references/test_md_embedded2d3d_fracture1p_tpfa_3d-reference.vtu
+ ${CMAKE_CURRENT_BINARY_DIR}/test_md_embedded2d3d_fracture1p_tpfa_nonlinearsolver_3d-00001.vtu
+ --command "${CMAKE_CURRENT_BINARY_DIR}/test_md_embedded2d3d_fracture1p_tpfa params.input \
+ -Vtk.OutputName test_md_embedded2d3d_fracture1p_tpfa_nonlinearsolver -Problem.SolverType nonlinear")
+dune_symlink_to_source_files(FILES "fracture.msh" "params.input")
set(CMAKE_BUILD_TYPE Release)
diff --git a/test/multidomain/embedded/2d3d/1p_1p/test_1p_1p.cc b/test/multidomain/embedded/2d3d/1p_1p/main.cc
similarity index 99%
rename from test/multidomain/embedded/2d3d/1p_1p/test_1p_1p.cc
rename to test/multidomain/embedded/2d3d/1p_1p/main.cc
index 89cd00a390..8316b69d35 100644
--- a/test/multidomain/embedded/2d3d/1p_1p/test_1p_1p.cc
+++ b/test/multidomain/embedded/2d3d/1p_1p/main.cc
@@ -48,8 +48,8 @@
#include <dumux/multidomain/newtonsolver.hh>
#include <dumux/multidomain/embedded/couplingmanager2d3d.hh>
-#include "matrixproblem.hh"
-#include "fractureproblem.hh"
+#include "problem_matrix.hh"
+#include "problem_fracture.hh"
namespace Dumux {
namespace Properties {
diff --git a/test/multidomain/embedded/2d3d/1p_1p/test_embedded_fracture1p.input b/test/multidomain/embedded/2d3d/1p_1p/params.input
similarity index 61%
rename from test/multidomain/embedded/2d3d/1p_1p/test_embedded_fracture1p.input
rename to test/multidomain/embedded/2d3d/1p_1p/params.input
index 40146ec6db..0824cb0c38 100644
--- a/test/multidomain/embedded/2d3d/1p_1p/test_embedded_fracture1p.input
+++ b/test/multidomain/embedded/2d3d/1p_1p/params.input
@@ -7,19 +7,20 @@ UpperRight = 8 8 5
Cells = 20 20 10
[Problem]
-Name = test_embedded_fracture
EnableGravity = false
[Component]
LiquidKinematicViscosity = 1e-6 # [m^2/s]
LiquidDensity = 1000 # [kg/m^3]
-[Matrix.SpatialParams]
-Permeability = 1e-15 # [m^2]
+[Matrix]
+SpatialParams.Permeability = 1e-15 # [m^2]
+Problem.Name = 3d
-[Fracture.SpatialParams]
-Permeability = 1e-7 # [m^2]
-Aperture = 0.05 # [m]
+[Fracture]
+Problem.Name = 2d
+SpatialParams.Permeability = 1e-7 # [m^2]
+SpatialParams.Aperture = 0.05 # [m]
[LinearSolver]
MaxIterations = 2000
@@ -28,3 +29,6 @@ ResidualReduction = 1e-24
[Assembly.NumericDifference]
BaseEpsilon = 0.1e5
PriVarMagnitude = 1e5
+
+[Vtk]
+OutputName = test_md_embedded2d3d_fracture1p
diff --git a/test/multidomain/embedded/2d3d/1p_1p/fractureproblem.hh b/test/multidomain/embedded/2d3d/1p_1p/problem_fracture.hh
similarity index 98%
rename from test/multidomain/embedded/2d3d/1p_1p/fractureproblem.hh
rename to test/multidomain/embedded/2d3d/1p_1p/problem_fracture.hh
index 9609c686c1..99720a91df 100644
--- a/test/multidomain/embedded/2d3d/1p_1p/fractureproblem.hh
+++ b/test/multidomain/embedded/2d3d/1p_1p/problem_fracture.hh
@@ -105,12 +105,12 @@ public:
FractureProblem(std::shared_ptr<const FVGridGeometry> fvGridGeometry,
std::shared_ptr<typename ParentType::SpatialParams> spatialParams,
std::shared_ptr<CouplingManager> couplingManager,
- const std::string& paramGroup = "")
+ const std::string& paramGroup = "Fracture")
: ParentType(fvGridGeometry, spatialParams, paramGroup)
, couplingManager_(couplingManager)
{
//read parameters from input file
- name_ = getParam<std::string>("Problem.Name") + "_2d";
+ name_ = getParam<std::string>("Vtk.OutputName") + "_" + getParamFromGroup<std::string>(this->paramGroup(), "Problem.Name");
}
/*!
diff --git a/test/multidomain/embedded/2d3d/1p_1p/matrixproblem.hh b/test/multidomain/embedded/2d3d/1p_1p/problem_matrix.hh
similarity index 98%
rename from test/multidomain/embedded/2d3d/1p_1p/matrixproblem.hh
rename to test/multidomain/embedded/2d3d/1p_1p/problem_matrix.hh
index fbe3d194cd..812f891dcf 100644
--- a/test/multidomain/embedded/2d3d/1p_1p/matrixproblem.hh
+++ b/test/multidomain/embedded/2d3d/1p_1p/problem_matrix.hh
@@ -116,12 +116,12 @@ public:
MatrixProblem(std::shared_ptr<const FVGridGeometry> fvGridGeometry,
std::shared_ptr<typename ParentType::SpatialParams> spatialParams,
std::shared_ptr<CouplingManager> couplingManager,
- const std::string& paramGroup = "")
+ const std::string& paramGroup = "Matrix")
: ParentType(fvGridGeometry, spatialParams, paramGroup)
, couplingManager_(couplingManager)
{
//read parameters from input file
- name_ = getParam<std::string>("Problem.Name") + "_3d";
+ name_ = getParam<std::string>("Vtk.OutputName") + "_" + getParamFromGroup<std::string>(this->paramGroup(), "Problem.Name");
}
/*!
diff --git a/test/references/test_embedded_1d3d_1p1p_boxbox_average_1d.vtp b/test/references/test_md_embedded1d3d_1p1p_boxbox_average_1d-reference.vtp
similarity index 100%
rename from test/references/test_embedded_1d3d_1p1p_boxbox_average_1d.vtp
rename to test/references/test_md_embedded1d3d_1p1p_boxbox_average_1d-reference.vtp
diff --git a/test/references/test_embedded_1d3d_1p1p_boxbox_average_3d.vtu b/test/references/test_md_embedded1d3d_1p1p_boxbox_average_3d-reference.vtu
similarity index 100%
rename from test/references/test_embedded_1d3d_1p1p_boxbox_average_3d.vtu
rename to test/references/test_md_embedded1d3d_1p1p_boxbox_average_3d-reference.vtu
diff --git a/test/references/test_embedded_1d3d_1p1p_tpfatpfa_average_1d.vtp b/test/references/test_md_embedded1d3d_1p1p_tpfatpfa_average_1d-reference.vtp
similarity index 100%
rename from test/references/test_embedded_1d3d_1p1p_tpfatpfa_average_1d.vtp
rename to test/references/test_md_embedded1d3d_1p1p_tpfatpfa_average_1d-reference.vtp
diff --git a/test/references/test_embedded_1d3d_1p1p_tpfatpfa_average_3d.vtu b/test/references/test_md_embedded1d3d_1p1p_tpfatpfa_average_3d-reference.vtu
similarity index 100%
rename from test/references/test_embedded_1d3d_1p1p_tpfatpfa_average_3d.vtu
rename to test/references/test_md_embedded1d3d_1p1p_tpfatpfa_average_3d-reference.vtu
diff --git a/test/references/test_embedded_1d3d_1p2c_richards2c_1d-reference.vtp b/test/references/test_md_embedded1d3d_1p2c_richards2c_1d-reference.vtp
similarity index 100%
rename from test/references/test_embedded_1d3d_1p2c_richards2c_1d-reference.vtp
rename to test/references/test_md_embedded1d3d_1p2c_richards2c_1d-reference.vtp
diff --git a/test/references/test_embedded_1d3d_1p2c_richards2c_3d-reference.vtu b/test/references/test_md_embedded1d3d_1p2c_richards2c_3d-reference.vtu
similarity index 100%
rename from test/references/test_embedded_1d3d_1p2c_richards2c_3d-reference.vtu
rename to test/references/test_md_embedded1d3d_1p2c_richards2c_3d-reference.vtu
diff --git a/test/references/test_embedded_1p_richards_box_3d.vtu b/test/references/test_md_embedded1d3d_1p_richards_tpfabox_3d-reference.vtu
similarity index 100%
rename from test/references/test_embedded_1p_richards_box_3d.vtu
rename to test/references/test_md_embedded1d3d_1p_richards_tpfabox_3d-reference.vtu
diff --git a/test/references/test_embedded_1p_richards_tpfa_1d.vtp b/test/references/test_md_embedded1d3d_1p_richards_tpfatpfa_1d-reference.vtp
similarity index 100%
rename from test/references/test_embedded_1p_richards_tpfa_1d.vtp
rename to test/references/test_md_embedded1d3d_1p_richards_tpfatpfa_1d-reference.vtp
diff --git a/test/references/test_embedded_1p_richards_tpfa_3d.vtu b/test/references/test_md_embedded1d3d_1p_richards_tpfatpfa_3d-reference.vtu
similarity index 100%
rename from test/references/test_embedded_1p_richards_tpfa_3d.vtu
rename to test/references/test_md_embedded1d3d_1p_richards_tpfatpfa_3d-reference.vtu
diff --git a/test/references/test_embedded_fracture_tpfa_2d.vtu b/test/references/test_md_embedded2d3d_fracture1p_tpfa_2d-reference.vtu
similarity index 100%
rename from test/references/test_embedded_fracture_tpfa_2d.vtu
rename to test/references/test_md_embedded2d3d_fracture1p_tpfa_2d-reference.vtu
diff --git a/test/references/test_embedded_fracture_tpfa_3d.vtu b/test/references/test_md_embedded2d3d_fracture1p_tpfa_3d-reference.vtu
similarity index 100%
rename from test/references/test_embedded_fracture_tpfa_3d.vtu
rename to test/references/test_md_embedded2d3d_fracture1p_tpfa_3d-reference.vtu
--
GitLab