From 8c48efdaadcdce8cc0379c6f6199e1d0baff4b23 Mon Sep 17 00:00:00 2001 From: Jonathan Youett <youett@mi.fu-berlin.de> Date: Tue, 15 Nov 2011 16:44:17 +0000 Subject: [PATCH] use header from dune-geometry [[Imported from SVN: r8182]] --- cosserat-continuum.cc | 2 +- dune.module | 2 +- dune/gfe/averageinterface.hh | 3 +++ dune/gfe/cosseratenergystiffness.hh | 2 +- dune/gfe/geodesicfefunctionadaptor.hh | 2 ++ dune/gfe/harmonicenergystiffness.hh | 2 +- dune/gfe/localgeodesicfefunction.hh | 2 ++ dune/gfe/localgfetestfunctionbasis.hh | 2 +- dune/gfe/rodassembler.cc | 2 +- dune/gfe/rodlocalstiffness.hh | 2 +- test/averagedistanceassemblertest.cc | 3 ++- test/cosseratenergytest.cc | 3 +++ test/localgeodesicfefunctiontest.cc | 5 ++++- test/localgeodesicfestiffnesstest.cc | 2 ++ 14 files changed, 25 insertions(+), 9 deletions(-) diff --git a/cosserat-continuum.cc b/cosserat-continuum.cc index acb3ef16..0947c7b5 100644 --- a/cosserat-continuum.cc +++ b/cosserat-continuum.cc @@ -34,7 +34,7 @@ const int dim = 2; // Image space of the geodesic fe functions #ifdef RIGIDBODYMOTION3 -typedef RigidBodyMotion<3> TargetSpace; +typedef RigidBodyMotion<double,3> TargetSpace; #endif // Tangent vector of the image space diff --git a/dune.module b/dune.module index 59d6b958..8064154e 100644 --- a/dune.module +++ b/dune.module @@ -6,4 +6,4 @@ Module:dune-gfe Version: svn #depending on -Depends:dune-common dune-grid dune-istl dune-localfunctions dune-solvers dune-fufem +Depends:dune-common dune-grid dune-istl dune-localfunctions dune-solvers dune-fufem dune-geometry diff --git a/dune/gfe/averageinterface.hh b/dune/gfe/averageinterface.hh index ff53c8fa..4a0a1518 100644 --- a/dune/gfe/averageinterface.hh +++ b/dune/gfe/averageinterface.hh @@ -1,6 +1,9 @@ #ifndef AVERAGE_INTERFACE_HH #define AVERAGE_INTERFACE_HH +#include <dune/geometry/referenceelements.hh> +#include <dune/geometry/quadraturerules.hh> + #include <dune/common/fmatrix.hh> #include <dune/localfunctions/lagrange/pqkfactory.hh> #include <dune/istl/solvers.hh> diff --git a/dune/gfe/cosseratenergystiffness.hh b/dune/gfe/cosseratenergystiffness.hh index 17cf5f1a..5df5bad0 100644 --- a/dune/gfe/cosseratenergystiffness.hh +++ b/dune/gfe/cosseratenergystiffness.hh @@ -3,7 +3,7 @@ #include <dune/common/fmatrix.hh> #include <dune/common/parametertree.hh> -#include <dune/grid/common/quadraturerules.hh> +#include <dune/geometry/quadraturerules.hh> #include <dune/fufem/functions/virtualgridfunction.hh> #include <dune/fufem/boundarypatch.hh> diff --git a/dune/gfe/geodesicfefunctionadaptor.hh b/dune/gfe/geodesicfefunctionadaptor.hh index 76a5b725..d4528c09 100644 --- a/dune/gfe/geodesicfefunctionadaptor.hh +++ b/dune/gfe/geodesicfefunctionadaptor.hh @@ -4,6 +4,8 @@ #include <vector> #include <map> +#include<dune/geometry/referenceelements.hh> + #include <dune/fufem/functionspacebases/p2nodalbasis.hh> #include "localgeodesicfefunction.hh" diff --git a/dune/gfe/harmonicenergystiffness.hh b/dune/gfe/harmonicenergystiffness.hh index 7030b509..9f81b86a 100644 --- a/dune/gfe/harmonicenergystiffness.hh +++ b/dune/gfe/harmonicenergystiffness.hh @@ -2,7 +2,7 @@ #define HARMONIC_ENERGY_LOCAL_STIFFNESS_HH #include <dune/common/fmatrix.hh> -#include <dune/grid/common/quadraturerules.hh> +#include <dune/geometry/quadraturerules.hh> #include "localgeodesicfestiffness.hh" #include "localgeodesicfefunction.hh" diff --git a/dune/gfe/localgeodesicfefunction.hh b/dune/gfe/localgeodesicfefunction.hh index ae3238c2..9d7d5aed 100644 --- a/dune/gfe/localgeodesicfefunction.hh +++ b/dune/gfe/localgeodesicfefunction.hh @@ -5,6 +5,8 @@ #include <dune/common/fvector.hh> +#include <dune/geometry/type.hh> + #include <dune/gfe/averagedistanceassembler.hh> #include <dune/gfe/targetspacertrsolver.hh> #include <dune/gfe/rigidbodymotion.hh> diff --git a/dune/gfe/localgfetestfunctionbasis.hh b/dune/gfe/localgfetestfunctionbasis.hh index f0d03811..cf5707fa 100644 --- a/dune/gfe/localgfetestfunctionbasis.hh +++ b/dune/gfe/localgfetestfunctionbasis.hh @@ -5,7 +5,7 @@ #include <dune/common/fvector.hh> #include <dune/common/array.hh> -#include <dune/common/geometrytype.hh> +#include <dune/geometry/type.hh> #include <dune/gfe/localgeodesicfefunction.hh> #include <dune/gfe/tensor3.hh> diff --git a/dune/gfe/rodassembler.cc b/dune/gfe/rodassembler.cc index bf6b08f0..1076504a 100644 --- a/dune/gfe/rodassembler.cc +++ b/dune/gfe/rodassembler.cc @@ -3,7 +3,7 @@ #include <dune/istl/matrixindexset.hh> #include <dune/istl/matrix.hh> -#include <dune/grid/common/quadraturerules.hh> +#include <dune/geometry/quadraturerules.hh> #include <dune/localfunctions/lagrange/p1.hh> diff --git a/dune/gfe/rodlocalstiffness.hh b/dune/gfe/rodlocalstiffness.hh index a526da4b..73efd230 100644 --- a/dune/gfe/rodlocalstiffness.hh +++ b/dune/gfe/rodlocalstiffness.hh @@ -3,7 +3,7 @@ #include <dune/common/fmatrix.hh> #include <dune/istl/matrix.hh> -#include <dune/grid/common/quadraturerules.hh> +#include <dune/geometry/quadraturerules.hh> #include <dune/localfunctions/lagrange/p1.hh> #include <dune/fufem/functionspacebases/p1nodalbasis.hh> diff --git a/test/averagedistanceassemblertest.cc b/test/averagedistanceassemblertest.cc index e1361137..0f49c4a4 100644 --- a/test/averagedistanceassemblertest.cc +++ b/test/averagedistanceassemblertest.cc @@ -3,7 +3,8 @@ #include <iostream> #include <dune/common/fvector.hh> -#include <dune/grid/common/quadraturerules.hh> +#include <dune/geometry/quadraturerules.hh> +#include <dune/geometry/type.hh> #include <dune/gfe/rotation.hh> #include <dune/gfe/realtuple.hh> diff --git a/test/cosseratenergytest.cc b/test/cosseratenergytest.cc index 02e8b9b3..b475c29a 100644 --- a/test/cosseratenergytest.cc +++ b/test/cosseratenergytest.cc @@ -2,6 +2,9 @@ #include <dune/grid/uggrid.hh> +#include <dune/geometry/type.hh> +#include <dune/geometry/quadraturerules.hh> + #include <dune/localfunctions/lagrange/pqkfactory.hh> #include <dune/fufem/functions/constantfunction.hh> diff --git a/test/localgeodesicfefunctiontest.cc b/test/localgeodesicfefunctiontest.cc index 94da4b3d..f506ca6d 100644 --- a/test/localgeodesicfefunctiontest.cc +++ b/test/localgeodesicfefunctiontest.cc @@ -4,7 +4,10 @@ #include <iostream> #include <dune/common/fvector.hh> -#include <dune/grid/common/quadraturerules.hh> + +#include <dune/geometry/quadraturerules.hh> +#include <dune/geometry/type.hh> +#include <dune/geometry/referenceelements.hh> #include <dune/localfunctions/lagrange/pqkfactory.hh> diff --git a/test/localgeodesicfestiffnesstest.cc b/test/localgeodesicfestiffnesstest.cc index 7391cc05..a126a7d9 100644 --- a/test/localgeodesicfestiffnesstest.cc +++ b/test/localgeodesicfestiffnesstest.cc @@ -5,6 +5,8 @@ #include <dune/istl/io.hh> +#include <dune/geometry/type.hh> + #include <dune/gfe/unitvector.hh> #include <dune/gfe/realtuple.hh> #include <dune/gfe/localgeodesicfestiffness.hh> -- GitLab