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

[disc][porousmediumflow] Use discretization tag instead of enum as template argument.

parent e2bd2cd8
......@@ -40,7 +40,7 @@ class ForchheimersLawImplementation
static_assert(
GetPropType<TypeTag, Properties::GridGeometry>::discMethod == DiscretizationMethods::cctpfa ||
GetPropType<TypeTag, Properties::GridGeometry>::discMethod == DiscretizationMethods::box,
"Forchheimer only implemented for cctpfa or box!")
"Forchheimer only implemented for cctpfa or box!"
);
};
......
......@@ -32,7 +32,7 @@
namespace Dumux {
// forward declaration
template<class TypeTag, DiscretizationMethod discMethod>
template<class TypeTag, class DiscretizationMethod>
class PorousMediumFluxVariablesCacheImplementation;
///////////////////////////////////////////////////////////////////////////////////////////////////////////////
......@@ -50,12 +50,12 @@ class PorousMediumFluxVariablesCacheImplementation;
* cache class are provided for different combinations of processes.
*/
template<class TypeTag>
using PorousMediumFluxVariablesCache = PorousMediumFluxVariablesCacheImplementation<TypeTag, GetPropType<TypeTag, Properties::GridGeometry>::discMethod>;
using PorousMediumFluxVariablesCache = PorousMediumFluxVariablesCacheImplementation<TypeTag, typename GetPropType<TypeTag, Properties::GridGeometry>::DiscretizationMethod>;
//! We only store discretization-related quantities for the box method. Thus, we need no
//! physics-dependent specialization and simply inherit from the physics-independent implementation.
template<class TypeTag>
class PorousMediumFluxVariablesCacheImplementation<TypeTag, DiscretizationMethod::box>
class PorousMediumFluxVariablesCacheImplementation<TypeTag, DiscretizationMethods::Box>
: public BoxFluxVariablesCache<GetPropType<TypeTag, Properties::Scalar>, GetPropType<TypeTag, Properties::GridGeometry>>
{
public:
......@@ -77,7 +77,7 @@ template<class TypeTag> class EnergyCacheChooser<TypeTag, true> : public GetProp
// specialization for the cell centered tpfa method
template<class TypeTag>
class PorousMediumFluxVariablesCacheImplementation<TypeTag, DiscretizationMethod::cctpfa>
class PorousMediumFluxVariablesCacheImplementation<TypeTag, DiscretizationMethods::CCTpfa>
: public AdvectionCacheChooser<TypeTag, GetPropType<TypeTag, Properties::ModelTraits>::enableAdvection()>
, public DiffusionCacheChooser<TypeTag, GetPropType<TypeTag, Properties::ModelTraits>::enableMolecularDiffusion()>
, public EnergyCacheChooser<TypeTag, GetPropType<TypeTag, Properties::ModelTraits>::enableEnergyBalance()>
......@@ -90,7 +90,7 @@ public:
//! Specialization of the flux variables cache for the cell centered finite volume mpfa scheme.
//! Stores data which is commonly used by all the different types of processes.
template<class TypeTag>
class PorousMediumFluxVariablesCacheImplementation<TypeTag, DiscretizationMethod::ccmpfa>
class PorousMediumFluxVariablesCacheImplementation<TypeTag, DiscretizationMethods::CCMpfa>
: public AdvectionCacheChooser<TypeTag, GetPropType<TypeTag, Properties::ModelTraits>::enableAdvection()>
, public DiffusionCacheChooser<TypeTag, GetPropType<TypeTag, Properties::ModelTraits>::enableMolecularDiffusion()>
, public EnergyCacheChooser<TypeTag, GetPropType<TypeTag, Properties::ModelTraits>::enableEnergyBalance()>
......
......@@ -35,7 +35,7 @@
namespace Dumux {
// forward declaration
template<class TypeTag, DiscretizationMethod discMethod>
template<class TypeTag, class DiscretizationMethod>
class PorousMediumFluxVariablesCacheFillerImplementation;
/*!
......@@ -45,11 +45,11 @@ class PorousMediumFluxVariablesCacheFillerImplementation;
* Helps filling the flux variables cache depending several policies
*/
template<class TypeTag>
using PorousMediumFluxVariablesCacheFiller = PorousMediumFluxVariablesCacheFillerImplementation<TypeTag, GetPropType<TypeTag, Properties::GridGeometry>::discMethod>;
using PorousMediumFluxVariablesCacheFiller = PorousMediumFluxVariablesCacheFillerImplementation<TypeTag, typename GetPropType<TypeTag, Properties::GridGeometry>::DiscretizationMethod>;
//! Specialization of the flux variables cache filler for the cell centered tpfa method
template<class TypeTag>
class PorousMediumFluxVariablesCacheFillerImplementation<TypeTag, DiscretizationMethod::cctpfa>
class PorousMediumFluxVariablesCacheFillerImplementation<TypeTag, DiscretizationMethods::CCTpfa>
{
using ModelTraits = GetPropType<TypeTag, Properties::ModelTraits>;
using Problem = GetPropType<TypeTag, Properties::Problem>;
......@@ -188,7 +188,7 @@ private:
//! Specialization of the flux variables cache filler for the cell centered mpfa method
template<class TypeTag>
class PorousMediumFluxVariablesCacheFillerImplementation<TypeTag, DiscretizationMethod::ccmpfa>
class PorousMediumFluxVariablesCacheFillerImplementation<TypeTag, DiscretizationMethods::CCMpfa>
{
using ModelTraits = GetPropType<TypeTag, Properties::ModelTraits>;
using Problem = GetPropType<TypeTag, Properties::Problem>;
......
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