diff --git a/dumux/discretization/box/fvgridgeometry.hh b/dumux/discretization/box/fvgridgeometry.hh index 144773691ec32d8dd33fc69f8cfd56873c2e8a78..dbd1e28f7c87b8ba6c8cff577c167c89260abe9f 100644 --- a/dumux/discretization/box/fvgridgeometry.hh +++ b/dumux/discretization/box/fvgridgeometry.hh @@ -124,8 +124,6 @@ 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::BoxGeometryHelper_t<GV, Traits>; //! Constructor with basic grid geometry used to share state with another grid geometry on the same grid view BoxFVGridGeometry(std::shared_ptr<BasicGridGeometry> gg) @@ -207,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) {} @@ -253,6 +254,8 @@ public: using Cache = BoxGridGeometryCache; private: + using GeometryHelper = typename Cache::GeometryHelper; + void update_() { cache_.clear_(); @@ -470,8 +473,6 @@ 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::BoxGeometryHelper_t<GV, Traits>; //! Constructor with basic grid geometry used to share state with another grid geometry on the same grid view BoxFVGridGeometry(std::shared_ptr<BasicGridGeometry> gg) @@ -553,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/fvgridgeometry.hh b/dumux/discretization/facecentered/diamond/fvgridgeometry.hh index 2d6319df7ecb036ba190959849dc69e93a679cf7..9854addfddff3e4669f57b52e7df6ef01f029109 100644 --- a/dumux/discretization/facecentered/diamond/fvgridgeometry.hh +++ b/dumux/discretization/facecentered/diamond/fvgridgeometry.hh @@ -117,8 +117,6 @@ public: using Extrusion = Extrusion_t<Traits>; //! export the finite element cache type using FeCache = NonconformingFECache<Scalar, Scalar, dim>; - //! export the geometry helper type - using GeometryHelper = Detail::FaceCenteredDiamondGeometryHelper_t<GV, Traits>; //! Constructor FaceCenteredDiamondFVGridGeometry(const GridView& gridView, const std::string& paramGroup = "") @@ -193,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) {} @@ -232,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/fvgridgeometry.hh b/dumux/discretization/pq1bubble/fvgridgeometry.hh index 706f60d3b745f053363c6560e55792b75f562fbc..c28f8b5508931ea20d859d58e125146661b7e402 100644 --- a/dumux/discretization/pq1bubble/fvgridgeometry.hh +++ b/dumux/discretization/pq1bubble/fvgridgeometry.hh @@ -136,8 +136,6 @@ public: using FeCache = Dumux::PQ1BubbleFECache<CoordScalar, Scalar, dim>; //! export the grid view type using GridView = GV; - //! export the geometry helper type - using GeometryHelper = Detail::PQ1BubbleGeometryHelper_t<GV, Traits>; //! Constructor PQ1BubbleFVGridGeometry(const GridView gridView) @@ -212,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) {} @@ -258,6 +259,8 @@ public: using Cache = PQ1BubbleGridGeometryCache; private: + using GeometryHelper = typename Cache::GeometryHelper; + void update_() { cache_.clear_();