[cleanup] remove EntityPointer.

dune/grid/cartesiangrid/grid.hh

@@ -8,7 +8,6 @@
 #include <dune/grid/common/grid.hh>
 
 #include <dune/grid/idgrid/adaptcallback.hh>
-#include <dune/grid/idgrid/entitypointer.hh>
 #include <dune/grid/idgrid/entityseed.hh>
 #include <dune/grid/idgrid/idset.hh>
 #include <dune/grid/idgrid/indexset.hh>
@@ -95,13 +94,8 @@ namespace Dune
         typedef CartesianGridEntity< codim, dimension, const Grid > EntityImpl;
         typedef Dune::Entity< codim, dimension, const Grid, CartesianGridEntity > Entity;
 
-#if DUNE_VERSION_NEWER(DUNE_GRID,3,0)
         typedef EntityImpl  EntityPointerImpl;
         typedef Entity      EntityPointer;
-#else
-        typedef IdGridEntityPointer< const Grid, typename HostGrid::template Codim< codim >::EntityPointer > EntityPointerImpl;
-        typedef Dune::EntityPointer< const Grid, EntityPointerImpl > EntityPointer;
-#endif
 
         typedef IdGridEntitySeed< codim, const Grid > EntitySeedImpl;
         typedef Dune::EntitySeed< const Grid, EntitySeedImpl > EntitySeed;
@@ -194,7 +188,6 @@ namespace Dune
       Base;
 
     template< int, int, class > friend class CartesianGridEntity;
-    template< class, class > friend class CartesianGridEntityPointer;
     template< class, class > friend class CartesianGridIntersection;
     template< class, class > friend class CartesianGridIntersectionIterator;
     template< class, class > friend class CartesianGridIdSet;
@@ -883,7 +876,7 @@ namespace Dune
       return LeafGridView( ViewImp( *this, hostGrid().leafGridView() ) );
     }
 
-    /** \brief obtain EntityPointer from EntitySeed. */
+    /** \brief obtain Entity from EntitySeed. */
     template< class EntitySeed >
     typename Traits::template Codim< EntitySeed::codimension >::Entity
     entity ( const EntitySeed &seed ) const
@@ -895,6 +888,7 @@ namespace Dune
     /** \} */
 
     typedef typename Traits :: ExtraData  ExtraData ;
+    //! return pointer to grid for access of interface classes to some grid information
     ExtraData extraData () const { return this; }
 
     /** \name Miscellaneous Methods

dune/grid/cartesiangrid/hostgridinfo/alugrid.hh

@@ -8,11 +8,6 @@
 #include <dune/alugrid/3d/topology.hh>
 #endif // #if HAVE_DUNE_ALUGRID
 
-#if HAVE_ALUGRID
-#include <dune/grid/alugrid/common/declaration.hh>
-#include <dune/grid/alugrid/3d/topology.hh>
-#endif // #if HAVE_ALUGRID
-
 namespace Dune
 {
 
@@ -178,7 +173,14 @@ namespace Dune
     template <class HostIntersection>
     static int insideLevel ( const HostIntersection &hostIntersection )
     {
-      assert( HostGrid::getRealIntersection( hostIntersection ).level() == hostIntersection.inside().level() );
+#ifndef NDEBUG
+      const int level = HostGrid::getRealIntersection( hostIntersection ).level();
+      const int insideLevel = hostIntersection.inside().level() ;
+      //assert( level == insideLevel );
+#endif
+      return HostGrid::getRealIntersection( hostIntersection ).level();
+      return hostIntersection.inside().level() ;
+      //assert( HostGrid::getRealIntersection( hostIntersection ).level() == hostIntersection.inside().level() );
       return HostGrid::getRealIntersection( hostIntersection ).level();
     }
 
@@ -231,22 +233,9 @@ namespace Dune
     }
   };
 
-
-
-  // CartesianGridHostGridInfo for ALUCubeGrid< 3, 3 >
-  // -------------------------------------------------
-
-#if HAVE_ALUGRID
-  template<>
-  struct CartesianGridHostGridInfo< ALUCubeGrid< 3, 3 > >
-  : public ALUGridHostGridInfo< ALUCubeGrid< 3, 3 >, 3 >
-  {};
-#endif // #if HAVE_ALUGRID
-
-
   // CartesianGridHostGridInfo for ALUGrid< 3, 3, cube, nonconforming, Comm >
   // -------------------------------------------------------------------------
-#if HAVE_ALUGRID || HAVE_DUNE_ALUGRID
+#if HAVE_DUNE_ALUGRID
   template< class Comm >
   struct CartesianGridHostGridInfo< ALUGrid< 3, 3, cube, nonconforming, Comm > >
   : public ALUGridHostGridInfo< ALUGrid< 3, 3, cube, nonconforming, Comm >, 3 >