use header from dune-geometry

[[Imported from SVN: r8182]]

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

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

dune/gfe/averageinterface.hh

 #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>

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>

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"

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"

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>

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>

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>
 

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>

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>

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>

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>
 

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>