Skip to content
Snippets Groups Projects
Commit 3a283c81 authored by Elias Pipping's avatar Elias Pipping
Browse files

[Cleanup] Use elements() and vertices()

parent bfb97068
No related branches found
No related tags found
No related merge requests found
...@@ -201,9 +201,8 @@ void refine(Grid &grid, ConvexPolyhedron<LocalVector> const &weakPatch, ...@@ -201,9 +201,8 @@ void refine(Grid &grid, ConvexPolyhedron<LocalVector> const &weakPatch,
bool needRefine = true; bool needRefine = true;
while (true) { while (true) {
needRefine = false; needRefine = false;
for (auto it = grid.template leafbegin<0>(); for (auto &&e : elements(grid.leafGridView())) {
it != grid.template leafend<0>(); ++it) { auto const geometry = e.geometry();
auto const geometry = it->geometry();
auto const weakeningRegionDistance = auto const weakeningRegionDistance =
distance(weakPatch, geometry, 1e-6 * MyGeometry::lengthScale); distance(weakPatch, geometry, 1e-6 * MyGeometry::lengthScale);
...@@ -214,7 +213,7 @@ void refine(Grid &grid, ConvexPolyhedron<LocalVector> const &weakPatch, ...@@ -214,7 +213,7 @@ void refine(Grid &grid, ConvexPolyhedron<LocalVector> const &weakPatch,
continue; continue;
needRefine = true; needRefine = true;
grid.mark(1, *it); grid.mark(1, e);
} }
if (!needRefine) if (!needRefine)
break; break;
......
...@@ -129,9 +129,8 @@ int main(int argc, char *argv[]) { ...@@ -129,9 +129,8 @@ int main(int argc, char *argv[]) {
double minDiameter = std::numeric_limits<double>::infinity(); double minDiameter = std::numeric_limits<double>::infinity();
double maxDiameter = 0.0; double maxDiameter = 0.0;
for (auto it = grid->template leafbegin<0>(); for (auto &&e : elements(grid->leafGridView())) {
it != grid->template leafend<0>(); ++it) { auto const geometry = e.geometry();
auto const geometry = it->geometry();
auto const diam = diameter(geometry); auto const diam = diameter(geometry);
minDiameter = std::min(minDiameter, diam); minDiameter = std::min(minDiameter, diam);
maxDiameter = std::max(maxDiameter, diam); maxDiameter = std::max(maxDiameter, diam);
...@@ -237,8 +236,8 @@ int main(int argc, char *argv[]) { ...@@ -237,8 +236,8 @@ int main(int argc, char *argv[]) {
{ {
Dune::MultipleCodimMultipleGeomTypeMapper< Dune::MultipleCodimMultipleGeomTypeMapper<
GridView, Dune::MCMGVertexLayout> const vertexMapper(leafView); GridView, Dune::MCMGVertexLayout> const vertexMapper(leafView);
for (auto it = leafView.begin<dims>(); it != leafView.end<dims>(); ++it) for (auto &&v : vertices(leafView))
vertexCoordinates[vertexMapper.index(*it)] = geoToPoint(it->geometry()); vertexCoordinates[vertexMapper.index(v)] = geoToPoint(v.geometry());
} }
HDF5Writer<ProgramState<Vector, ScalarVector>, HDF5Writer<ProgramState<Vector, ScalarVector>,
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment