[test][geometry] remove deprecation warnings from moved geometry headers

dumux/common/pointsource.hh

@@ -31,9 +31,9 @@
 #include <dune/common/reservedvector.hh>
 #include <dumux/common/properties.hh>
 #include <dumux/common/parameters.hh>
-#include <dumux/common/geometry/boundingboxtree.hh>
-#include <dumux/common/geometry/intersectspointgeometry.hh>
-#include <dumux/common/geometry/intersectingentities.hh>
+#include <dumux/geometry/boundingboxtree.hh>
+#include <dumux/geometry/intersectspointgeometry.hh>
+#include <dumux/geometry/intersectingentities.hh>
 
 #include <dumux/discretization/method.hh>
 

dumux/discretization/basegridgeometry.hh

@@ -30,8 +30,8 @@
 
 #include <dumux/common/entitymap.hh>
 #include <dumux/common/indextraits.hh>
-#include <dumux/common/geometry/boundingboxtree.hh>
-#include <dumux/common/geometry/geometricentityset.hh>
+#include <dumux/geometry/boundingboxtree.hh>
+#include <dumux/geometry/geometricentityset.hh>
 
 // make the local view function available whenever we use the grid geometry
 #include <dumux/discretization/localview.hh>

dumux/freeflow/navierstokes/staggered/fluxoversurface.hh

@@ -35,8 +35,8 @@
 #include <dune/geometry/multilineargeometry.hh>
 
 #include <dumux/common/parameters.hh>
