Commit ed5e9bcc authored by Ivan Buntic's avatar Ivan Buntic Committed by Timo Koch
Browse files

[disc][porousmediumflow][porenetwork][2p] Use discretization tag instead of...

[disc][porousmediumflow][porenetwork][2p] Use discretization tag instead of enum as template argument.
parent 7df47c93
......@@ -108,7 +108,7 @@ private:
using MT = GetPropType<TypeTag, Properties::ModelTraits>;
using PT = typename GetPropType<TypeTag, Properties::SpatialParams>::PermeabilityType;
static constexpr auto DM = GetPropType<TypeTag, Properties::GridGeometry>::discMethod;
using DM = typename GetPropType<TypeTag, Properties::GridGeometry>::DiscretizationMethod;
static constexpr bool enableIS = getPropValue<TypeTag, Properties::EnableBoxInterfaceSolver>();
// class used for scv-wise reconstruction of non-wetting phase saturations
using SR = TwoPScvSaturationReconstruction<DM, enableIS>;
......@@ -196,7 +196,7 @@ private:
using SST = GetPropType<TypeTag, Properties::SolidState>;
using MT = GetPropType<TypeTag, Properties::ModelTraits>;
using PT = typename GetPropType<TypeTag, Properties::SpatialParams>::PermeabilityType;
static constexpr auto DM = GetPropType<TypeTag, Properties::GridGeometry>::discMethod;
using DM = typename GetPropType<TypeTag, Properties::GridGeometry>::DiscretizationMethod;
static constexpr bool enableIS = getPropValue<TypeTag, Properties::EnableBoxInterfaceSolver>();
// class used for scv-wise reconstruction of non-wetting phase saturations
using SR = Dumux::TwoPScvSaturationReconstruction<DM, enableIS>;
......
......@@ -179,8 +179,7 @@ private:
using SST = GetPropType<TypeTag, Properties::SolidState>;
using MT = GetPropType<TypeTag, Properties::ModelTraits>;
using PT = typename GetPropType<TypeTag, Properties::SpatialParams>::PermeabilityType;
static constexpr auto DM = GetPropType<TypeTag, Properties::GridGeometry>::discMethod;
using DM = typename GetPropType<TypeTag, Properties::GridGeometry>::DiscretizationMethod;
static constexpr bool enableIS = getPropValue<TypeTag, Properties::EnableBoxInterfaceSolver>();
// class used for scv-wise reconstruction of nonwetting phase saturations
using SR = TwoPScvSaturationReconstruction<DM, enableIS>;
......@@ -221,7 +220,7 @@ private:
using SST = GetPropType<TypeTag, Properties::SolidState>;
using MT = GetPropType<TypeTag, Properties::ModelTraits>;
using PT = typename GetPropType<TypeTag, Properties::SpatialParams>::PermeabilityType;
static constexpr auto DM = GetPropType<TypeTag, Properties::GridGeometry>::discMethod;
using DM = typename GetPropType<TypeTag, Properties::GridGeometry>::DiscretizationMethod;
static constexpr bool enableIS = getPropValue<TypeTag, Properties::EnableBoxInterfaceSolver>();
// class used for scv-wise reconstruction of nonwetting phase saturations
using SR = TwoPScvSaturationReconstruction<DM, enableIS>;
......
......@@ -38,7 +38,7 @@ namespace Dumux {
* freedom lie on material interfaces. There the nonwetting phase saturation is
* generally discontinuous.
*/
template<DiscretizationMethod M, bool enableReconstruction>
template<class DiscretizationMethod, bool enableReconstruction>
class TwoPScvSaturationReconstruction
{
public:
......@@ -67,7 +67,7 @@ public:
//! Specialization for the box scheme with the interface solver enabled
template<>
class TwoPScvSaturationReconstruction<DiscretizationMethod::box, /*enableReconstruction*/true>
class TwoPScvSaturationReconstruction<DiscretizationMethods::Box, /*enableReconstruction*/true>
{
public:
/*!
......
......@@ -144,7 +144,7 @@ private:
using SST = GetPropType<TypeTag, Properties::SolidState>;
using PT = typename GetPropType<TypeTag, Properties::SpatialParams>::PermeabilityType;
using MT = GetPropType<TypeTag, Properties::ModelTraits>;
static constexpr auto DM = GetPropType<TypeTag, Properties::GridGeometry>::discMethod;
using DM = typename GetPropType<TypeTag, Properties::GridGeometry>::DiscretizationMethod;
static constexpr bool enableIS = getPropValue<TypeTag, Properties::EnableBoxInterfaceSolver>();
static_assert(FSY::numComponents == 2, "Only fluid systems with 2 components are supported by the 2p2c model!");
static_assert(FSY::numPhases == 2, "Only fluid systems with 2 phases are supported by the 2p2c model!");
......@@ -195,7 +195,7 @@ private:
using SST = GetPropType<TypeTag, Properties::SolidState>;
using PT = typename GetPropType<TypeTag, Properties::SpatialParams>::PermeabilityType;
using MT = GetPropType<TypeTag, Properties::ModelTraits>;
static constexpr auto DM = GetPropType<TypeTag, Properties::GridGeometry>::discMethod;
using DM = typename GetPropType<TypeTag, Properties::GridGeometry>::DiscretizationMethod;
static constexpr bool enableIS = getPropValue<TypeTag, Properties::EnableBoxInterfaceSolver>();
// class used for scv-wise reconstruction of nonwetting phase saturations
using SR = TwoPScvSaturationReconstruction<DM, enableIS>;
......@@ -298,7 +298,7 @@ private:
using SST = GetPropType<TypeTag, Properties::SolidState>;
using PT = typename GetPropType<TypeTag, Properties::SpatialParams>::PermeabilityType;
using MT = GetPropType<TypeTag, Properties::ModelTraits>;
static constexpr auto DM = GetPropType<TypeTag, Properties::GridGeometry>::discMethod;
using DM = typename GetPropType<TypeTag, Properties::GridGeometry>::DiscretizationMethod;
static constexpr bool enableIS = getPropValue<TypeTag, Properties::EnableBoxInterfaceSolver>();
// class used for scv-wise reconstruction of nonwetting phase saturations
using SR = TwoPScvSaturationReconstruction<DM, enableIS>;
......@@ -368,7 +368,7 @@ private:
using SST = GetPropType<TypeTag, Properties::SolidState>;
using MT = GetPropType<TypeTag, Properties::ModelTraits>;
using PT = typename GetPropType<TypeTag, Properties::SpatialParams>::PermeabilityType;
static constexpr auto DM = GetPropType<TypeTag, Properties::GridGeometry>::discMethod;
using DM = typename GetPropType<TypeTag, Properties::GridGeometry>::DiscretizationMethod;
static constexpr bool enableIS = getPropValue<TypeTag, Properties::EnableBoxInterfaceSolver>();
// class used for scv-wise reconstruction of nonwetting phase saturations
using SR = TwoPScvSaturationReconstruction<DM, enableIS>;
......
......@@ -173,7 +173,7 @@ private:
using SST = GetPropType<TypeTag, Properties::SolidState>;
using PT = typename GetPropType<TypeTag, Properties::SpatialParams>::PermeabilityType;
using MT = GetPropType<TypeTag, Properties::ModelTraits>;
static constexpr auto DM = GetPropType<TypeTag, Properties::GridGeometry>::discMethod;
using DM = typename GetPropType<TypeTag, Properties::GridGeometry>::DiscretizationMethod;
static constexpr bool enableIS = getPropValue<TypeTag, Properties::EnableBoxInterfaceSolver>();
// class used for scv-wise reconstruction of nonwetting phase saturations
using SR = TwoPScvSaturationReconstruction<DM, enableIS>;
......@@ -271,7 +271,7 @@ private:
using SST = GetPropType<TypeTag, Properties::SolidState>;
using PT = typename GetPropType<TypeTag, Properties::SpatialParams>::PermeabilityType;
using MT = GetPropType<TypeTag, Properties::ModelTraits>;
static constexpr auto DM = GetPropType<TypeTag, Properties::GridGeometry>::discMethod;
using DM = typename GetPropType<TypeTag, Properties::GridGeometry>::DiscretizationMethod;
static constexpr bool enableIS = getPropValue<TypeTag, Properties::EnableBoxInterfaceSolver>();
// class used for scv-wise reconstruction of nonwetting phase saturations
using SR = TwoPScvSaturationReconstruction<DM, enableIS>;
......
......@@ -136,7 +136,7 @@ private:
using SST = GetPropType<TypeTag, Properties::SolidState>;
using PT = typename GetPropType<TypeTag, Properties::SpatialParams>::PermeabilityType;
using MT = GetPropType<TypeTag, Properties::ModelTraits>;
static constexpr auto DM = GetPropType<TypeTag, Properties::GridGeometry>::discMethod;
using DM = typename GetPropType<TypeTag, Properties::GridGeometry>::DiscretizationMethod;
static constexpr bool enableIS = getPropValue<TypeTag, Properties::EnableBoxInterfaceSolver>();
// class used for scv-wise reconstruction of nonwetting phase saturations
using SR = TwoPScvSaturationReconstruction<DM, enableIS>;
......@@ -212,7 +212,7 @@ private:
using SST = GetPropType<TypeTag, Properties::SolidState>;
using PT = typename GetPropType<TypeTag, Properties::SpatialParams>::PermeabilityType;
using MT = GetPropType<TypeTag, Properties::ModelTraits>;
static constexpr auto DM = GetPropType<TypeTag, Properties::GridGeometry>::discMethod;
using DM = typename GetPropType<TypeTag, Properties::GridGeometry>::DiscretizationMethod;
static constexpr bool enableIS = getPropValue<TypeTag, Properties::EnableBoxInterfaceSolver>();
// class used for scv-wise reconstruction of nonwetting phase saturations
using SR = TwoPScvSaturationReconstruction<DM, enableIS>;
......
......@@ -69,7 +69,7 @@ private:
using SST = GetPropType<TypeTag, Properties::SolidState>;
using PT = typename GetPropType<TypeTag, Properties::SpatialParams>::PermeabilityType;
using MT = GetPropType<TypeTag, Properties::ModelTraits>;
static constexpr auto DM = GetPropType<TypeTag, Properties::GridGeometry>::discMethod;
using DM = typename GetPropType<TypeTag, Properties::GridGeometry>::DiscretizationMethod;
static constexpr bool enableIS = getPropValue<TypeTag, Properties::EnableBoxInterfaceSolver>();
// class used for scv-wise reconstruction of nonwetting phase saturations
using SR = TwoPScvSaturationReconstruction<DM, enableIS>;
......@@ -99,7 +99,7 @@ private:
using SST = GetPropType<TypeTag, Properties::SolidState>;
using PT = typename GetPropType<TypeTag, Properties::SpatialParams>::PermeabilityType;
using MT = GetPropType<TypeTag, Properties::ModelTraits>;
static constexpr auto DM = GetPropType<TypeTag, Properties::GridGeometry>::discMethod;
using DM = typename GetPropType<TypeTag, Properties::GridGeometry>::DiscretizationMethod;
static constexpr bool enableIS = getPropValue<TypeTag, Properties::EnableBoxInterfaceSolver>();
// class used for scv-wise reconstruction of nonwetting phase saturations
using SR = TwoPScvSaturationReconstruction<DM, enableIS>;
......
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