Skip to content
Snippets Groups Projects
Commit dad128fc authored by graeser's avatar graeser Committed by graeser
Browse files

Fix signed/unsigned comparison warning

[[Imported from SVN: r6056]]
parent 3148812d
No related branches found
No related tags found
No related merge requests found
...@@ -12,6 +12,8 @@ typedef Dune::BlockVector<Dune::FieldVector <double,1> > VectorType; ...@@ -12,6 +12,8 @@ typedef Dune::BlockVector<Dune::FieldVector <double,1> > VectorType;
class DiagNorm: public Norm<VectorType> class DiagNorm: public Norm<VectorType>
{ {
typedef typename VectorType::size_type SizeType;
public: public:
DiagNorm(double alpha, const VectorType &d) : DiagNorm(double alpha, const VectorType &d) :
d(d), d(d),
...@@ -22,7 +24,7 @@ class DiagNorm: public Norm<VectorType> ...@@ -22,7 +24,7 @@ class DiagNorm: public Norm<VectorType>
double operator()(const VectorType &v) const { double operator()(const VectorType &v) const {
double r = 0.0; double r = 0.0;
for(int row = 0; row < v.size(); ++row) for(SizeType row = 0; row < v.size(); ++row)
r += d[row] * v[row] * v[row]; r += d[row] * v[row] * v[row];
return sqrt(fabs(alpha * r)); return sqrt(fabs(alpha * r));
...@@ -33,7 +35,7 @@ class DiagNorm: public Norm<VectorType> ...@@ -33,7 +35,7 @@ class DiagNorm: public Norm<VectorType>
{ {
double r = 0.0; double r = 0.0;
for(int row = 0; row < v1.size(); ++row) for(SizeType row = 0; row < v1.size(); ++row)
r += (double)d[row] * (v1[row]-v2[row]) * (v1[row] - v2[row]); r += (double)d[row] * (v1[row]-v2[row]) * (v1[row] - v2[row]);
return sqrt(fabs(alpha * r)); return sqrt(fabs(alpha * r));
......
...@@ -12,6 +12,8 @@ typedef Dune::BlockVector<Dune::FieldVector<double,1> > Vector; ...@@ -12,6 +12,8 @@ typedef Dune::BlockVector<Dune::FieldVector<double,1> > Vector;
class FullNorm: public Norm<Vector> class FullNorm: public Norm<Vector>
{ {
typedef typename VectorType::size_type SizeType;
public: public:
FullNorm(double alpha, const Vector &m) : FullNorm(double alpha, const Vector &m) :
m(m), m(m),
...@@ -23,7 +25,7 @@ class FullNorm: public Norm<Vector> ...@@ -23,7 +25,7 @@ class FullNorm: public Norm<Vector>
{ {
double r = 0.0; double r = 0.0;
for(int row = 0; row < v.size(); ++row) for(SizeType row = 0; row < v.size(); ++row)
r += m[row] * v[row]; r += m[row] * v[row];
return sqrt(fabs(alpha*r*r)); return sqrt(fabs(alpha*r*r));
...@@ -34,7 +36,7 @@ class FullNorm: public Norm<Vector> ...@@ -34,7 +36,7 @@ class FullNorm: public Norm<Vector>
{ {
double r = 0.0; double r = 0.0;
for(int row = 0; row < v1.size(); ++row) for(SizeType row = 0; row < v1.size(); ++row)
r += (double)m[row] * (v1[row] - v2[row]); r += (double)m[row] * (v1[row] - v2[row]);
return sqrt(fabs(alpha*r*r)); return sqrt(fabs(alpha*r*r));
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment