Commit 5b54140c authored by Katharina Heck's avatar Katharina Heck
Browse files

[cleanup] add label in cmake add boundary in testname

parent 8f6b7b3d
add_input_file_links()
dune_add_test(NAME test_md_darcy1p2c_stokes1p2c_maxwellstefan
dune_add_test(NAME test_md_boundary_darcy1p2c_stokes1p2c_maxwellstefan
LABELS multidomain
SOURCES main.cc
CMAKE_GUARD HAVE_UMFPACK
COMPILE_DEFINITIONS DIFFUSIONTYPE=MaxwellStefansLaw<TypeTag>
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMD_ARGS --script fuzzy
--files ${CMAKE_SOURCE_DIR}/test/references/test_md_darcy1p2c_stokes1p2c_comparison_stokes-reference.vtu
${CMAKE_CURRENT_BINARY_DIR}/test_md_darcy1p2c_stokes1p2c_comparison_stokes-00020.vtu
${CMAKE_SOURCE_DIR}/test/references/test_md_darcy1p2c_stokes1p2c_comparison_darcy-reference.vtu
${CMAKE_CURRENT_BINARY_DIR}/test_md_darcy1p2c_stokes1p2c_comparison_darcy-00020.vtu
--files ${CMAKE_SOURCE_DIR}/test/references/test_md_boundary_darcy1p2c_stokes1p2c_comparison_stokes-reference.vtu
${CMAKE_CURRENT_BINARY_DIR}/test_md_boundary_darcy1p2c_stokes1p2c_comparison_stokes-00020.vtu
${CMAKE_SOURCE_DIR}/test/references/test_md_boundary_darcy1p2c_stokes1p2c_comparison_darcy-reference.vtu
${CMAKE_CURRENT_BINARY_DIR}/test_md_boundary_darcy1p2c_stokes1p2c_comparison_darcy-00020.vtu
--command "${CMAKE_CURRENT_BINARY_DIR}/test_md_darcy1p2c_stokes1p2c_maxwellstefan params.input")
--command "${CMAKE_CURRENT_BINARY_DIR}/test_md_boundary_darcy1p2c_stokes1p2c_maxwellstefan params.input")
dune_add_test(NAME test_md_darcy1p2c_stokes1p2c_fickslaw
dune_add_test(NAME test_md_boundary_darcy1p2c_stokes1p2c_fickslaw
LABELS multidomain
SOURCES main.cc
CMAKE_GUARD HAVE_UMFPACK
COMPILE_DEFINITIONS DIFFUSIONTYPE=FicksLaw<TypeTag>
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMD_ARGS --script fuzzy
--files ${CMAKE_SOURCE_DIR}/test/references/test_md_darcy1p2c_stokes1p2c_comparison_stokes-reference.vtu
${CMAKE_CURRENT_BINARY_DIR}/test_md_darcy1p2c_stokes1p2c_comparison_stokes-00020.vtu
${CMAKE_SOURCE_DIR}/test/references/test_md_darcy1p2c_stokes1p2c_comparison_darcy-reference.vtu
${CMAKE_CURRENT_BINARY_DIR}/test_md_darcy1p2c_stokes1p2c_comparison_darcy-00020.vtu
--files ${CMAKE_SOURCE_DIR}/test/references/test_md_boundary_darcy1p2c_stokes1p2c_comparison_stokes-reference.vtu
${CMAKE_CURRENT_BINARY_DIR}/test_md_boundary_darcy1p2c_stokes1p2c_comparison_stokes-00020.vtu
${CMAKE_SOURCE_DIR}/test/references/test_md_boundary_darcy1p2c_stokes1p2c_comparison_darcy-reference.vtu
${CMAKE_CURRENT_BINARY_DIR}/test_md_boundary_darcy1p2c_stokes1p2c_comparison_darcy-00020.vtu
--command "${CMAKE_CURRENT_BINARY_DIR}/test_md_darcy1p2c_stokes1p2c_fickslaw params.input")
--command "${CMAKE_CURRENT_BINARY_DIR}/test_md_boundary_darcy1p2c_stokes1p2c_fickslaw params.input")
......@@ -56,16 +56,16 @@ namespace Dumux {
namespace Properties {
template<class TypeTag>
struct CouplingManager<TypeTag, TTag::StokesOnePTwoCTypeTag>
struct CouplingManager<TypeTag, TTag::StokesOnePTwoC>
{
using Traits = StaggeredMultiDomainTraits<TypeTag, TypeTag, Properties::TTag::DarcyOnePTwoCTypeTag>;
using Traits = StaggeredMultiDomainTraits<TypeTag, TypeTag, Properties::TTag::DarcyOnePTwoC>;
using type = Dumux::StokesDarcyCouplingManager<Traits>;
};
template<class TypeTag>
struct CouplingManager<TypeTag, TTag::DarcyOnePTwoCTypeTag>
struct CouplingManager<TypeTag, TTag::DarcyOnePTwoC>
{
using Traits = StaggeredMultiDomainTraits<Properties::TTag::StokesOnePTwoCTypeTag, Properties::TTag::StokesOnePTwoCTypeTag, TypeTag>;
using Traits = StaggeredMultiDomainTraits<Properties::TTag::StokesOnePTwoC, Properties::TTag::StokesOnePTwoC, TypeTag>;
using type = Dumux::StokesDarcyCouplingManager<Traits>;
};
......@@ -87,8 +87,8 @@ int main(int argc, char** argv) try
Parameters::init(argc, argv);
// Define the sub problem type tags
using StokesTypeTag = Properties::TTag::StokesOnePTwoCTypeTag;
using DarcyTypeTag = Properties::TTag::DarcyOnePTwoCTypeTag;
using StokesTypeTag = Properties::TTag::StokesOnePTwoC;
using DarcyTypeTag = Properties::TTag::DarcyOnePTwoC;
// try to create a grid (from the given grid file or the input file)
// for both sub-domains
......
......@@ -31,7 +31,7 @@ Porosity = 0.3
Tortuosity = 0.5
[Problem]
Name = test_md_darcy1p2c_stokes1p2c_comparison
Name = test_md_boundary_darcy1p2c_stokes1p2c_comparison
EnableGravity = false
EnableInertiaTerms = true
......
......@@ -47,16 +47,16 @@ namespace Properties
{
// Create new type tags
namespace TTag {
struct DarcyOnePTwoCTypeTag { using InheritsFrom = std::tuple<OnePNC, CCTpfaModel>; };
struct DarcyOnePTwoC { using InheritsFrom = std::tuple<OnePNC, CCTpfaModel>; };
} // end namespace TTag
// Set the problem property
template<class TypeTag>
struct Problem<TypeTag, TTag::DarcyOnePTwoCTypeTag> { using type = Dumux::DarcySubProblem<TypeTag>; };
struct Problem<TypeTag, TTag::DarcyOnePTwoC> { using type = Dumux::DarcySubProblem<TypeTag>; };
// The fluid system
template<class TypeTag>
struct FluidSystem<TypeTag, TTag::DarcyOnePTwoCTypeTag>
struct FluidSystem<TypeTag, TTag::DarcyOnePTwoC>
{
using H2OAir = FluidSystems::H2OAir<GetPropType<TypeTag, Properties::Scalar>>;
static constexpr auto phaseIdx = H2OAir::liquidPhaseIdx; // simulate the water phase
......@@ -65,27 +65,27 @@ struct FluidSystem<TypeTag, TTag::DarcyOnePTwoCTypeTag>
// Use moles
template<class TypeTag>
struct UseMoles<TypeTag, TTag::DarcyOnePTwoCTypeTag> { static constexpr bool value = true; };
struct UseMoles<TypeTag, TTag::DarcyOnePTwoC> { static constexpr bool value = true; };
// Do not replace one equation with a total mass balance
template<class TypeTag>
struct ReplaceCompEqIdx<TypeTag, TTag::DarcyOnePTwoCTypeTag> { static constexpr int value = 3; };
struct ReplaceCompEqIdx<TypeTag, TTag::DarcyOnePTwoC> { static constexpr int value = 3; };
//! Use a model with constant tortuosity for the effective diffusivity
SET_TYPE_PROP(DarcyOnePTwoCTypeTag, EffectiveDiffusivityModel,
SET_TYPE_PROP(DarcyOnePTwoC, EffectiveDiffusivityModel,
DiffusivityConstantTortuosity<GetPropType<TypeTag, Properties::Scalar>>);
// Set the grid type
template<class TypeTag>
struct Grid<TypeTag, TTag::DarcyOnePTwoCTypeTag> { using type = Dune::YaspGrid<2>; };
struct Grid<TypeTag, TTag::DarcyOnePTwoC> { using type = Dune::YaspGrid<2>; };
// Set the diffusion type
template<class TypeTag>
struct MolecularDiffusionType<TypeTag, TTag::DarcyOnePTwoCTypeTag> { using type = DIFFUSIONTYPE; };
struct MolecularDiffusionType<TypeTag, TTag::DarcyOnePTwoC> { using type = DIFFUSIONTYPE; };
// Set the spatial paramaters type
template<class TypeTag>
struct SpatialParams<TypeTag, TTag::DarcyOnePTwoCTypeTag>
struct SpatialParams<TypeTag, TTag::DarcyOnePTwoC>
{
using FVGridGeometry = GetPropType<TypeTag, Properties::FVGridGeometry>;
using Scalar = GetPropType<TypeTag, Properties::Scalar>;
......
......@@ -43,12 +43,12 @@ namespace Properties
{
// Create new type tags
namespace TTag {
struct StokesOnePTwoCTypeTag { using InheritsFrom = std::tuple<NavierStokesNC, StaggeredFreeFlowModel>; };
struct StokesOnePTwoC { using InheritsFrom = std::tuple<NavierStokesNC, StaggeredFreeFlowModel>; };
} // end namespace TTag
// The fluid system
template<class TypeTag>
struct FluidSystem<TypeTag, TTag::StokesOnePTwoCTypeTag>
struct FluidSystem<TypeTag, TTag::StokesOnePTwoC>
{
using H2OAir = FluidSystems::H2OAir<GetPropType<TypeTag, Properties::Scalar>>;
static constexpr auto phaseIdx = H2OAir::liquidPhaseIdx; // simulate the water phase
......@@ -57,30 +57,30 @@ struct FluidSystem<TypeTag, TTag::StokesOnePTwoCTypeTag>
// Set the grid type
template<class TypeTag>
struct Grid<TypeTag, TTag::StokesOnePTwoCTypeTag> { using type = Dune::YaspGrid<2, Dune::EquidistantOffsetCoordinates<GetPropType<TypeTag, Properties::Scalar>, 2> >; };
struct Grid<TypeTag, TTag::StokesOnePTwoC> { using type = Dune::YaspGrid<2, Dune::EquidistantOffsetCoordinates<GetPropType<TypeTag, Properties::Scalar>, 2> >; };
// Set the problem property
template<class TypeTag>
struct Problem<TypeTag, TTag::StokesOnePTwoCTypeTag> { using type = Dumux::StokesSubProblem<TypeTag> ; };
struct Problem<TypeTag, TTag::StokesOnePTwoC> { using type = Dumux::StokesSubProblem<TypeTag> ; };
template<class TypeTag>
struct EnableFVGridGeometryCache<TypeTag, TTag::StokesOnePTwoCTypeTag> { static constexpr bool value = true; };
struct EnableFVGridGeometryCache<TypeTag, TTag::StokesOnePTwoC> { static constexpr bool value = true; };
template<class TypeTag>
struct EnableGridFluxVariablesCache<TypeTag, TTag::StokesOnePTwoCTypeTag> { static constexpr bool value = true; };
struct EnableGridFluxVariablesCache<TypeTag, TTag::StokesOnePTwoC> { static constexpr bool value = true; };
template<class TypeTag>
struct EnableGridVolumeVariablesCache<TypeTag, TTag::StokesOnePTwoCTypeTag> { static constexpr bool value = true; };
struct EnableGridVolumeVariablesCache<TypeTag, TTag::StokesOnePTwoC> { static constexpr bool value = true; };
// Use moles
template<class TypeTag>
struct UseMoles<TypeTag, TTag::StokesOnePTwoCTypeTag> { static constexpr bool value = true; };
struct UseMoles<TypeTag, TTag::StokesOnePTwoC> { static constexpr bool value = true; };
// Set the grid type
template<class TypeTag>
struct MolecularDiffusionType<TypeTag, TTag::StokesOnePTwoCTypeTag> { using type = DIFFUSIONTYPE; };
struct MolecularDiffusionType<TypeTag, TTag::StokesOnePTwoC> { using type = DIFFUSIONTYPE; };
// Do not replace one equation with a total mass balance
template<class TypeTag>
struct ReplaceCompEqIdx<TypeTag, TTag::StokesOnePTwoCTypeTag> { static constexpr int value = 3; };
struct ReplaceCompEqIdx<TypeTag, TTag::StokesOnePTwoC> { static constexpr int value = 3; };
}
/*!
......
add_input_file_links()
dune_add_test(NAME test_md_darcy1p3c_stokes1p3c_horizontal
dune_add_test(NAME test_md_boundary_darcy1p3c_stokes1p3c_horizontal
LABELS multidomain
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_md_darcy1p3c_stokes1p3c_horizontal_stokes-reference.vtu
${CMAKE_CURRENT_BINARY_DIR}/test_md_darcy1p3c_stokes1p3c_horizontal_stokes-00015.vtu
${CMAKE_SOURCE_DIR}/test/references/test_md_darcy1p3c_stokes1p3c_horizontal_darcy-reference.vtu
${CMAKE_CURRENT_BINARY_DIR}/test_md_darcy1p3c_stokes1p3c_horizontal_darcy-00015.vtu
--files ${CMAKE_SOURCE_DIR}/test/references/test_md_boundary_darcy1p3c_stokes1p3c_horizontal_stokes-reference.vtu
${CMAKE_CURRENT_BINARY_DIR}/test_md_boundary_darcy1p3c_stokes1p3c_horizontal_stokes-00015.vtu
${CMAKE_SOURCE_DIR}/test/references/test_md_boundary_darcy1p3c_stokes1p3c_horizontal_darcy-reference.vtu
${CMAKE_CURRENT_BINARY_DIR}/test_md_boundary_darcy1p3c_stokes1p3c_horizontal_darcy-00015.vtu
--command "${CMAKE_CURRENT_BINARY_DIR}/test_md_darcy1p3c_stokes1p3c_horizontal params.input")
--command "${CMAKE_CURRENT_BINARY_DIR}/test_md_boundary_darcy1p3c_stokes1p3c_horizontal params.input")
......@@ -56,16 +56,16 @@ namespace Dumux {
namespace Properties {
template<class TypeTag>
struct CouplingManager<TypeTag, TTag::StokesOnePThreeCTypeTag>
struct CouplingManager<TypeTag, TTag::StokesOnePThreeC>
{
using Traits = StaggeredMultiDomainTraits<TypeTag, TypeTag, Properties::TTag::DarcyOnePThreeCTypeTag>;
using Traits = StaggeredMultiDomainTraits<TypeTag, TypeTag, Properties::TTag::DarcyOnePThreeC>;
using type = Dumux::StokesDarcyCouplingManager<Traits>;
};
template<class TypeTag>
struct CouplingManager<TypeTag, TTag::DarcyOnePThreeCTypeTag>
struct CouplingManager<TypeTag, TTag::DarcyOnePThreeC>
{
using Traits = StaggeredMultiDomainTraits<Properties::TTag::StokesOnePThreeCTypeTag, Properties::TTag::StokesOnePThreeCTypeTag, TypeTag>;
using Traits = StaggeredMultiDomainTraits<Properties::TTag::StokesOnePThreeC, Properties::TTag::StokesOnePThreeC, TypeTag>;
using type = Dumux::StokesDarcyCouplingManager<Traits>;
};
......@@ -87,8 +87,8 @@ int main(int argc, char** argv) try
Parameters::init(argc, argv);
// Define the sub problem type tags
using StokesTypeTag = Properties::TTag::StokesOnePThreeCTypeTag;
using DarcyTypeTag = Properties::TTag::DarcyOnePThreeCTypeTag;
using StokesTypeTag = Properties::TTag::StokesOnePThreeC;
using DarcyTypeTag = Properties::TTag::DarcyOnePThreeC;
// try to create a grid (from the given grid file or the input file)
// for both sub-domains
......
......@@ -29,7 +29,7 @@ Porosity = 0.3
Tortuosity = 0.5
[Problem]
Name = test_md_darcy1p3c_stokes1p3c_horizontal
Name = test_md_boundary_darcy1p3c_stokes1p3c_horizontal
EnableGravity = false
[Vtk]
......
......@@ -46,39 +46,39 @@ namespace Properties
{
// Create new type tags
namespace TTag {
struct DarcyOnePThreeCTypeTag { using InheritsFrom = std::tuple<OnePNC, CCTpfaModel>; };
struct DarcyOnePThreeC { using InheritsFrom = std::tuple<OnePNC, CCTpfaModel>; };
} // end namespace TTag
// Set the problem property
template<class TypeTag>
struct Problem<TypeTag, TTag::DarcyOnePThreeCTypeTag> { using type = Dumux::DarcySubProblem<TypeTag>; };
struct Problem<TypeTag, TTag::DarcyOnePThreeC> { using type = Dumux::DarcySubProblem<TypeTag>; };
template<class TypeTag>
struct FluidSystem<TypeTag, TTag::DarcyOnePThreeCTypeTag> { using type = FluidSystems::H2N2CO2FluidSystem<GetPropType<TypeTag, Properties::Scalar>>; };
struct FluidSystem<TypeTag, TTag::DarcyOnePThreeC> { using type = FluidSystems::H2N2CO2FluidSystem<GetPropType<TypeTag, Properties::Scalar>>; };
// Use moles
template<class TypeTag>
struct UseMoles<TypeTag, TTag::DarcyOnePThreeCTypeTag> { static constexpr bool value = true; };
struct UseMoles<TypeTag, TTag::DarcyOnePThreeC> { static constexpr bool value = true; };
// Do not replace one equation with a total mass balance
template<class TypeTag>
struct ReplaceCompEqIdx<TypeTag, TTag::DarcyOnePThreeCTypeTag> { static constexpr int value = 3; };
struct ReplaceCompEqIdx<TypeTag, TTag::DarcyOnePThreeC> { static constexpr int value = 3; };
//! Use a model with constant tortuosity for the effective diffusivity
SET_TYPE_PROP(DarcyOnePThreeCTypeTag, EffectiveDiffusivityModel,
SET_TYPE_PROP(DarcyOnePThreeC, EffectiveDiffusivityModel,
DiffusivityConstantTortuosity<GetPropType<TypeTag, Properties::Scalar>>);
// Set the grid type
template<class TypeTag>
struct Grid<TypeTag, TTag::DarcyOnePThreeCTypeTag> { using type = Dune::YaspGrid<2>; };
struct Grid<TypeTag, TTag::DarcyOnePThreeC> { using type = Dune::YaspGrid<2>; };
//Set the diffusion type
template<class TypeTag>
struct MolecularDiffusionType<TypeTag, TTag::DarcyOnePThreeCTypeTag> { using type = MaxwellStefansLaw<TypeTag>; };
struct MolecularDiffusionType<TypeTag, TTag::DarcyOnePThreeC> { using type = MaxwellStefansLaw<TypeTag>; };
// Set the spatial paramaters type
template<class TypeTag>
struct SpatialParams<TypeTag, TTag::DarcyOnePThreeCTypeTag>
struct SpatialParams<TypeTag, TTag::DarcyOnePThreeC>
{
using FVGridGeometry = GetPropType<TypeTag, Properties::FVGridGeometry>;
using Scalar = GetPropType<TypeTag, Properties::Scalar>;
......
......@@ -42,39 +42,39 @@ namespace Properties
{
// Create new type tags
namespace TTag {
struct StokesOnePThreeCTypeTag { using InheritsFrom = std::tuple<NavierStokesNC, StaggeredFreeFlowModel>; };
struct StokesOnePThreeC { using InheritsFrom = std::tuple<NavierStokesNC, StaggeredFreeFlowModel>; };
} // end namespace TTag
// Set the fluid system
template<class TypeTag>
struct FluidSystem<TypeTag, TTag::StokesOnePThreeCTypeTag> { using type = FluidSystems::H2N2CO2FluidSystem<GetPropType<TypeTag, Properties::Scalar>>; };
struct FluidSystem<TypeTag, TTag::StokesOnePThreeC> { using type = FluidSystems::H2N2CO2FluidSystem<GetPropType<TypeTag, Properties::Scalar>>; };
// Set the grid type
template<class TypeTag>
struct Grid<TypeTag, TTag::StokesOnePThreeCTypeTag> { using type = Dune::YaspGrid<2, Dune::EquidistantOffsetCoordinates<GetPropType<TypeTag, Properties::Scalar>, 2> >; };
struct Grid<TypeTag, TTag::StokesOnePThreeC> { using type = Dune::YaspGrid<2, Dune::EquidistantOffsetCoordinates<GetPropType<TypeTag, Properties::Scalar>, 2> >; };
// Set the problem property
template<class TypeTag>
struct Problem<TypeTag, TTag::StokesOnePThreeCTypeTag> { using type = Dumux::StokesSubProblem<TypeTag> ; };
struct Problem<TypeTag, TTag::StokesOnePThreeC> { using type = Dumux::StokesSubProblem<TypeTag> ; };
template<class TypeTag>
struct EnableFVGridGeometryCache<TypeTag, TTag::StokesOnePThreeCTypeTag> { static constexpr bool value = true; };
struct EnableFVGridGeometryCache<TypeTag, TTag::StokesOnePThreeC> { static constexpr bool value = true; };
template<class TypeTag>
struct EnableGridFluxVariablesCache<TypeTag, TTag::StokesOnePThreeCTypeTag> { static constexpr bool value = true; };
struct EnableGridFluxVariablesCache<TypeTag, TTag::StokesOnePThreeC> { static constexpr bool value = true; };
template<class TypeTag>
struct EnableGridVolumeVariablesCache<TypeTag, TTag::StokesOnePThreeCTypeTag> { static constexpr bool value = true; };
struct EnableGridVolumeVariablesCache<TypeTag, TTag::StokesOnePThreeC> { static constexpr bool value = true; };
// Use moles
template<class TypeTag>
struct UseMoles<TypeTag, TTag::StokesOnePThreeCTypeTag> { static constexpr bool value = true; };
struct UseMoles<TypeTag, TTag::StokesOnePThreeC> { static constexpr bool value = true; };
// Set the grid type
template<class TypeTag>
struct MolecularDiffusionType<TypeTag, TTag::StokesOnePThreeCTypeTag> { using type = MaxwellStefansLaw<TypeTag>; };
struct MolecularDiffusionType<TypeTag, TTag::StokesOnePThreeC> { using type = MaxwellStefansLaw<TypeTag>; };
// Do not replace one equation with a total mass balance
template<class TypeTag>
struct ReplaceCompEqIdx<TypeTag, TTag::StokesOnePThreeCTypeTag> { static constexpr int value = 3; };
struct ReplaceCompEqIdx<TypeTag, TTag::StokesOnePThreeC> { static constexpr int value = 3; };
}
......
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