[bugfix][tests] disable level intersection iterator for conforming

grids.

dune/grid/test/checkcalls.cc

@@ -53,6 +53,8 @@ void writeFile( const GridView& gridView )
 template <class GridType>
 void checkSerial(GridType & grid, int mxl = 2, const bool display = false)
 {
+  const bool skipLevelIntersection = ! EnableLevelIntersectionIteratorCheck< GridType > :: v ;
+
   // be careful, each global refine create 8 x maxlevel elements
   std::cout << "  CHECKING: Macro" << std::endl;
   gridcheck(grid);
@@ -65,7 +67,7 @@ void checkSerial(GridType & grid, int mxl = 2, const bool display = false)
     std::cout << "  CHECKING: Refined" << std::endl;
     gridcheck(grid);
     std::cout << "  CHECKING: intersections" << std::endl;
-    checkIntersectionIterator(grid);
+    checkIntersectionIterator(grid, skipLevelIntersection);
   }
 
   // check also non-conform grids
@@ -80,7 +82,7 @@ void checkSerial(GridType & grid, int mxl = 2, const bool display = false)
   checkGeometryInFather(grid);
   // check the intersection iterator and the geometries it returns
   std::cout << "  CHECKING: intersections" << std::endl;
-  checkIntersectionIterator(grid);
+  checkIntersectionIterator(grid, skipLevelIntersection);
 
   std::cout << std::endl << std::endl;
 }

dune/grid/test/test-spheregrid.cc

 #include <config.h>
 
+#define DISABLE_DEPRECATED_METHOD_CHECK 1
+
+
 #include <iostream>
 #include <sstream>
 #include <string>
@@ -9,6 +12,12 @@
 #include <dune/grid/spheregrid.hh>
 #include <dune/grid/io/file/dgfparser/dgfwriter.hh>
 
+#if HAVE_DUNE_ALUGRID
+// use overloaded test because intersection test fails for manifold
+// intersections, there is some discussion needed.
+#include <dune/alugrid/test/checkintersectionit.hh>
+#endif
+
 #include "checkcalls.cc"
 
 namespace Dune
@@ -25,12 +34,24 @@ struct EnableLevelIntersectionIteratorCheck< Dune::AlbertaGrid< dim, dimworld >
   static const bool v = false;
 };
 
+template< int dim, int dimworld >
+struct EnableLevelIntersectionIteratorCheck< Dune::ALUGrid< dim, dimworld, Dune::simplex, Dune::conforming > >
+{
+  static const bool v = false;
+};
+
 template< class HostGrid, class MapToSphere >
 struct EnableLevelIntersectionIteratorCheck< Dune::SphereGrid< HostGrid, MapToSphere > >
 {
   static const bool v = EnableLevelIntersectionIteratorCheck< HostGrid >::v;
 };
 
+template< class HostGrid, class MapToSphere >
+struct EnableLevelIntersectionIteratorCheck< const Dune::SphereGrid< HostGrid, MapToSphere > >
+{
+  static const bool v = EnableLevelIntersectionIteratorCheck< HostGrid >::v;
+};
+
 
 using namespace Dune;