From 19ba8527c86e684da22fa1b6a682a1814c77e706 Mon Sep 17 00:00:00 2001
From: Oliver Sander <oliver.sander@tu-dresden.de>
Date: Sat, 23 Jan 2016 17:25:19 +0100
Subject: [PATCH] Use more range-based for loops
---
src/cosserat-continuum.cc | 16 ++++++----------
1 file changed, 6 insertions(+), 10 deletions(-)
diff --git a/src/cosserat-continuum.cc b/src/cosserat-continuum.cc
index 45a2918c..9f278552 100644
--- a/src/cosserat-continuum.cc
+++ b/src/cosserat-continuum.cc
@@ -202,9 +202,6 @@ int main (int argc, char *argv[]) try
BitSetVector<1> dirichletVertices(gridView.size(dim), false);
BitSetVector<1> neumannVertices(gridView.size(dim), false);
- GridType::Codim<dim>::LeafIterator vIt = gridView.begin<dim>();
- GridType::Codim<dim>::LeafIterator vEndIt = gridView.end<dim>();
-
const GridView::IndexSet& indexSet = gridView.indexSet();
// Make Python function that computes which vertices are on the Dirichlet boundary,
@@ -216,16 +213,15 @@ int main (int argc, char *argv[]) try
lambda = std::string("lambda x: (") + parameterSet.get<std::string>("neumannVerticesPredicate", "0") + std::string(")");
PythonFunction<FieldVector<double,dimworld>, bool> pythonNeumannVertices(Python::evaluate(lambda));
- for (; vIt!=vEndIt; ++vIt) {
-
+ for (auto&& vertex : vertices(gridView))
+ {
bool isDirichlet;
- pythonDirichletVertices.evaluate(vIt->geometry().corner(0), isDirichlet);
- dirichletVertices[indexSet.index(*vIt)] = isDirichlet;
+ pythonDirichletVertices.evaluate(vertex.geometry().corner(0), isDirichlet);
+ dirichletVertices[indexSet.index(vertex)] = isDirichlet;
bool isNeumann;
- pythonNeumannVertices.evaluate(vIt->geometry().corner(0), isNeumann);
- neumannVertices[indexSet.index(*vIt)] = isNeumann;
-
+ pythonNeumannVertices.evaluate(vertex.geometry().corner(0), isNeumann);
+ neumannVertices[indexSet.index(vertex)] = isNeumann;
}
BoundaryPatch<GridView> dirichletBoundary(gridView, dirichletVertices);
--
GitLab