From 75e7fb3a2be0f9563b4022ae8834dea9e313864b Mon Sep 17 00:00:00 2001
From: Timo Koch <timo.koch@iws.uni-stuttgart.de>
Date: Tue, 27 Sep 2016 17:30:34 +0200
Subject: [PATCH] [gridcreator] Base test on indexSet. Fixes boundary test
again.
---
test/io/gridcreator/gridcreatortests.hh | 10 +++-------
1 file changed, 3 insertions(+), 7 deletions(-)
diff --git a/test/io/gridcreator/gridcreatortests.hh b/test/io/gridcreator/gridcreatortests.hh
index 8bd137bcb4..327edcf6d5 100644
--- a/test/io/gridcreator/gridcreatortests.hh
+++ b/test/io/gridcreator/gridcreatortests.hh
@@ -96,7 +96,6 @@ private:
{
const auto& gridView = GridCreator::grid().leafGridView();
- Dune::MultipleCodimMultipleGeomTypeMapper<GridView> elementMapper(gridView, Dune::mcmgElementLayout());
elementMarker.clear();
elementMarker.resize(gridView.size(0));
rank.clear();
@@ -104,7 +103,7 @@ private:
for(const auto& element : elements(gridView))
{
- auto eIdx = elementMapper.index(element);
+ auto eIdx = gridView.indexSet().index(element);
rank[eIdx] = gridView.comm().rank();
if (type == "gmsh")
@@ -121,9 +120,6 @@ private:
{
const auto& gridView = GridCreator::grid().leafGridView();
- Dune::MultipleCodimMultipleGeomTypeMapper<GridView> elementMapper(gridView, Dune::mcmgElementLayout());
- Dune::MultipleCodimMultipleGeomTypeMapper<GridView> vertexMapper(gridView, Dune::mcmgVertexLayout());
-
boundaryMarker.clear();
boundaryMarker.resize(gridView.size(dim));
rank.clear();
@@ -131,7 +127,7 @@ private:
for(const auto& element : elements(gridView))
{
- auto eIdx = elementMapper.index(element);
+ auto eIdx = gridView.indexSet().index(element);
rank[eIdx] = gridView.comm().rank();
for(const auto& intersection : intersections(gridView, element))
{
@@ -145,7 +141,7 @@ private:
{
// get local vertex index with respect to the element
auto vIdxLocal = refElement.subEntity(intersection.indexInInside(), 1, vIdx, dim);
- auto vIdxGlobal = vertexMapper.subIndex(element, vIdxLocal, dim);
+ auto vIdxGlobal = gridView.indexSet().subIndex(element, vIdxLocal, dim);
// make sure we always take the lowest non-zero marker (problem dependent!)
if (boundaryMarker[vIdxGlobal] == 0)
--
GitLab