Commit fa64d4fd authored by Ned Coltman's avatar Ned Coltman
Browse files

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

parent 16f186dd
......@@ -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>
......
......@@ -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>
......
......@@ -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 {
......
......@@ -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 {
......
......@@ -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 {
......
......@@ -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>
......
......@@ -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>
......
......@@ -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 {
......
......@@ -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 {
......
......@@ -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
{
......
......@@ -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>
......
......@@ -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>
......
......@@ -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>
......
......@@ -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
......
......@@ -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>
......
......@@ -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>
......
......@@ -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>
......
......@@ -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"
......
......@@ -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()
......
......@@ -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 {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment