Commit 70f5cc15 authored by Ned Coltman's avatar Ned Coltman Committed by Timo Koch
Browse files

[Cleanup][Multidomain][boundary] rename boundary multidomain tests

parent 5314461b
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")
......@@ -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);
////////////////////////////////////////////////////////////
......
......@@ -5,6 +5,9 @@ DtInitial = 1.0
[Problem]
EnableGravity = true
[Vtk]
OutputName = test_md_boundary_darcy1p_darcy1p
[1.Problem]
Name = 1p_0
......
......@@ -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
......
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")
......@@ -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
......
......@@ -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
......
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")
......@@ -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
......@@ -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
......
......@@ -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
......
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")
......@@ -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
......@@ -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
......@@ -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
......
......@@ -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_;
......
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")
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment