From b4fd449e0a93be0c6fcae27b8446c252bfabb4aa Mon Sep 17 00:00:00 2001
From: Ivan Buntic <st116086@stud.uni-stuttgart.de>
Date: Fri, 17 Sep 2021 14:55:57 +0200
Subject: [PATCH] [disc][freeflow][nonisothermal] Use discretization tag
instead of enum as template argument.
---
dumux/freeflow/nonisothermal/localresidual.hh | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/dumux/freeflow/nonisothermal/localresidual.hh b/dumux/freeflow/nonisothermal/localresidual.hh
index 1a681c5ddd..2a5bc519a9 100644
--- a/dumux/freeflow/nonisothermal/localresidual.hh
+++ b/dumux/freeflow/nonisothermal/localresidual.hh
@@ -30,7 +30,7 @@
namespace Dumux {
// forward declaration
-template<class GridGeometry, class FluxVariables, DiscretizationMethod discMethod, bool enableEneryBalance, bool isCompositional>
+template<class GridGeometry, class FluxVariables, class DiscretizationMethod, bool enableEneryBalance, bool isCompositional>
class FreeFlowEnergyLocalResidualImplementation;
/*!
@@ -42,15 +42,15 @@ template<class GridGeometry, class FluxVariables, bool enableEneryBalance, bool
using FreeFlowEnergyLocalResidual =
FreeFlowEnergyLocalResidualImplementation<GridGeometry,
FluxVariables,
- GridGeometry::discMethod,
+ typename GridGeometry::DiscretizationMethod,
enableEneryBalance, isCompositional>;
/*!
* \ingroup FreeflowNIModel
* \brief Specialization for isothermal models, does nothing
*/
-template<class GridGeometry, class FluxVariables, DiscretizationMethod discMethod, bool isCompositional>
-class FreeFlowEnergyLocalResidualImplementation<GridGeometry, FluxVariables, discMethod, false, isCompositional>
+template<class GridGeometry, class FluxVariables, class DiscretizationMethod, bool isCompositional>
+class FreeFlowEnergyLocalResidualImplementation<GridGeometry, FluxVariables, DiscretizationMethod, false, isCompositional>
{
public:
@@ -72,7 +72,7 @@ public:
template<class GridGeometry, class FluxVariables>
class FreeFlowEnergyLocalResidualImplementation<GridGeometry,
FluxVariables,
- DiscretizationMethod::staggered,
+ DiscretizationMethods::Staggered,
true, false>
{
using Element = typename GridGeometry::GridView::template Codim<0>::Entity;
@@ -124,16 +124,16 @@ public:
template<class GridGeometry, class FluxVariables>
class FreeFlowEnergyLocalResidualImplementation<GridGeometry,
FluxVariables,
- DiscretizationMethod::staggered,
+ DiscretizationMethods::Staggered,
true, true>
: public FreeFlowEnergyLocalResidualImplementation<GridGeometry,
FluxVariables,
- DiscretizationMethod::staggered,
+ DiscretizationMethods::Staggered,
true, false>
{
using ParentType = FreeFlowEnergyLocalResidualImplementation<GridGeometry,
FluxVariables,
- DiscretizationMethod::staggered,
+ DiscretizationMethods::Staggered,
true, false>;
using Element = typename GridGeometry::GridView::template Codim<0>::Entity;
using FVElementGeometry = typename GridGeometry::LocalView;
--
GitLab