From 4711b019faa537b39755edd3d3eed9a87bc47253 Mon Sep 17 00:00:00 2001
From: Martin Schneider <martin.schneider@iws.uni-stuttgart.de>
Date: Thu, 16 Mar 2023 16:52:30 +0100
Subject: [PATCH] [disc][geo] Deduce helper type in fvelementgeometry from gg
---
dumux/discretization/box/fvelementgeometry.hh | 10 ++--------
.../facecentered/diamond/fvelementgeometry.hh | 2 +-
dumux/discretization/pq1bubble/fvelementgeometry.hh | 2 +-
dumux/multidomain/facet/box/fvelementgeometry.hh | 4 +---
dumux/porousmediumflow/boxdfm/fvelementgeometry.hh | 4 +---
5 files changed, 6 insertions(+), 16 deletions(-)
diff --git a/dumux/discretization/box/fvelementgeometry.hh b/dumux/discretization/box/fvelementgeometry.hh
index 2b8c535900..00fbcbdc0a 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 GG::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 GG::GeometryHelper;
public:
//! export the element type
using Element = typename GridView::template Codim<0>::Entity;
diff --git a/dumux/discretization/facecentered/diamond/fvelementgeometry.hh b/dumux/discretization/facecentered/diamond/fvelementgeometry.hh
index 22a7430b9f..7879dd8b65 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 GG::GeometryHelper;
public:
//! export type of subcontrol volume face
diff --git a/dumux/discretization/pq1bubble/fvelementgeometry.hh b/dumux/discretization/pq1bubble/fvelementgeometry.hh
index 19952fa03e..3e0ee3de0d 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 GG::GeometryHelper;
public:
//! export the element type
using Element = typename GridView::template Codim<0>::Entity;
diff --git a/dumux/multidomain/facet/box/fvelementgeometry.hh b/dumux/multidomain/facet/box/fvelementgeometry.hh
index 2e635386d0..ffb3f4a61b 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/porousmediumflow/boxdfm/fvelementgeometry.hh b/dumux/porousmediumflow/boxdfm/fvelementgeometry.hh
index 152ec1fce1..3879a989c7 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;
--
GitLab