From 23d6e8088c5fbe0c26bd10238a5bc97984e73853 Mon Sep 17 00:00:00 2001
From: Ivan Buntic <st116086@stud.uni-stuttgart.de>
Date: Fri, 1 Oct 2021 16:21:08 +0200
Subject: [PATCH] [discmethod] Use discretization tags for ProblemTraits and
update call sites
---
dumux/common/typetraits/problem.hh | 4 ++--
dumux/discretization/box.hh | 2 +-
dumux/discretization/ccmpfa.hh | 2 +-
dumux/discretization/cctpfa.hh | 2 +-
dumux/discretization/fcstaggered.hh | 2 +-
dumux/discretization/staggered.hh | 2 +-
6 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/dumux/common/typetraits/problem.hh b/dumux/common/typetraits/problem.hh
index 0131254abd..64570dea8d 100644
--- a/dumux/common/typetraits/problem.hh
+++ b/dumux/common/typetraits/problem.hh
@@ -31,7 +31,7 @@ namespace Dumux {
// forward declare
namespace Detail {
-template<class Problem, DiscretizationMethod dm>
+template<class Problem, class DiscretizationMethod>
struct ProblemTraits;
} // end namespace Detail
@@ -43,7 +43,7 @@ template<class Problem>
struct ProblemTraits
{
using GridGeometry = std::decay_t<decltype(std::declval<Problem>().gridGeometry())>;
- using BoundaryTypes = typename Detail::template ProblemTraits<Problem, GridGeometry::discMethod>::BoundaryTypes;
+ using BoundaryTypes = typename Detail::template ProblemTraits<Problem, typename GridGeometry::DiscretizationMethod>::BoundaryTypes;
};
} // end namespace Dumux
diff --git a/dumux/discretization/box.hh b/dumux/discretization/box.hh
index 7ec91488a9..59669c347f 100644
--- a/dumux/discretization/box.hh
+++ b/dumux/discretization/box.hh
@@ -110,7 +110,7 @@ struct BaseLocalResidual<TypeTag, TTag::BoxModel> { using type = BoxLocalResidua
namespace Detail {
template<class Problem>
-struct ProblemTraits<Problem, DiscretizationMethod::box>
+struct ProblemTraits<Problem, DiscretizationMethods::Box>
{
private:
using GG = std::decay_t<decltype(std::declval<Problem>().gridGeometry())>;
diff --git a/dumux/discretization/ccmpfa.hh b/dumux/discretization/ccmpfa.hh
index 2d0e9e1182..fbd738fae0 100644
--- a/dumux/discretization/ccmpfa.hh
+++ b/dumux/discretization/ccmpfa.hh
@@ -163,7 +163,7 @@ struct BaseLocalResidual<TypeTag, TTag::CCMpfaModel> { using type = CCLocalResid
namespace Detail {
template<class Problem>
-struct ProblemTraits<Problem, DiscretizationMethod::ccmpfa>
+struct ProblemTraits<Problem, DiscretizationMethods::CCMpfa>
{
private:
using GG = std::decay_t<decltype(std::declval<Problem>().gridGeometry())>;
diff --git a/dumux/discretization/cctpfa.hh b/dumux/discretization/cctpfa.hh
index 0735de0923..3447dc2c94 100644
--- a/dumux/discretization/cctpfa.hh
+++ b/dumux/discretization/cctpfa.hh
@@ -99,7 +99,7 @@ struct BaseLocalResidual<TypeTag, TTag::CCTpfaModel> { using type = CCLocalResid
namespace Detail {
template<class Problem>
-struct ProblemTraits<Problem, DiscretizationMethod::cctpfa>
+struct ProblemTraits<Problem, DiscretizationMethods::CCTpfa>
{
private:
using GG = std::decay_t<decltype(std::declval<Problem>().gridGeometry())>;
diff --git a/dumux/discretization/fcstaggered.hh b/dumux/discretization/fcstaggered.hh
index c950aec44e..6de37e6114 100644
--- a/dumux/discretization/fcstaggered.hh
+++ b/dumux/discretization/fcstaggered.hh
@@ -118,7 +118,7 @@ public:
namespace Dumux::Detail {
template<class Problem>
-struct ProblemTraits<Problem, DiscretizationMethod::fcstaggered>
+struct ProblemTraits<Problem, DiscretizationMethods::FCStaggered>
{
private:
using GG = std::decay_t<decltype(std::declval<Problem>().gridGeometry())>;
diff --git a/dumux/discretization/staggered.hh b/dumux/discretization/staggered.hh
index b5bb134527..3caccbd7a0 100644
--- a/dumux/discretization/staggered.hh
+++ b/dumux/discretization/staggered.hh
@@ -200,7 +200,7 @@ public:
namespace Detail {
template<class Problem>
-struct ProblemTraits<Problem, DiscretizationMethod::staggered>
+struct ProblemTraits<Problem, DiscretizationMethods::Staggered>
{
private:
using GG = std::decay_t<decltype(std::declval<Problem>().gridGeometry())>;
--
GitLab