From fe7761781c941822be1ab6bf843ddd77a1cef5b8 Mon Sep 17 00:00:00 2001 From: Oliver Sander <sander@igpm.rwth-aachen.de> Date: Sat, 13 Feb 2010 10:03:59 +0000 Subject: [PATCH] headercheck fixes [[Imported from SVN: r5559]] --- src/localgeodesicfestiffness.hh | 2 ++ src/makestraightrod.hh | 2 +- src/maxnormtrustregion.hh | 4 ++++ src/planarrodassembler.hh | 2 ++ src/riemanniantrsolver.hh | 2 +- src/rodrefine.hh | 3 +++ src/rodwriter.hh | 1 + src/svd.hh | 8 ++++---- 8 files changed, 18 insertions(+), 6 deletions(-) diff --git a/src/localgeodesicfestiffness.hh b/src/localgeodesicfestiffness.hh index 8224b8bd..42aa5744 100644 --- a/src/localgeodesicfestiffness.hh +++ b/src/localgeodesicfestiffness.hh @@ -8,6 +8,8 @@ #include <dune/disc/operators/localstiffness.hh> #include<dune/disc/operators/boundaryconditions.hh> +#include "rigidbodymotion.hh" + template<class GridView, class TargetSpace> class LocalGeodesicFEStiffness : public Dune::LocalStiffness<GridView,double,TargetSpace::TangentVector::size> diff --git a/src/makestraightrod.hh b/src/makestraightrod.hh index 933d8505..4facbc62 100644 --- a/src/makestraightrod.hh +++ b/src/makestraightrod.hh @@ -5,7 +5,7 @@ #include <dune/common/fvector.hh> #include <dune/ag-common/crossproduct.hh> -#include "rotation.hh" +#include "rigidbodymotion.hh" /** \brief Make a straight rod from two given endpoints diff --git a/src/maxnormtrustregion.hh b/src/maxnormtrustregion.hh index 4d9fddda..6346df4d 100644 --- a/src/maxnormtrustregion.hh +++ b/src/maxnormtrustregion.hh @@ -1,6 +1,10 @@ #ifndef MAX_NORM_TRUST_REGION_HH #define MAX_NORM_TRUST_REGION_HH +#include <vector> + +#include <dune/solvers/boxconstraint.hh> + template <int blocksize> class MaxNormTrustRegion { diff --git a/src/planarrodassembler.hh b/src/planarrodassembler.hh index 6da3797c..20bf1a19 100644 --- a/src/planarrodassembler.hh +++ b/src/planarrodassembler.hh @@ -7,6 +7,8 @@ #include <dune/istl/matrixindexset.hh> #include <dune/istl/matrix.hh> +#include "rigidbodymotion.hh" + namespace Dune { diff --git a/src/riemanniantrsolver.hh b/src/riemanniantrsolver.hh index cac1074a..7919ef3a 100644 --- a/src/riemanniantrsolver.hh +++ b/src/riemanniantrsolver.hh @@ -10,7 +10,7 @@ #include <dune/solvers/boxconstraint.hh> #include <dune/solvers/norms/h1seminorm.hh> -#include <dune/solvers/solvers/solver.hh> +#include <dune/solvers/solvers/iterativesolver.hh> #include "geodesicfeassembler.hh" diff --git a/src/rodrefine.hh b/src/rodrefine.hh index 4c20bb4c..d847035c 100644 --- a/src/rodrefine.hh +++ b/src/rodrefine.hh @@ -1,6 +1,9 @@ #ifndef ROD_REFINE_HH #define ROD_REFINE_HH +#include <vector> +#include <map> + #include "rigidbodymotion.hh" template <class GridType> diff --git a/src/rodwriter.hh b/src/rodwriter.hh index 7e506308..3837aa19 100644 --- a/src/rodwriter.hh +++ b/src/rodwriter.hh @@ -2,6 +2,7 @@ #define ROD_WRITER_HH #include <fstream> +#include <vector> #include <dune/common/exceptions.hh> #include <dune/istl/bvector.hh> diff --git a/src/svd.hh b/src/svd.hh index 6c96a642..bb2ba979 100644 --- a/src/svd.hh +++ b/src/svd.hh @@ -4,7 +4,7 @@ #ifndef SVD_HH #define SVD_HH -#include <math.h> +#include <cmath.h> template <class T> @@ -19,10 +19,10 @@ template <class T> T pythag(T a, T b) { T absa,absb; - absa=std::abs(a); - absb=std::abs(b); + absa=std::fabs(a); + absb=std::fabs(b); if (absa > absb) - return absa*sqrt(1.0+SQR(absb/absa)); + return absa*std::sqrt(1.0+SQR(absb/absa)); else return (absb == 0.0 ? 0.0 : absb*sqrt(1.0+SQR(absa/absb))); } -- GitLab