Skip to content
Snippets Groups Projects
Commit 75e7fb3a authored by Timo Koch's avatar Timo Koch
Browse files

[gridcreator] Base test on indexSet. Fixes boundary test again.

parent 9524782a
No related branches found
No related tags found
1 merge request!185Fix/gridcreator gmsh parameters
...@@ -96,7 +96,6 @@ private: ...@@ -96,7 +96,6 @@ private:
{ {
const auto& gridView = GridCreator::grid().leafGridView(); const auto& gridView = GridCreator::grid().leafGridView();
Dune::MultipleCodimMultipleGeomTypeMapper<GridView> elementMapper(gridView, Dune::mcmgElementLayout());
elementMarker.clear(); elementMarker.clear();
elementMarker.resize(gridView.size(0)); elementMarker.resize(gridView.size(0));
rank.clear(); rank.clear();
...@@ -104,7 +103,7 @@ private: ...@@ -104,7 +103,7 @@ private:
for(const auto& element : elements(gridView)) for(const auto& element : elements(gridView))
{ {
auto eIdx = elementMapper.index(element); auto eIdx = gridView.indexSet().index(element);
rank[eIdx] = gridView.comm().rank(); rank[eIdx] = gridView.comm().rank();
if (type == "gmsh") if (type == "gmsh")
...@@ -121,9 +120,6 @@ private: ...@@ -121,9 +120,6 @@ private:
{ {
const auto& gridView = GridCreator::grid().leafGridView(); const auto& gridView = GridCreator::grid().leafGridView();
Dune::MultipleCodimMultipleGeomTypeMapper<GridView> elementMapper(gridView, Dune::mcmgElementLayout());
Dune::MultipleCodimMultipleGeomTypeMapper<GridView> vertexMapper(gridView, Dune::mcmgVertexLayout());
boundaryMarker.clear(); boundaryMarker.clear();
boundaryMarker.resize(gridView.size(dim)); boundaryMarker.resize(gridView.size(dim));
rank.clear(); rank.clear();
...@@ -131,7 +127,7 @@ private: ...@@ -131,7 +127,7 @@ private:
for(const auto& element : elements(gridView)) for(const auto& element : elements(gridView))
{ {
auto eIdx = elementMapper.index(element); auto eIdx = gridView.indexSet().index(element);
rank[eIdx] = gridView.comm().rank(); rank[eIdx] = gridView.comm().rank();
for(const auto& intersection : intersections(gridView, element)) for(const auto& intersection : intersections(gridView, element))
{ {
...@@ -145,7 +141,7 @@ private: ...@@ -145,7 +141,7 @@ private:
{ {
// get local vertex index with respect to the element // get local vertex index with respect to the element
auto vIdxLocal = refElement.subEntity(intersection.indexInInside(), 1, vIdx, dim); 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!) // make sure we always take the lowest non-zero marker (problem dependent!)
if (boundaryMarker[vIdxGlobal] == 0) if (boundaryMarker[vIdxGlobal] == 0)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment