From be50b294d28a987e51d2c951ca66a452d1d252c9 Mon Sep 17 00:00:00 2001 From: Ivan Buntic Date: Fri, 17 Sep 2021 15:17:29 +0200 Subject: [PATCH] [disc][porousmediumflow] Use discretization tag instead of enum as template argument. --- dumux/flux/forchheimerslaw_fwd.hh | 2 +- dumux/porousmediumflow/fluxvariablescache.hh | 10 +++++----- dumux/porousmediumflow/fluxvariablescachefiller.hh | 8 ++++---- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dumux/flux/forchheimerslaw_fwd.hh b/dumux/flux/forchheimerslaw_fwd.hh index 9e45d2165e..7459908e0f 100644 --- a/dumux/flux/forchheimerslaw_fwd.hh +++ b/dumux/flux/forchheimerslaw_fwd.hh @@ -40,7 +40,7 @@ class ForchheimersLawImplementation static_assert( GetPropType::discMethod == DiscretizationMethods::cctpfa || GetPropType::discMethod == DiscretizationMethods::box, - "Forchheimer only implemented for cctpfa or box!") + "Forchheimer only implemented for cctpfa or box!" ); }; diff --git a/dumux/porousmediumflow/fluxvariablescache.hh b/dumux/porousmediumflow/fluxvariablescache.hh index 892d251b17..6a00418fc5 100644 --- a/dumux/porousmediumflow/fluxvariablescache.hh +++ b/dumux/porousmediumflow/fluxvariablescache.hh @@ -32,7 +32,7 @@ namespace Dumux { // forward declaration -template +template class PorousMediumFluxVariablesCacheImplementation; /////////////////////////////////////////////////////////////////////////////////////////////////////////////// @@ -50,12 +50,12 @@ class PorousMediumFluxVariablesCacheImplementation; * cache class are provided for different combinations of processes. */ template -using PorousMediumFluxVariablesCache = PorousMediumFluxVariablesCacheImplementation::discMethod>; +using PorousMediumFluxVariablesCache = PorousMediumFluxVariablesCacheImplementation::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 PorousMediumFluxVariablesCacheImplementation +class PorousMediumFluxVariablesCacheImplementation : public BoxFluxVariablesCache, GetPropType> { public: @@ -77,7 +77,7 @@ template class EnergyCacheChooser : public GetProp // specialization for the cell centered tpfa method template -class PorousMediumFluxVariablesCacheImplementation +class PorousMediumFluxVariablesCacheImplementation : public AdvectionCacheChooser::enableAdvection()> , public DiffusionCacheChooser::enableMolecularDiffusion()> , public EnergyCacheChooser::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 PorousMediumFluxVariablesCacheImplementation +class PorousMediumFluxVariablesCacheImplementation : public AdvectionCacheChooser::enableAdvection()> , public DiffusionCacheChooser::enableMolecularDiffusion()> , public EnergyCacheChooser::enableEnergyBalance()> diff --git a/dumux/porousmediumflow/fluxvariablescachefiller.hh b/dumux/porousmediumflow/fluxvariablescachefiller.hh index c84a239b0c..16948db4d1 100644 --- a/dumux/porousmediumflow/fluxvariablescachefiller.hh +++ b/dumux/porousmediumflow/fluxvariablescachefiller.hh @@ -35,7 +35,7 @@ namespace Dumux { // forward declaration -template +template class PorousMediumFluxVariablesCacheFillerImplementation; /*! @@ -45,11 +45,11 @@ class PorousMediumFluxVariablesCacheFillerImplementation; * Helps filling the flux variables cache depending several policies */ template -using PorousMediumFluxVariablesCacheFiller = PorousMediumFluxVariablesCacheFillerImplementation::discMethod>; +using PorousMediumFluxVariablesCacheFiller = PorousMediumFluxVariablesCacheFillerImplementation::DiscretizationMethod>; //! Specialization of the flux variables cache filler for the cell centered tpfa method template -class PorousMediumFluxVariablesCacheFillerImplementation +class PorousMediumFluxVariablesCacheFillerImplementation { using ModelTraits = GetPropType; using Problem = GetPropType; @@ -188,7 +188,7 @@ private: //! Specialization of the flux variables cache filler for the cell centered mpfa method template -class PorousMediumFluxVariablesCacheFillerImplementation +class PorousMediumFluxVariablesCacheFillerImplementation { using ModelTraits = GetPropType; using Problem = GetPropType; -- GitLab