From 5e11ae86c89cfbeae01275157553cd114b7d770b Mon Sep 17 00:00:00 2001
From: Bernd Flemisch <bernd@iws.uni-stuttgart.de>
Date: Wed, 11 Feb 2015 16:31:36 +0000
Subject: [PATCH] [mappers] get rid of self-defined layouts
Use the layouts that are pre-defined by Dune.
git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@14241 2fb0f335-1f38-0410-981e-8018bf24f1b0
---
dumux/common/intersectionmapper.hh | 14 +-------------
test/decoupled/1p/resultevaluation3d.hh | 24 +++---------------------
2 files changed, 4 insertions(+), 34 deletions(-)
diff --git a/dumux/common/intersectionmapper.hh b/dumux/common/intersectionmapper.hh
index d9c5d6ebc6..cd54a06238 100644
--- a/dumux/common/intersectionmapper.hh
+++ b/dumux/common/intersectionmapper.hh
@@ -33,16 +33,6 @@ namespace Dumux
template<class GridView>
class IntersectionMapper
{
- // mapper: one data element in every entity
- template<int dim>
- struct ElementLayout
- {
- bool contains (Dune::GeometryType geomType)
- {
- return geomType.dim() == dim;
- }
- };
-
typedef typename GridView::Grid Grid;
enum {dim=Grid::dimension};
typedef typename Grid::template Codim<0>::Entity Element;
@@ -50,9 +40,7 @@ class IntersectionMapper
typedef typename GridView::template Codim<0>::Iterator ElementIterator;
typedef typename GridView::IntersectionIterator IntersectionIterator;
typedef typename GridView::Intersection Intersection;
- typedef Dune::MultipleCodimMultipleGeomTypeMapper<GridView,ElementLayout> ElementMapper;
-
-
+ typedef Dune::MultipleCodimMultipleGeomTypeMapper<GridView, Dune::MCMGElementLayout> ElementMapper;
public:
IntersectionMapper(const GridView& gridview)
diff --git a/test/decoupled/1p/resultevaluation3d.hh b/test/decoupled/1p/resultevaluation3d.hh
index 3ef49e4260..070b047cec 100644
--- a/test/decoupled/1p/resultevaluation3d.hh
+++ b/test/decoupled/1p/resultevaluation3d.hh
@@ -37,15 +37,6 @@ namespace Dumux
struct BenchmarkResult
{
private:
- template<int dim>
- struct ElementLayout
- {
- bool contains (Dune::GeometryType gt)
- {
- return gt.dim() == dim;
- }
- };
-
template<int dim>
struct FaceLayout
{
@@ -97,7 +88,7 @@ public:
typedef typename GV::IndexSet IS;
typedef typename GV::template Codim<0>::Iterator Iterator;
typedef typename GV::IntersectionIterator IntersectionIterator;
- typedef Dune::MultipleCodimMultipleGeomTypeMapper<GV,ElementLayout> EM;
+ typedef Dune::MultipleCodimMultipleGeomTypeMapper<GV,Dune::MCMGElementLayout> EM;
typedef Dune::MultipleCodimMultipleGeomTypeMapper<GV,FaceLayout> FM;
typedef typename Grid::ctype ct;
@@ -385,15 +376,6 @@ public:
struct ResultEvaluation
{
private:
- template<int dim>
- struct ElementLayout
- {
- bool contains (Dune::GeometryType gt)
- {
- return gt.dim() == dim;
- }
- };
-
template<int dim>
struct FaceLayout
{
@@ -447,7 +429,7 @@ public:
typedef typename Element::Geometry Geometry;
typedef typename GridView::template Codim<0>::Iterator ElementIterator;
typedef typename GridView::IntersectionIterator IntersectionIterator;
- typedef Dune::MultipleCodimMultipleGeomTypeMapper<GridView,ElementLayout> ElementMapper;
+ typedef Dune::MultipleCodimMultipleGeomTypeMapper<GridView, Dune::MCMGElementLayout> ElementMapper;
typedef Dune::BlockVector<Dune::FieldVector<Scalar, 1> > SolVector;
typedef typename Geometry::JacobianInverseTransposed JacobianInverseTransposed;
typedef typename Dune::ReferenceElements<Scalar, dim> ReferenceElements;
@@ -735,7 +717,7 @@ public:
typedef typename Element::Geometry Geometry;
typedef typename GridView::template Codim<0>::Iterator ElementIterator;
typedef typename GridView::IntersectionIterator IntersectionIterator;
- typedef Dune::MultipleCodimMultipleGeomTypeMapper<GridView,ElementLayout> ElementMapper;
+ typedef Dune::MultipleCodimMultipleGeomTypeMapper<GridView, Dune::MCMGElementLayout> ElementMapper;
typedef typename Dune::ReferenceElements<Scalar, dim> ReferenceElements;
typedef typename Dune::ReferenceElements<Scalar, dim-1> ReferenceFaces;
--
GitLab