From a1ca8f2ff8b97a1dcbbb53476cfc40a49bb8eb79 Mon Sep 17 00:00:00 2001
From: Timo Koch <timo.koch@iws.uni-stuttgart.de>
Date: Mon, 13 May 2019 10:24:49 +0200
Subject: [PATCH] [geometry] Use delegate constructor
---
dumux/common/geometry/geometricentityset.hh | 14 ++++++--------
1 file changed, 6 insertions(+), 8 deletions(-)
diff --git a/dumux/common/geometry/geometricentityset.hh b/dumux/common/geometry/geometricentityset.hh
index ac96e57c60..9dcebc0afe 100644
--- a/dumux/common/geometry/geometricentityset.hh
+++ b/dumux/common/geometry/geometricentityset.hh
@@ -39,25 +39,23 @@ namespace Dumux {
template <class GridView, int codim = 0, class Mapper = Dune::MultipleCodimMultipleGeomTypeMapper<GridView>>
class GridViewGeometricEntitySet
{
+ using EntityMap = Dumux::EntityMap<GridView, codim>;
public:
using Entity = typename GridView::template Codim<codim>::Entity;
GridViewGeometricEntitySet(const GridView& gridView)
- : gridView_(gridView)
- , mapper_(gridView, Dune::mcmgLayout(Dune::Codim<codim>()))
- , entityMap_(std::make_shared<EntityMap<GridView, codim>>(gridView.grid(), mapper_))
+ : GridViewGeometricEntitySet(gridView, Dune::mcmgLayout(Dune::Codim<codim>()))
{}
- GridViewGeometricEntitySet(const GridView& gridView,
- const Mapper& mapper)
+ GridViewGeometricEntitySet(const GridView& gridView, const Mapper& mapper)
: gridView_(gridView)
, mapper_(mapper)
- , entityMap_(std::make_shared<EntityMap<GridView, codim>>(gridView.grid(), mapper_))
+ , entityMap_(std::make_shared<EntityMap>(gridView.grid(), mapper_))
{}
GridViewGeometricEntitySet(const GridView& gridView,
const Mapper& mapper,
- std::shared_ptr<const EntityMap<GridView, codim>> entityMap)
+ std::shared_ptr<const EntityMap> entityMap)
: gridView_(gridView)
, mapper_(mapper)
, entityMap_(entityMap)
@@ -106,7 +104,7 @@ public:
private:
GridView gridView_;
Mapper mapper_;
- std::shared_ptr<const EntityMap<GridView, codim>> entityMap_;
+ std::shared_ptr<const EntityMap> entityMap_;
};
--
GitLab