From a7213ba2287e7450dc10dd72c9fb9cffcd6521ba Mon Sep 17 00:00:00 2001
From: Ivan Buntic <st116086@stud.uni-stuttgart.de>
Date: Fri, 17 Sep 2021 14:30:40 +0200
Subject: [PATCH] [discmethod] Use discretization tags in EffectiveStressLaw
---
dumux/flux/box/effectivestresslaw.hh | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/dumux/flux/box/effectivestresslaw.hh b/dumux/flux/box/effectivestresslaw.hh
index 629ef693e2..3d27b0c193 100644
--- a/dumux/flux/box/effectivestresslaw.hh
+++ b/dumux/flux/box/effectivestresslaw.hh
@@ -39,7 +39,7 @@ namespace Dumux {
* \tparam GridGeometry the finite volume grid geometry
*/
template<class StressType, class GridGeometry>
-class EffectiveStressLaw<StressType, GridGeometry, DiscretizationMethod::box>
+class EffectiveStressLaw<StressType, GridGeometry, typename GridGeometry::DiscretizationMethod>
{
using FVElementGeometry = typename GridGeometry::LocalView;
using SubControlVolumeFace = typename FVElementGeometry::SubControlVolumeFace;
@@ -51,7 +51,7 @@ class EffectiveStressLaw<StressType, GridGeometry, DiscretizationMethod::box>
static constexpr int dim = GridView::dimension;
static constexpr int dimWorld = GridView::dimensionworld;
static_assert(dim == dimWorld, "EffectiveStressLaw not implemented for network/surface grids");
- static_assert(StressType::discMethod == DiscretizationMethod::box, "The provided stress type must be specialized for the box scheme");
+ static_assert(StressType::discMethod == DiscretizationMethods::box, "The provided stress type must be specialized for the box scheme");
public:
//! export the type used for scalar values
@@ -61,7 +61,10 @@ public:
//! export the type used for force vectors
using ForceVector = typename StressType::ForceVector;
//! state the discretization method this implementation belongs to
- static constexpr DiscretizationMethod discMethod = DiscretizationMethod::box;
+
+ using DiscretizationMethod = DiscretizationMethods::Box;
+ // state the discretization method this implementation belongs to
+ static constexpr DiscretizationMethod discMethod{};
/*!
* \brief Computes the force (in Newton) acting on a sub-control volume face.
--
GitLab