From 5be9b8425a5abd3b72404982baff5a319991646e Mon Sep 17 00:00:00 2001
From: Oliver Sander <oliver.sander@tu-dresden.de>
Date: Fri, 20 Nov 2015 17:04:59 +0100
Subject: [PATCH] Use range-based for
---
test/adolctest.cc | 21 +++++++++------------
1 file changed, 9 insertions(+), 12 deletions(-)
diff --git a/test/adolctest.cc b/test/adolctest.cc
index 7b28035b..6a33e676 100644
--- a/test/adolctest.cc
+++ b/test/adolctest.cc
@@ -515,16 +515,13 @@ int main (int argc, char *argv[]) try
FDType> localGFEFDStiffness(&cosseratEnergyFDLocalStiffness);
// Compute and compare matrices
- auto it = gridView.template begin<0>();
- auto endit = gridView.template end<0> ();
-
- for( ; it != endit; ++it ) {
-
- std::cout << " ++++ element " << gridView.indexSet().index(*it) << " ++++" << std::endl;
+ for (const auto& element : Dune::elements(gridView))
+ {
+ std::cout << " ++++ element " << gridView.indexSet().index(element) << " ++++" << std::endl;
auto localView = feBasis.localView();
auto localIndexSet = feBasis.localIndexSet();
- localView.bind(*it);
+ localView.bind(element);
localIndexSet.bind(localView);
const int numOfBaseFct = localView.size();
@@ -544,21 +541,21 @@ int main (int argc, char *argv[]) try
Matrix<FieldMatrix<double,embeddedBlocksize,embeddedBlocksize> > localFDHessian;
// Assemble Euclidean derivatives
- localADOLCStiffness.assembleGradientAndHessian(*it,
+ localADOLCStiffness.assembleGradientAndHessian(element,
localView.tree().finiteElement(),
localSolution,
localADGradient,
localADHessian,
false); // 'true' means 'vector mode'
- localADOLCStiffness.assembleGradientAndHessian(*it,
+ localADOLCStiffness.assembleGradientAndHessian(element,
localView.tree().finiteElement(),
localSolution,
localADGradient,
localADVMHessian,
true); // 'true' means 'vector mode'
- localFDStiffness.assembleGradientAndHessian(*it,
+ localFDStiffness.assembleGradientAndHessian(element,
localView.tree().finiteElement(),
localSolution,
localFDGradient,
@@ -575,12 +572,12 @@ int main (int argc, char *argv[]) try
Matrix<FieldMatrix<double,blocksize,blocksize> > localRiemannianADHessian;
Matrix<FieldMatrix<double,blocksize,blocksize> > localRiemannianFDHessian;
- localGFEADOLCStiffness.assembleGradientAndHessian(*it,
+ localGFEADOLCStiffness.assembleGradientAndHessian(element,
localView.tree().finiteElement(),
localSolution,
localRiemannianADGradient);
- localGFEFDStiffness.assembleGradientAndHessian(*it,
+ localGFEFDStiffness.assembleGradientAndHessian(element,
localView.tree().finiteElement(),
localSolution,
localRiemannianFDGradient);
--
GitLab