New subdirectories: geometry/ and grid/

dune/fufem/CMakeLists.txt

 add_subdirectory(assemblers)
 add_subdirectory(estimators)
+add_subdirectory(geometry)
+add_subdirectory(grid)
 add_subdirectory(functions)
 add_subdirectory(functionspacebases)
 add_subdirectory(functiontools)
@@ -22,7 +24,6 @@ install(FILES
     boundingbox.hh
     box.hh
     concept.hh
-    convexpolyhedron.hh
     dataio.hh
     dgindexset.hh
     dgpqkindexset.hh
@@ -34,7 +35,6 @@ install(FILES
     facelocalfiniteelement.hh
     formatstring.hh
     globalintersectioniterator.hh
-    hierarchic-approximation.hh
     improvegrid.hh
     interval.hh
     lumpmatrix.hh
@@ -44,7 +44,6 @@ install(FILES
     mappedmatrix.hh
     matlab_io.hh
     orientedsubface.hh
-    polyhedrondistance.hh
     prolongboundarypatch.hh
     readbitfield.hh
     referenceelementhelper.hh

dune/fufem/geometry/CMakeLists.txt

+install(FILES
+    convexpolyhedron.hh
+    polyhedrondistance.hh
+    DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dune/fufem/grid)

dune/fufem/convexpolyhedron.hh → dune/fufem/geometry/convexpolyhedron.hh

-#ifndef DUNE_FUFEM_CONVEXPOLYHEDRON_HH
-#define DUNE_FUFEM_CONVEXPOLYHEDRON_HH
+#ifndef DUNE_FUFEM_GEOMETRY_CONVEXPOLYHEDRON_HH
+#define DUNE_FUFEM_GEOMETRY_CONVEXPOLYHEDRON_HH
 
 #include <dune/fufem/arithmetic.hh>
 

dune/fufem/polyhedrondistance.hh → dune/fufem/geometry/polyhedrondistance.hh

-#ifndef DUNE_FUFEM_POLYHEDRONDISTANCE_HH
-#define DUNE_FUFEM_POLYHEDRONDISTANCE_HH
+#ifndef DUNE_FUFEM_GEOMETRY_POLYHEDRONDISTANCE_HH
+#define DUNE_FUFEM_GEOMETRY_POLYHEDRONDISTANCE_HH
 
 // Based on the closest point projection from dune-contact
 
 #include <dune/common/dynvector.hh>
 #include <dune/common/dynmatrix.hh>
 
-#include <dune/fufem/convexpolyhedron.hh>
+#include <dune/fufem/geometry/convexpolyhedron.hh>
 
 template <class Coordinate, class Matrix>
 void populateMatrix(ConvexPolyhedron<Coordinate> const &segment,

dune/fufem/grid/CMakeLists.txt

+install(FILES
+    hierarchic-approximation.hh
+    DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dune/fufem/grid)

dune/fufem/hierarchic-approximation.hh → dune/fufem/grid/hierarchic-approximation.hh

-#ifndef DUNE_FUFEM_HIERARCHIC_APPROXIMATION_HH
-#define DUNE_FUFEM_HIERARCHIC_APPROXIMATION_HH
+#ifndef DUNE_FUFEM_GRID_HIERARCHIC_APPROXIMATION_HH
+#define DUNE_FUFEM_GRID_HIERARCHIC_APPROXIMATION_HH
 
 // Based on
 // dune/grid/utility/hierarchicsearch.hh

dune/fufem/test/test-polyhedral-minimisation.cc

@@ -4,7 +4,7 @@
 
 #include <dune/common/fvector.hh>
 
-#include <dune/fufem/polyhedrondistance.hh>
+#include <dune/fufem/geometry/polyhedrondistance.hh>
 
 int main() {
   using LocalVector = Dune::FieldVector<double, 2>;