-#include <dumux/common/geometry/makegeometry.hh>
-#include <dumux/common/geometry/intersectspointgeometry.hh>
+#include <dumux/geometry/makegeometry.hh>
+#include <dumux/geometry/intersectspointgeometry.hh>
 #include <dumux/discretization/extrusion.hh>
 
 namespace Dumux {

dumux/multidomain/boundary/darcydarcy/couplingmapper.hh

@@ -34,7 +34,7 @@
 #include <dune/common/exceptions.hh>
 #include <dune/common/indices.hh>
 
-#include <dumux/common/geometry/intersectingentities.hh>
+#include <dumux/geometry/intersectingentities.hh>
 #include <dumux/discretization/method.hh>
 
 namespace Dumux {

dumux/multidomain/embedded/circlepoints.hh

@@ -31,7 +31,7 @@
 #include <dune/common/exceptions.hh>
 
 #include <dumux/common/math.hh>
-#include <dumux/common/geometry/normal.hh>
+#include <dumux/geometry/normal.hh>
 
 namespace Dumux::EmbeddedCoupling {
 

dumux/multidomain/embedded/couplingmanager1d3d.hh

@@ -33,7 +33,7 @@
 
 #include <dumux/common/properties.hh>
 #include <dumux/common/indextraits.hh>
-#include <dumux/common/geometry/distance.hh>
+#include <dumux/geometry/distance.hh>
 #include <dumux/multidomain/embedded/pointsourcedata.hh>
 #include <dumux/multidomain/embedded/integrationpointsource.hh>
 #include <dumux/multidomain/embedded/couplingmanagerbase.hh>

dumux/multidomain/embedded/couplingmanagerbase.hh

@@ -36,8 +36,8 @@
 #include <dune/geometry/quadraturerules.hh>
 
 #include <dumux/common/properties.hh>
-#include <dumux/common/geometry/distance.hh>
-#include <dumux/common/geometry/intersectingentities.hh>
+#include <dumux/geometry/distance.hh>
+#include <dumux/geometry/intersectingentities.hh>
 #include <dumux/discretization/method.hh>
 #include <dumux/multidomain/couplingmanager.hh>
 #include <dumux/multidomain/glue.hh>

dumux/multidomain/glue.hh

@@ -26,9 +26,9 @@
 #ifndef DUMUX_MULTIDOMAIN_GLUE_HH
 #define DUMUX_MULTIDOMAIN_GLUE_HH
 
-#include <dumux/common/geometry/geometricentityset.hh>
-#include <dumux/common/geometry/boundingboxtree.hh>
-#include <dumux/common/geometry/intersectionentityset.hh>
+#include <dumux/geometry/geometricentityset.hh>
+#include <dumux/geometry/boundingboxtree.hh>
+#include <dumux/geometry/intersectionentityset.hh>
 
 namespace Dumux {
 

test/geometry/boundingboxtree/test_bboxtree.cc

@@ -16,10 +16,10 @@
 #endif
 
 #include <dumux/common/exceptions.hh>
-#include <dumux/common/geometry/boundingboxtree.hh>
-#include <dumux/common/geometry/geometricentityset.hh>
-#include <dumux/common/geometry/intersectingentities.hh>
-#include "../writetriangulation.hh"
+#include <dumux/geometry/boundingboxtree.hh>
+#include <dumux/geometry/geometricentityset.hh>
+#include <dumux/geometry/intersectingentities.hh>
+#include <test/geometry/writetriangulation.hh>
 
 namespace Dumux {
 

test/geometry/boundingboxtree/test_geometry_fracture.cc

@@ -14,10 +14,10 @@
 #include <dune/foamgrid/dgffoam.hh>
 
 #include <dumux/common/exceptions.hh>
-#include <dumux/common/geometry/boundingboxtree.hh>
-#include <dumux/common/geometry/geometricentityset.hh>
-#include <dumux/common/geometry/intersectingentities.hh>
-#include <test/common/geometry/writetriangulation.hh>
+#include <dumux/geometry/boundingboxtree.hh>
+#include <dumux/geometry/geometricentityset.hh>
+#include <dumux/geometry/intersectingentities.hh>
+#include <test/geometry/writetriangulation.hh>
 
 int main (int argc, char *argv[]) try
 {

test/geometry/test_0d1d_intersection.cc

@@ -8,7 +8,7 @@
 #include <dune/common/parallel/mpihelper.hh>
 #include <dune/common/fvector.hh>
 
-#include <dumux/common/geometry/intersectspointgeometry.hh>
+#include <dumux/geometry/intersectspointgeometry.hh>
 
 #ifndef DOXYGEN
 template<int dimworld = 3>

test/geometry/test_1d1d_intersection.cc

@@ -7,7 +7,7 @@
 #include <dune/common/parallel/mpihelper.hh>
 #include <dune/common/fvector.hh>
 
-#include <dumux/common/geometry/geometryintersection.hh>
+#include <dumux/geometry/geometryintersection.hh>
 
 #ifndef DOXYGEN
 template<int dimWorld>

test/geometry/test_1d2d_intersection.cc

@@ -10,7 +10,7 @@
 #include <dune/common/fvector.hh>
 #include <dune/geometry/multilineargeometry.hh>
 
-#include <dumux/common/geometry/geometryintersection.hh>
+#include <dumux/geometry/geometryintersection.hh>
 
 #ifndef DOXYGEN
 Dune::MultiLinearGeometry<double, 1, 2>

test/geometry/test_1d3d_intersection.cc

@@ -9,7 +9,7 @@
 #include <dune/common/fvector.hh>
 #include <dune/geometry/multilineargeometry.hh>
 
-#include <dumux/common/geometry/geometryintersection.hh>
+#include <dumux/geometry/geometryintersection.hh>
 
 
 #ifndef DOXYGEN

test/geometry/test_2d2d_intersection.cc

@@ -6,7 +6,7 @@
 #include <dune/common/fvector.hh>
 #include <dune/geometry/multilineargeometry.hh>
 
-#include <dumux/common/geometry/geometryintersection.hh>
+#include <dumux/geometry/geometryintersection.hh>
 
 #ifndef DOXYGEN
 template<int dimWorld>

test/geometry/test_2d3d_intersection.cc

@@ -10,8 +10,8 @@
 #include <dune/common/timer.hh>
 #include <dune/geometry/multilineargeometry.hh>
 
-#include <dumux/common/geometry/geometryintersection.hh>
-#include <dumux/common/geometry/triangulation.hh>
+#include <dumux/geometry/geometryintersection.hh>
+#include <dumux/geometry/triangulation.hh>
 #include "writetriangulation.hh"
 
 template<int dimworld = 3>

test/geometry/test_distance.cc

@@ -33,8 +33,8 @@
 #include <dune/geometry/affinegeometry.hh>
 #include <dune/geometry/multilineargeometry.hh>
 
-#include <dumux/common/geometry/distance.hh>
-#include <dumux/common/geometry/normal.hh>
+#include <dumux/geometry/distance.hh>
+#include <dumux/geometry/normal.hh>
 
 // helper function to make point geometry from field vector
 template<class Point, int dimWorld>

test/geometry/test_graham_convex_hull.cc

@@ -13,8 +13,8 @@
 #include <dune/common/timer.hh>
 
 #include <dumux/common/math.hh>
-#include <dumux/common/geometry/triangulation.hh>
-#include <dumux/common/geometry/grahamconvexhull.hh>
+#include <dumux/geometry/triangulation.hh>
+#include <dumux/geometry/grahamconvexhull.hh>
 
 #include "writetriangulation.hh"
 

test/geometry/test_intersectingentity_cartesiangrid.cc

@@ -5,8 +5,8 @@
 #include <dune/common/exceptions.hh>
 #include <dune/grid/yaspgrid.hh>
 
-#include <dumux/common/geometry/boundingboxtree.hh>
-#include <dumux/common/geometry/intersectingentities.hh>
+#include <dumux/geometry/boundingboxtree.hh>
+#include <dumux/geometry/intersectingentities.hh>
 
 template<int dimworld>
 void testIntersectingEntityCartesianGrid()

test/geometry/test_intersection.hh

@@ -22,7 +22,7 @@
 #ifndef DUMUX_TEST_INTERSECTION_HH
 #define DUMUX_TEST_INTERSECTION_HH
 
-#include <dumux/common/geometry/intersectspointgeometry.hh>
+#include <dumux/geometry/intersectspointgeometry.hh>
 
 namespace Dumux {