From e4bcf1cac5335f27d5a29acb5b5e5d75dce5dfc1 Mon Sep 17 00:00:00 2001
From: Timo Koch <timo.koch@iws.uni-stuttgart.de>
Date: Fri, 2 Jul 2021 19:21:16 +0000
Subject: [PATCH] Merge branch 'fix/pnm-gg-export-element-type' into 'master'
[pnm] Export element type in FVElemenetGeometry implementation
See merge request dumux-repositories/dumux!2694
(cherry picked from commit efeb40875e1f82a5c9b63e65e4d77b01c3e28642)
4b8c7377 [pnm] Export element type in FVElemenetGeometry implementation
---
dumux/discretization/porenetwork/fvelementgeometry.hh | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/dumux/discretization/porenetwork/fvelementgeometry.hh b/dumux/discretization/porenetwork/fvelementgeometry.hh
index 7b24fe81ef..079627a1ca 100644
--- a/dumux/discretization/porenetwork/fvelementgeometry.hh
+++ b/dumux/discretization/porenetwork/fvelementgeometry.hh
@@ -50,7 +50,6 @@ class PNMFVElementGeometry<GG, true>
static constexpr int dimWorld = GridView::dimensionworld;
using GridIndexType = typename IndexTraits<GridView>::GridIndex;
using LocalIndexType = typename IndexTraits<GridView>::LocalIndex;
- using Element = typename GridView::template Codim<0>::Entity;
using CoordScalar = typename GridView::ctype;
using FeLocalBasis = typename GG::FeCache::FiniteElementType::Traits::LocalBasisType;
public:
@@ -60,6 +59,8 @@ public:
using SubControlVolumeFace = typename GG::SubControlVolumeFace;
//! export type of finite volume grid geometry
using GridGeometry = GG;
+ //! export element type
+ using Element = typename GridView::template Codim<0>::Entity;
//! the maximum number of scvs per element
static constexpr std::size_t maxNumElementScvs = 2;
@@ -170,7 +171,6 @@ class PNMFVElementGeometry<GG, false>
static constexpr int dimWorld = GridView::dimensionworld;
using GridIndexType = typename IndexTraits<GridView>::GridIndex;
using LocalIndexType = typename IndexTraits<GridView>::LocalIndex;
- using Element = typename GridView::template Codim<0>::Entity;
using CoordScalar = typename GridView::ctype;
using FeLocalBasis = typename GG::FeCache::FiniteElementType::Traits::LocalBasisType;
@@ -181,6 +181,8 @@ public:
using SubControlVolumeFace = typename GG::SubControlVolumeFace;
//! export type of finite volume grid geometry
using GridGeometry = GG;
+ //! export element type
+ using Element = typename GridView::template Codim<0>::Entity;
//! the maximum number of scvs per element
static constexpr std::size_t maxNumElementScvs = 2;
--
GitLab