Commit 4d5efe3a authored by Timo Koch's avatar Timo Koch

[test][md][embedded] Replace enums by tags (eliminates deprecation warnings)

parent b138ad1c
......@@ -58,14 +58,14 @@ template<class TypeTag>
struct CouplingManager<TypeTag, TTag::Soil>
{
using Traits = MultiDomainTraits<TypeTag, Properties::TTag::Root>;
using type = EmbeddedCouplingManager1d3d<Traits, EmbeddedCouplingMode::average>;
using type = Embedded1d3dCouplingManager<Traits, Embedded1d3dCouplingMode::Average>;
};
template<class TypeTag>
struct CouplingManager<TypeTag, TTag::Root>
{
using Traits = MultiDomainTraits<Properties::TTag::Soil, TypeTag>;
using type = EmbeddedCouplingManager1d3d<Traits, EmbeddedCouplingMode::average>;
using type = Embedded1d3dCouplingManager<Traits, Embedded1d3dCouplingMode::Average>;
};
template<class TypeTag>
......
dumux_add_test(NAME test_md_embedded_1d3d_1p1p_tpfatpfa_average
LABELS multidomain multidomain_embedded 1p
SOURCES main.cc
COMPILE_DEFINITIONS BULKTYPETAG=TissueCC LOWDIMTYPETAG=BloodFlowCC COUPLINGMODE=EmbeddedCouplingMode::average
COMPILE_DEFINITIONS BULKTYPETAG=TissueCC LOWDIMTYPETAG=BloodFlowCC COUPLINGMODE=Embedded1d3dCouplingMode::Average
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMAKE_GUARD dune-foamgrid_FOUND
CMD_ARGS --script fuzzy
......@@ -15,7 +15,7 @@ dumux_add_test(NAME test_md_embedded_1d3d_1p1p_tpfatpfa_average
dumux_add_test(NAME test_md_embedded_1d3d_1p1p_boxtpfa_average
LABELS multidomain multidomain_embedded 1p
SOURCES main.cc
COMPILE_DEFINITIONS BULKTYPETAG=TissueBox LOWDIMTYPETAG=BloodFlowCC COUPLINGMODE=EmbeddedCouplingMode::average
COMPILE_DEFINITIONS BULKTYPETAG=TissueBox LOWDIMTYPETAG=BloodFlowCC COUPLINGMODE=Embedded1d3dCouplingMode::Average
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMAKE_GUARD dune-foamgrid_FOUND
CMD_ARGS --script fuzzy
......@@ -29,7 +29,7 @@ dumux_add_test(NAME test_md_embedded_1d3d_1p1p_boxtpfa_average
dumux_add_test(NAME test_md_embedded_1d3d_1p1p_tpfabox_average
LABELS multidomain multidomain_embedded 1p
SOURCES main.cc
COMPILE_DEFINITIONS BULKTYPETAG=TissueCC LOWDIMTYPETAG=BloodFlowBox COUPLINGMODE=EmbeddedCouplingMode::average
COMPILE_DEFINITIONS BULKTYPETAG=TissueCC LOWDIMTYPETAG=BloodFlowBox COUPLINGMODE=Embedded1d3dCouplingMode::Average
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMAKE_GUARD dune-foamgrid_FOUND
CMD_ARGS --script fuzzy
......@@ -43,7 +43,7 @@ dumux_add_test(NAME test_md_embedded_1d3d_1p1p_tpfabox_average
dumux_add_test(NAME test_md_embedded_1d3d_1p1p_boxbox_average
LABELS multidomain multidomain_embedded 1p
SOURCES main.cc
COMPILE_DEFINITIONS BULKTYPETAG=TissueBox LOWDIMTYPETAG=BloodFlowBox COUPLINGMODE=EmbeddedCouplingMode::average
COMPILE_DEFINITIONS BULKTYPETAG=TissueBox LOWDIMTYPETAG=BloodFlowBox COUPLINGMODE=Embedded1d3dCouplingMode::Average
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMAKE_GUARD dune-foamgrid_FOUND
CMD_ARGS --script fuzzy
......@@ -55,18 +55,18 @@ dumux_add_test(NAME test_md_embedded_1d3d_1p1p_boxbox_average
-Vtk.OutputName test_md_embedded_1d3d_1p1p_boxbox_average -Tissue.Grid.Cells \"19 19 19\"")
# make sure these configurations compile and run too
dumux_add_test(NAME test_md_embedded_1d3d_1p1p_tpfatpfa_cylindersources
dumux_add_test(NAME test_md_embedded_1d3d_1p1p_tpfatpfa_surface
LABELS multidomain multidomain_embedded 1p
SOURCES main.cc
COMPILE_DEFINITIONS BULKTYPETAG=TissueCC LOWDIMTYPETAG=BloodFlowCC COUPLINGMODE=EmbeddedCouplingMode::cylindersources
COMMAND ./test_md_embedded_1d3d_1p1p_tpfatpfa_cylindersources
COMPILE_DEFINITIONS BULKTYPETAG=TissueCC LOWDIMTYPETAG=BloodFlowCC COUPLINGMODE=Embedded1d3dCouplingMode::Surface
COMMAND ./test_md_embedded_1d3d_1p1p_tpfatpfa_surface
CMAKE_GUARD dune-foamgrid_FOUND
CMD_ARGS params.input)
dumux_add_test(NAME test_md_embedded_1d3d_1p1p_tpfatpfa_line
LABELS multidomain multidomain_embedded 1p
SOURCES main.cc
COMPILE_DEFINITIONS BULKTYPETAG=TissueCC LOWDIMTYPETAG=BloodFlowCC COUPLINGMODE=EmbeddedCouplingMode::line
COMPILE_DEFINITIONS BULKTYPETAG=TissueCC LOWDIMTYPETAG=BloodFlowCC COUPLINGMODE=Embedded1d3dCouplingMode::Line
COMMAND ./test_md_embedded_1d3d_1p1p_tpfatpfa_line
CMAKE_GUARD dune-foamgrid_FOUND
CMD_ARGS params.input)
......@@ -74,7 +74,7 @@ dumux_add_test(NAME test_md_embedded_1d3d_1p1p_tpfatpfa_line
dumux_add_test(NAME test_md_embedded_1d3d_1p1p_tpfatpfa_kernel
LABELS multidomain multidomain_embedded 1p
SOURCES main.cc
COMPILE_DEFINITIONS BULKTYPETAG=TissueCC LOWDIMTYPETAG=BloodFlowCC COUPLINGMODE=EmbeddedCouplingMode::kernel
COMPILE_DEFINITIONS BULKTYPETAG=TissueCC LOWDIMTYPETAG=BloodFlowCC COUPLINGMODE=Embedded1d3dCouplingMode::Kernel
COMMAND ./test_md_embedded_1d3d_1p1p_tpfatpfa_kernel
CMAKE_GUARD dune-foamgrid_FOUND
CMD_ARGS params.input)
......
......@@ -60,14 +60,14 @@
#define LOWDIMTYPETAG=BloodFlowCC
#endif
#ifndef COUPLINGMODE
#define COUPLINGMODE=EmbeddedCouplingMode::average
#define COUPLINGMODE=Embedded1d3dCouplingMode::Average
#endif
namespace Dumux {
namespace Properties {
template<class Traits>
using TheCouplingManager = EmbeddedCouplingManager1d3d<Traits, COUPLINGMODE>;
using TheCouplingManager = Embedded1d3dCouplingManager<Traits, COUPLINGMODE>;
template<class TypeTag>
struct CouplingManager<TypeTag, TTag::BULKTYPETAG> { using type = TheCouplingManager<MultiDomainTraits<TypeTag, Properties::TTag::LOWDIMTYPETAG>>; };
......
......@@ -257,7 +257,7 @@ public:
* that mass is created, negative ones mean that it vanishes.
*/
template<class ElementVolumeVariables,
bool enable = (CouplingManager::couplingMode == EmbeddedCouplingMode::kernel),
bool enable = (CouplingManager::couplingMode == Embedded1d3dCouplingMode::kernel),
std::enable_if_t<!enable, int> = 0>
void pointSource(PointSource& source,
const Element &element,
......@@ -279,7 +279,7 @@ public:
//! Specialization for kernel method
template<class ElementVolumeVariables,
bool enable = (CouplingManager::couplingMode == EmbeddedCouplingMode::kernel),
bool enable = (CouplingManager::couplingMode == Embedded1d3dCouplingMode::kernel),
std::enable_if_t<enable, int> = 0>
void pointSource(PointSource& source,
const Element &element,
......
......@@ -277,7 +277,7 @@ public:
* E.g. for the mass balance that would be a mass rate in \f$ [ kg / (m^3 \cdot s)] \f$.
*/
template<class ElementVolumeVariables,
bool enable = (CouplingManager::couplingMode == EmbeddedCouplingMode::kernel),
bool enable = (CouplingManager::couplingMode == Embedded1d3dCouplingMode::kernel),
std::enable_if_t<enable, int> = 0>
NumEqVector source(const Element &element,
const FVElementGeometry& fvGeometry,
......@@ -317,7 +317,7 @@ public:
//! Other methods
template<class ElementVolumeVariables,
bool enable = (CouplingManager::couplingMode == EmbeddedCouplingMode::kernel),
bool enable = (CouplingManager::couplingMode == Embedded1d3dCouplingMode::kernel),
std::enable_if_t<!enable, int> = 0>
NumEqVector source(const Element &element,
const FVElementGeometry& fvGeometry,
......@@ -364,7 +364,7 @@ public:
Scalar exactSolution(const GlobalPosition &globalPos) const
{
Dune::FieldVector<double, 2> xy({globalPos[0], globalPos[1]});
if (CouplingManager::couplingMode == EmbeddedCouplingMode::cylindersources)
if (CouplingManager::couplingMode == Embedded1d3dCouplingMode::surface)
{
static const auto R = getParam<Scalar>("SpatialParams.Radius");
if (xy.two_norm() > R)
......@@ -373,7 +373,7 @@ public:
return -1.0*(1+globalPos[2])/(2*M_PI)*std::log(R);
}
else if (CouplingManager::couplingMode == EmbeddedCouplingMode::kernel)
else if (CouplingManager::couplingMode == Embedded1d3dCouplingMode::kernel)
{
static const auto rho = getParam<Scalar>("MixedDimension.KernelWidth");
const auto& r = xy.two_norm();
......
......@@ -57,14 +57,14 @@ template<class TypeTag>
struct CouplingManager<TypeTag, TTag::SOILTYPETAG>
{
using Traits = MultiDomainTraits<TypeTag, Properties::TTag::Root>;
using type = EmbeddedCouplingManager1d3d<Traits, EmbeddedCouplingMode::average>;
using type = Embedded1d3dCouplingManager<Traits, Embedded1d3dCouplingMode::Average>;
};
template<class TypeTag>
struct CouplingManager<TypeTag, TTag::Root>
{
using Traits = MultiDomainTraits<Properties::TTag::SOILTYPETAG, TypeTag>;
using type = EmbeddedCouplingManager1d3d<Traits, EmbeddedCouplingMode::average>;
using type = Embedded1d3dCouplingManager<Traits, Embedded1d3dCouplingMode::Average>;
};
template<class TypeTag>
......
Markdown is supported
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