Skip to content
Snippets Groups Projects
Commit dcc28b27 authored by Oliver Sander's avatar Oliver Sander Committed by sander@PCPOOL.MI.FU-BERLIN.DE
Browse files

headercheck fixes

[[Imported from SVN: r3050]]
parent c567a501
Branches
Tags
No related merge requests found
...@@ -8,7 +8,7 @@ public: ...@@ -8,7 +8,7 @@ public:
/** \brief Default constructor */ /** \brief Default constructor */
CanIgnore() CanIgnore()
: ignoreNodes_(NULL) : ignoreNodes_(0)
{} {}
/** \brief Virtual destructor. Does NOT delete the bitfield! */ /** \brief Virtual destructor. Does NOT delete the bitfield! */
......
...@@ -6,6 +6,7 @@ ...@@ -6,6 +6,7 @@
*/ */
#include<iostream> #include<iostream>
#include<bitset>
#include "dune/common/fvector.hh" #include "dune/common/fvector.hh"
#include <dune/istl/bcrsmatrix.hh> #include <dune/istl/bcrsmatrix.hh>
......
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
#define TRUNCATED_SADDLE_POINT_GAUSS_SEIDEL_STEP_HH #define TRUNCATED_SADDLE_POINT_GAUSS_SEIDEL_STEP_HH
#include <dune/common/bitsetvector.hh> #include <dune/common/bitsetvector.hh>
#include <dune/common/fmatrix.hh>
#include <dune/istl/matrix.hh> #include <dune/istl/matrix.hh>
#include <dune-solvers/iterationsteps/lineariterationstep.hh> #include <dune-solvers/iterationsteps/lineariterationstep.hh>
......
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
#define BLOCK_NORM_HH #define BLOCK_NORM_HH
#include <vector> #include <vector>
#include <cmath>
#include "norm.hh" #include "norm.hh"
...@@ -25,7 +26,7 @@ class BlockNorm: public Norm<VectorType> ...@@ -25,7 +26,7 @@ class BlockNorm: public Norm<VectorType>
double ri = (*norms_[i])(v[i]); double ri = (*norms_[i])(v[i]);
r += ri*ri; r += ri*ri;
} }
return sqrt(r); return std::sqrt(r);
} }
//! Compute the norm of the difference of two vectors //! Compute the norm of the difference of two vectors
...@@ -37,7 +38,7 @@ class BlockNorm: public Norm<VectorType> ...@@ -37,7 +38,7 @@ class BlockNorm: public Norm<VectorType>
double ri = (*norms_[i]).diff(v1[i], v2[i]); double ri = (*norms_[i]).diff(v1[i], v2[i]);
r += ri*ri; r += ri*ri;
} }
return sqrt(r); return std::sqrt(r);
} }
private: private:
......
#ifndef __DIAGNORM__HH__ #ifndef __DIAGNORM__HH__
#define __DIAGNORM__HH__ #define __DIAGNORM__HH__
#include <dune/common/fvector.hh>
#include <dune/istl/bvector.hh>
#include "norm.hh" #include "norm.hh"
typedef Dune::BlockVector<Dune::FieldVector <double,1> > VectorType; typedef Dune::BlockVector<Dune::FieldVector <double,1> > VectorType;
......
#ifndef __FULLNORM__HH__ #ifndef __FULLNORM__HH__
#define __FULLNORM__HH__ #define __FULLNORM__HH__
#include <dune/common/fvector.hh>
#include <dune/istl/bvector.hh>
#include "norm.hh" #include "norm.hh"
typedef Dune::BlockVector<Dune::FieldVector<double,1> > Vector; typedef Dune::BlockVector<Dune::FieldVector<double,1> > Vector;
......
#ifndef DUNE_H1_SEMINORM_HH #ifndef DUNE_H1_SEMINORM_HH
#define DUNE_H1_SEMINORM_HH #define DUNE_H1_SEMINORM_HH
#include <dune/common/fmatrix.hh>
#include <dune/istl/bcrsmatrix.hh>
#include "norm.hh" #include "norm.hh"
template<class VectorType> template<class VectorType>
......
#ifndef __PNORM__HH__ #ifndef __PNORM__HH__
#define __PNORM__HH__ #define __PNORM__HH__
#include <dune/common/fvector.hh>
#include <dune/istl/bvector.hh>
#include "norm.hh" #include "norm.hh"
typedef BlockVector<FieldVector <double,1> > Vector; typedef Dune::BlockVector<Dune::FieldVector <double,1> > Vector;
class PNorm: public Norm<Vector> class PNorm: public Norm<Vector>
{ {
......
#ifndef __SUMNORM__HH__ #ifndef __SUMNORM__HH__
#define __SUMNORM__HH__ #define __SUMNORM__HH__
#include <cmath>
#include "norm.hh" #include "norm.hh"
template <class VectorType> template <class VectorType>
...@@ -20,7 +22,7 @@ class SumNorm: public Norm<VectorType> ...@@ -20,7 +22,7 @@ class SumNorm: public Norm<VectorType>
double r1 = norm1(v); double r1 = norm1(v);
double r2 = norm2(v); double r2 = norm2(v);
return sqrt(alpha1 * r1 * r1 + alpha2 * r2 *r2); return std::sqrt(alpha1 * r1 * r1 + alpha2 * r2 *r2);
} }
//! Compute the norm of the difference of two vectors //! Compute the norm of the difference of two vectors
...@@ -29,7 +31,7 @@ class SumNorm: public Norm<VectorType> ...@@ -29,7 +31,7 @@ class SumNorm: public Norm<VectorType>
double r1 = norm1.diff(v1,v2); double r1 = norm1.diff(v1,v2);
double r2 = norm2.diff(v1,v2); double r2 = norm2.diff(v1,v2);
return sqrt(alpha1 * r1 * r1 + alpha2 * r2 *r2); return std::sqrt(alpha1 * r1 * r1 + alpha2 * r2 *r2);
} }
private: private:
......
...@@ -2,6 +2,8 @@ ...@@ -2,6 +2,8 @@
#include <limits> #include <limits>
#include <iomanip> #include <iomanip>
#include <dune-solvers/norms/energynorm.hh>
template <class MatrixType, class VectorType> template <class MatrixType, class VectorType>
void TruncatedCGSolver<MatrixType, VectorType>::check() const void TruncatedCGSolver<MatrixType, VectorType>::check() const
{ {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment