Skip to content
Snippets Groups Projects
Commit fd62cef0 authored by akbib's avatar akbib Committed by akbib
Browse files

Avoid comparsion of int/unsigned int warnings.

[[Imported from SVN: r12598]]
parent dd62361e
Branches
No related tags found
No related merge requests found
...@@ -71,7 +71,7 @@ void MonotoneMGStep<MatrixType, VectorType>::nestedIteration() ...@@ -71,7 +71,7 @@ void MonotoneMGStep<MatrixType, VectorType>::nestedIteration()
this->mgTransfer_[i-1]->restrict(this->rhsHierarchy_[i], this->rhsHierarchy_[i-1]); 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 // If we start from an infeasible configuration, the restricted
// obstacles may be inconsistent. We do an ad hoc correction here. // obstacles may be inconsistent. We do an ad hoc correction here.
...@@ -239,7 +239,7 @@ void MonotoneMGStep<MatrixType, VectorType>::iterate() ...@@ -239,7 +239,7 @@ void MonotoneMGStep<MatrixType, VectorType>::iterate()
// //////////////////////////////////////////////////////////////////// // ////////////////////////////////////////////////////////////////////
// Track the number of critical nodes found during this iteration // 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; std::cout << critical.count() << " critical nodes found on level " << level;
...@@ -254,7 +254,7 @@ void MonotoneMGStep<MatrixType, VectorType>::iterate() ...@@ -254,7 +254,7 @@ void MonotoneMGStep<MatrixType, VectorType>::iterate()
} }
// Debug: output energy // 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::cout << "Total energy: "
<< std::setprecision(10) << computeEnergy(*mat[level], *x[level], rhs[level]) << std::endl; << std::setprecision(10) << computeEnergy(*mat[level], *x[level], rhs[level]) << std::endl;
......
...@@ -184,7 +184,7 @@ else { ...@@ -184,7 +184,7 @@ else {
template<class MatrixType, class VectorType, class BitVectorType> template<class MatrixType, class VectorType, class BitVectorType>
void MultigridStep<MatrixType, VectorType, BitVectorType>::nestedIteration() void MultigridStep<MatrixType, VectorType, BitVectorType>::nestedIteration()
{ {
for (level_ = 0; level_<numLevels(); level_++) for (level_ = 0; level_<(int) numLevels(); level_++)
{ {
iterate(); iterate();
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment