diff --git a/dumux/discretization/basegridgeometry.hh b/dumux/discretization/basegridgeometry.hh
index e6be4b40ac7fcf874567c28ecbe8b5e9bd0e1bab..6032bf8fb8d287459be45367238afa251a66dbd8 100644
--- a/dumux/discretization/basegridgeometry.hh
+++ b/dumux/discretization/basegridgeometry.hh
@@ -37,6 +37,9 @@ namespace Dumux {
namespace Detail {
template<class T>
using SpecifiesBaseGridGeometry = typename T::BasicGridGeometry;
+
+template<class T>
+using SpecifiesGeometryHelper = typename T::GeometryHelper;
} // end namespace Detail
/*!
diff --git a/dumux/discretization/box/fvelementgeometry.hh b/dumux/discretization/box/fvelementgeometry.hh
index 2b8c535900139f0f69a837a5ae4f769ad73b849f..df1d7d56eaf55ce1e90f7f5670a4c4796d659128 100644
--- a/dumux/discretization/box/fvelementgeometry.hh
+++ b/dumux/discretization/box/fvelementgeometry.hh
@@ -64,10 +64,7 @@ class BoxFVElementGeometry<GG, true>
using CoordScalar = typename GridView::ctype;
using FeLocalBasis = typename GG::FeCache::FiniteElementType::Traits::LocalBasisType;
using GGCache = typename GG::Cache;
-
- using GeometryHelper = BoxGeometryHelper<GridView, dim,
- typename GG::SubControlVolume,
- typename GG::SubControlVolumeFace>;
+ using GeometryHelper = typename GGCache::GeometryHelper;
public:
//! export the element type
using Element = typename GridView::template Codim<0>::Entity;
@@ -244,10 +241,7 @@ class BoxFVElementGeometry<GG, false>
using CoordScalar = typename GridView::ctype;
using FeLocalBasis = typename GG::FeCache::FiniteElementType::Traits::LocalBasisType;
using GGCache = typename GG::Cache;
-
- using GeometryHelper = BoxGeometryHelper<GridView, dim,
- typename GG::SubControlVolume,
- typename GG::SubControlVolumeFace>;
+ using GeometryHelper = typename GGCache::GeometryHelper;
public:
//! export the element type
using Element = typename GridView::template Codim<0>::Entity;
diff --git a/dumux/discretization/box/fvgridgeometry.hh b/dumux/discretization/box/fvgridgeometry.hh
index c5e89d288413755155478409ae3aecdabad63723..dbd1e28f7c87b8ba6c8cff577c167c89260abe9f 100644
--- a/dumux/discretization/box/fvgridgeometry.hh
+++ b/dumux/discretization/box/fvgridgeometry.hh
@@ -45,6 +45,15 @@
namespace Dumux {
+namespace Detail {
+template<class GV, class T>
+using BoxGeometryHelper_t = Dune::Std::detected_or_t<
+ Dumux::BoxGeometryHelper<GV, GV::dimension, typename T::SubControlVolume, typename T::SubControlVolumeFace>,
+ SpecifiesGeometryHelper,
+ T
+>;
+} // end namespace Detail
+
/*!
* \ingroup BoxDiscretization
* \brief The default traits for the box finite volume grid geometry
@@ -94,10 +103,6 @@ class BoxFVGridGeometry<Scalar, GV, true, Traits>
static const int dim = GV::dimension;
static const int dimWorld = GV::dimensionworld;
- using GeometryHelper = BoxGeometryHelper<GV, dim,
- typename Traits::SubControlVolume,
- typename Traits::SubControlVolumeFace>;
-
public:
//! export the discretization method this geometry belongs to
using DiscretizationMethod = DiscretizationMethods::Box;
@@ -200,6 +205,9 @@ private:
{
friend class BoxFVGridGeometry;
public:
+ //! export the geometry helper type
+ using GeometryHelper = Detail::BoxGeometryHelper_t<GV, Traits>;
+
explicit BoxGridGeometryCache(const BoxFVGridGeometry& gg)
: gridGeometry_(&gg)
{}
@@ -246,6 +254,8 @@ public:
using Cache = BoxGridGeometryCache;
private:
+ using GeometryHelper = typename Cache::GeometryHelper;
+
void update_()
{
cache_.clear_();
@@ -544,6 +554,9 @@ private:
{
friend class BoxFVGridGeometry;
public:
+ //! export the geometry helper type
+ using GeometryHelper = Detail::BoxGeometryHelper_t<GV, Traits>;
+
explicit BoxGridGeometryCache(const BoxFVGridGeometry& gg)
: gridGeometry_(&gg)
{}
diff --git a/dumux/discretization/facecentered/diamond/fvelementgeometry.hh b/dumux/discretization/facecentered/diamond/fvelementgeometry.hh
index 22a7430b9fe45b034b355311c0c73deab9eca9d1..05940549cfeb5451c57b6c0b833d92a0a601ac89 100644
--- a/dumux/discretization/facecentered/diamond/fvelementgeometry.hh
+++ b/dumux/discretization/facecentered/diamond/fvelementgeometry.hh
@@ -56,7 +56,7 @@ class FaceCenteredDiamondFVElementGeometry<GG, /*cachingEnabled*/true>
using LocalIndexType = typename IndexTraits<GridView>::SmallLocalIndex;
using FeLocalBasis = typename GG::FeCache::FiniteElementType::Traits::LocalBasisType;
using GGCache = typename GG::Cache;
- using GeometryHelper = DiamondGeometryHelper<GridView, typename GG::SubControlVolume, typename GG::SubControlVolumeFace>;
+ using GeometryHelper = typename GGCache::GeometryHelper;
public:
//! export type of subcontrol volume face
diff --git a/dumux/discretization/facecentered/diamond/fvgridgeometry.hh b/dumux/discretization/facecentered/diamond/fvgridgeometry.hh
index 3cc239b5e4a4e899b039b5cea2e7fc02f6cfa4e2..9854addfddff3e4669f57b52e7df6ef01f029109 100644
--- a/dumux/discretization/facecentered/diamond/fvgridgeometry.hh
+++ b/dumux/discretization/facecentered/diamond/fvgridgeometry.hh
@@ -48,6 +48,15 @@
namespace Dumux {
+namespace Detail {
+template<class GV, class T>
+using FaceCenteredDiamondGeometryHelper_t = Dune::Std::detected_or_t<
+ Dumux::DiamondGeometryHelper<GV, typename T::SubControlVolume, typename T::SubControlVolumeFace>,
+ SpecifiesGeometryHelper,
+ T
+>;
+} // end namespace Detail
+
/*!
* \ingroup DiamondDiscretization
* \brief The default traits for the face-centered diamond finite volume grid geometry
@@ -80,7 +89,6 @@ class FaceCenteredDiamondFVGridGeometry
using GridIndexType = typename IndexTraits<GV>::GridIndex;
using LocalIndexType = typename IndexTraits<GV>::SmallLocalIndex;
using Element = typename GV::template Codim<0>::Entity;
- using GeometryHelper = DiamondGeometryHelper<GV, typename Traits::SubControlVolume, typename Traits::SubControlVolumeFace>;
using Scalar = typename GV::ctype;
@@ -183,6 +191,9 @@ private:
{
friend class FaceCenteredDiamondFVGridGeometry;
public:
+ //! export the geometry helper type
+ using GeometryHelper = Detail::FaceCenteredDiamondGeometryHelper_t<GV, Traits>;
+
explicit FCDiamondGridGeometryCache(const FaceCenteredDiamondFVGridGeometry& gg)
: gridGeometry_(&gg)
{}
@@ -222,6 +233,7 @@ public:
//! this alias should only be used by the local view implementation
using Cache = FCDiamondGridGeometryCache;
private:
+ using GeometryHelper = typename Cache::GeometryHelper;
//! update all fvElementGeometries
void update_()
diff --git a/dumux/discretization/pq1bubble/fvelementgeometry.hh b/dumux/discretization/pq1bubble/fvelementgeometry.hh
index 19952fa03eb1ceddd253f5c51a5f7efacf32b005..1bdc5911a87b44ec18c0684a86f38b5d14b650bc 100644
--- a/dumux/discretization/pq1bubble/fvelementgeometry.hh
+++ b/dumux/discretization/pq1bubble/fvelementgeometry.hh
@@ -63,7 +63,7 @@ class PQ1BubbleFVElementGeometry<GG, true>
using CoordScalar = typename GridView::ctype;
using FeLocalBasis = typename GG::FeCache::FiniteElementType::Traits::LocalBasisType;
using GGCache = typename GG::Cache;
- using GeometryHelper = PQ1BubbleGeometryHelper<GridView, typename GG::SubControlVolume, typename GG::SubControlVolumeFace>;
+ using GeometryHelper = typename GGCache::GeometryHelper;
public:
//! export the element type
using Element = typename GridView::template Codim<0>::Entity;
diff --git a/dumux/discretization/pq1bubble/fvgridgeometry.hh b/dumux/discretization/pq1bubble/fvgridgeometry.hh
index caeb7a955d30a8c520bcb1c60dc7623ead660ad2..c28f8b5508931ea20d859d58e125146661b7e402 100644
--- a/dumux/discretization/pq1bubble/fvgridgeometry.hh
+++ b/dumux/discretization/pq1bubble/fvgridgeometry.hh
@@ -49,6 +49,15 @@
namespace Dumux {
+namespace Detail {
+template<class GV, class T>
+using PQ1BubbleGeometryHelper_t = Dune::Std::detected_or_t<
+ Dumux::PQ1BubbleGeometryHelper<GV, typename T::SubControlVolume, typename T::SubControlVolumeFace>,
+ SpecifiesGeometryHelper,
+ T
+>;
+} // end namespace Detail
+
template <class GridView>
struct PQ1BubbleMapperTraits :public DefaultMapperTraits<GridView>
{
@@ -106,10 +115,6 @@ class PQ1BubbleFVGridGeometry
static const int dim = GV::dimension;
static const int dimWorld = GV::dimensionworld;
- using GeometryHelper = PQ1BubbleGeometryHelper<
- GV, typename Traits::SubControlVolume, typename Traits::SubControlVolumeFace
- >;
-
static_assert(dim > 1, "Only implemented for dim > 1");
public:
@@ -205,6 +210,9 @@ private:
{
friend class PQ1BubbleFVGridGeometry;
public:
+ //! export the geometry helper type
+ using GeometryHelper = Detail::PQ1BubbleGeometryHelper_t<GV, Traits>;
+
explicit PQ1BubbleGridGeometryCache(const PQ1BubbleFVGridGeometry& gg)
: gridGeometry_(&gg)
{}
@@ -251,6 +259,8 @@ public:
using Cache = PQ1BubbleGridGeometryCache;
private:
+ using GeometryHelper = typename Cache::GeometryHelper;
+
void update_()
{
cache_.clear_();
diff --git a/dumux/multidomain/facet/box/fvelementgeometry.hh b/dumux/multidomain/facet/box/fvelementgeometry.hh
index 2e635386d067c30cf4abfbb75c04dd37987ba9f4..ffb3f4a61b0f390f5c003d717035ab1d32617db4 100644
--- a/dumux/multidomain/facet/box/fvelementgeometry.hh
+++ b/dumux/multidomain/facet/box/fvelementgeometry.hh
@@ -191,9 +191,7 @@ class BoxFacetCouplingFVElementGeometry<GG, false>
using CoordScalar = typename GridView::ctype;
using FeLocalBasis = typename GG::FeCache::FiniteElementType::Traits::LocalBasisType;
- using GeometryHelper = BoxGeometryHelper<GridView, dim,
- typename GG::SubControlVolume,
- typename GG::SubControlVolumeFace>;
+ using GeometryHelper = typename GG::GeometryHelper;
public:
//! export type of the element
using Element = typename GridView::template Codim<0>::Entity;
diff --git a/dumux/multidomain/facet/box/fvgridgeometry.hh b/dumux/multidomain/facet/box/fvgridgeometry.hh
index ea58484d8aa2670a68d126be422ecca478e547e2..0f03b0ed554bf1afa53235fc76c619d7586a9ed1 100644
--- a/dumux/multidomain/facet/box/fvgridgeometry.hh
+++ b/dumux/multidomain/facet/box/fvgridgeometry.hh
@@ -46,6 +46,15 @@
namespace Dumux {
+namespace Detail {
+template<class GV, class T>
+using BoxFacetCouplingGeometryHelper_t = Dune::Std::detected_or_t<
+ Dumux::BoxGeometryHelper<GV, GV::dimension, typename T::SubControlVolume, typename T::SubControlVolumeFace>,
+ SpecifiesGeometryHelper,
+ T
+>;
+} // end namespace Detail
+
/*!
* \ingroup FacetCoupling
* \brief The default traits for the finite volume grid geometry
@@ -105,8 +114,6 @@ class BoxFacetCouplingFVGridGeometry<Scalar, GV, true, Traits>
static const int dim = GV::dimension;
static const int dimWorld = GV::dimensionworld;
- using GeometryHelper = BoxGeometryHelper<GV, dim, typename Traits::SubControlVolume, typename Traits::SubControlVolumeFace>;
-
public:
//! export the discretization method this geometry belongs to
using DiscretizationMethod = DiscretizationMethods::Box;
@@ -126,6 +133,8 @@ public:
using FeCache = Dune::LagrangeLocalFiniteElementCache<CoordScalar, Scalar, dim, 1>;
//! export the grid view type
using GridView = GV;
+ //! export the geometry helper type
+ using GeometryHelper = Detail::BoxFacetCouplingGeometryHelper_t<GV, Traits>;
//! Constructor
template<class FacetGridView, class CodimOneGridAdapter>
@@ -414,6 +423,8 @@ public:
using FeCache = Dune::LagrangeLocalFiniteElementCache<CoordScalar, Scalar, dim, 1>;
//! export the grid view type
using GridView = GV;
+ //! export the geometry helper type
+ using GeometryHelper = Detail::BoxFacetCouplingGeometryHelper_t<GV, Traits>;
//! Constructor
template<class FacetGridView, class CodimOneGridAdapter>
diff --git a/dumux/porousmediumflow/boxdfm/fvelementgeometry.hh b/dumux/porousmediumflow/boxdfm/fvelementgeometry.hh
index 152ec1fce172d41b9f205c136d2bda46b7ec8d35..3879a989c79b2901a1eac913d9adbb13d8b17a95 100644
--- a/dumux/porousmediumflow/boxdfm/fvelementgeometry.hh
+++ b/dumux/porousmediumflow/boxdfm/fvelementgeometry.hh
@@ -202,9 +202,7 @@ class BoxDfmFVElementGeometry<GG, false>
using CoordScalar = typename GridView::ctype;
using FeLocalBasis = typename GG::FeCache::FiniteElementType::Traits::LocalBasisType;
- using GeometryHelper = BoxDfmGeometryHelper<GridView, dim,
- typename GG::SubControlVolume,
- typename GG::SubControlVolumeFace>;
+ using GeometryHelper = typename GG::GeometryHelper;
public:
//! export type of the element
using Element = typename GridView::template Codim<0>::Entity;
diff --git a/dumux/porousmediumflow/boxdfm/fvgridgeometry.hh b/dumux/porousmediumflow/boxdfm/fvgridgeometry.hh
index fc4f28f6b17a1cf85a06b3f2591a5720b4397915..ec5237ba68d3d9300289ab59157f2229c22c6461 100644
--- a/dumux/porousmediumflow/boxdfm/fvgridgeometry.hh
+++ b/dumux/porousmediumflow/boxdfm/fvgridgeometry.hh
@@ -49,6 +49,15 @@
namespace Dumux {
+namespace Detail {
+template<class GV, class T>
+using BoxDfmGeometryHelper_t = Dune::Std::detected_or_t<
+ Dumux::BoxDfmGeometryHelper<GV, GV::dimension, typename T::SubControlVolume, typename T::SubControlVolumeFace>,
+ SpecifiesGeometryHelper,
+ T
+>;
+} // end namespace Detail
+
/*!
* \ingroup BoxDFMModel
* \brief The default traits for the box finite volume grid geometry
@@ -109,10 +118,6 @@ class BoxDfmFVGridGeometry<Scalar, GV, true, Traits>
static const int dimWorld = GV::dimensionworld;
static_assert(dim == 2 || dim == 3, "The box-dfm GridGeometry is only implemented in 2 or 3 dimensions.");
- using GeometryHelper = BoxDfmGeometryHelper<GV, dim,
- typename Traits::SubControlVolume,
- typename Traits::SubControlVolumeFace>;
-
public:
//! export the discretization method this geometry belongs to
using DiscretizationMethod = DiscretizationMethods::Box;
@@ -132,6 +137,8 @@ public:
using FeCache = Dune::LagrangeLocalFiniteElementCache<CoordScalar, Scalar, dim, 1>;
//! Export the grid view type
using GridView = GV;
+ //! export the geometry helper type
+ using GeometryHelper = Detail::BoxDfmGeometryHelper_t<GV, Traits>;
//! Constructor
template< class FractureGridAdapter >
@@ -451,6 +458,8 @@ public:
using FeCache = Dune::LagrangeLocalFiniteElementCache<CoordScalar, Scalar, dim, 1>;
//! export the grid view type
using GridView = GV;
+ //! export the geometry helper type
+ using GeometryHelper = Detail::BoxDfmGeometryHelper_t<GV, Traits>;
//! Constructor
template< class FractureGridAdapter >