From fd62cef06d0477e0448ea423d3666b550d65532b Mon Sep 17 00:00:00 2001
From: Jonathan Youett <youett@mi.fu-berlin.de>
Date: Thu, 9 Jan 2014 15:56:42 +0000
Subject: [PATCH] Avoid comparsion of int/unsigned int warnings.
[[Imported from SVN: r12598]]
---
dune/solvers/iterationsteps/mmgstep.cc | 6 +++---
dune/solvers/iterationsteps/multigridstep.cc | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/dune/solvers/iterationsteps/mmgstep.cc b/dune/solvers/iterationsteps/mmgstep.cc
index 3f8e97dc..dd59802e 100644
--- a/dune/solvers/iterationsteps/mmgstep.cc
+++ b/dune/solvers/iterationsteps/mmgstep.cc
@@ -71,7 +71,7 @@ void MonotoneMGStep<MatrixType, VectorType>::nestedIteration()
this->mgTransfer_[i-1]->restrict(this->rhsHierarchy_[i], this->rhsHierarchy_[i-1]);
}
- for (this->level_ = 0; this->level_<this->numLevels()-1; this->level_++) {
+ for (this->level_ = 0; this->level_<(int) this->numLevels()-1; this->level_++) {
// If we start from an infeasible configuration, the restricted
// obstacles may be inconsistent. We do an ad hoc correction here.
@@ -239,7 +239,7 @@ void MonotoneMGStep<MatrixType, VectorType>::iterate()
// ////////////////////////////////////////////////////////////////////
// Track the number of critical nodes found during this iteration
// ////////////////////////////////////////////////////////////////////
- if (level==this->numLevels()-1 && this->verbosity_==NumProc::FULL) {
+ if (level==(int) this->numLevels()-1 && this->verbosity_==NumProc::FULL) {
std::cout << critical.count() << " critical nodes found on level " << level;
@@ -254,7 +254,7 @@ void MonotoneMGStep<MatrixType, VectorType>::iterate()
}
// Debug: output energy
- if (level==this->numLevels()-1 && this->verbosity_==NumProc::FULL)
+ if (level==(int) this->numLevels()-1 && this->verbosity_==NumProc::FULL)
std::cout << "Total energy: "
<< std::setprecision(10) << computeEnergy(*mat[level], *x[level], rhs[level]) << std::endl;
diff --git a/dune/solvers/iterationsteps/multigridstep.cc b/dune/solvers/iterationsteps/multigridstep.cc
index a9bf3f63..0c2f09f1 100644
--- a/dune/solvers/iterationsteps/multigridstep.cc
+++ b/dune/solvers/iterationsteps/multigridstep.cc
@@ -184,7 +184,7 @@ else {
template<class MatrixType, class VectorType, class BitVectorType>
void MultigridStep<MatrixType, VectorType, BitVectorType>::nestedIteration()
{
- for (level_ = 0; level_<numLevels(); level_++)
+ for (level_ = 0; level_<(int) numLevels(); level_++)
{
iterate();
--
GitLab