From 5a2ed7b865b4eb95d81992ed165c3856c2cb5fc8 Mon Sep 17 00:00:00 2001
From: Jonathan Youett <youett@mi.fu-berlin.de>
Date: Fri, 10 Jan 2014 16:52:39 +0000
Subject: [PATCH] Avoid comparsion of int/unsigned int and use the method
 leafGridView.

[[Imported from SVN: r12621]]
---
 .../estimators/zienkiewiczzhuestimator.hh          | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/dune/elasticity/estimators/zienkiewiczzhuestimator.hh b/dune/elasticity/estimators/zienkiewiczzhuestimator.hh
index 06ccbe6..63c1162 100644
--- a/dune/elasticity/estimators/zienkiewiczzhuestimator.hh
+++ b/dune/elasticity/estimators/zienkiewiczzhuestimator.hh
@@ -48,7 +48,7 @@ public:
 
                 
                 
-        P1Basis p1Basis(grid_->leafView());
+        P1Basis p1Basis(grid_->leafGridView());
         MassMatrixType massMatrix;
         OperatorAssembler<P1Basis,P1Basis> globalAssembler(p1Basis,p1Basis);
         MassAssembler<GridType, typename P1Basis::LocalFiniteElement, typename P1Basis::LocalFiniteElement,BlockType> localMassAssembler;
@@ -99,7 +99,7 @@ public:
 
             VectorType localSolution(finiteElement.localBasis().size());
 
-            for (int i=0; i<finiteElement.localBasis().size(); i++)
+            for (size_t i=0; i<finiteElement.localBasis().size(); i++)
                 localSolution[i] = x[indexSet.subIndex(*eIt,i,dim)];
 
             /** \todo Determine correct quadrature order */
@@ -132,7 +132,7 @@ public:
                 
                 finiteElement.localBasis().evaluateJacobian(quadPos,temp);
                 
-                for (int i=0; i<finiteElement.localBasis().size(); i++) {
+                for (size_t i=0; i<finiteElement.localBasis().size(); i++) {
                 	
                 	grad = 0;
                 	jac.umv(temp[i][0],grad); // transform gradient to global coordinates
@@ -161,11 +161,11 @@ public:
                 finiteElement.localBasis().evaluateFunction(quadPos,values);
 
                 // loop over test function number
-                for (int row=0; row<finiteElement.localBasis().size(); row++) {
+                for (size_t row=0; row<finiteElement.localBasis().size(); row++) {
 
                     int globalRow = indexSet.subIndex(*eIt,row,dim);
                     
-                    for (int rcomp=0; rcomp<p0Stress.size(); rcomp++) {
+                    for (size_t rcomp=0; rcomp<p0Stress.size(); rcomp++) {
              
                         unscaledP1Stress[globalRow][rcomp] += p0Stress[rcomp]*values[row] * factor;
 
@@ -228,7 +228,7 @@ public:
 
             VectorType localSolution(finiteElement.localBasis().size());
 
-            for (int i=0; i<finiteElement.localBasis().size(); i++)
+            for (size_t i=0; i<finiteElement.localBasis().size(); i++)
                 localSolution[i] = x[indexSet.subIndex(*eIt,i,dim)];
 
             /** \todo Determine correct quadrature order */
@@ -267,7 +267,7 @@ public:
                 finiteElement.localBasis().evaluateFunction(quadPos,values);
 
                 // loop over test function number
-                for (int i=0; i<finiteElement.localBasis().size(); i++) {
+                for (size_t i=0; i<finiteElement.localBasis().size(); i++) {
                     
                     grad = 0;
                     jac.umv(temp[i][0],grad); // transform gradient to global coordinates
-- 
GitLab