[bugfix][spheregrid] make SphereGrid compile again.

dune/grid/spheregrid/grid.hh

@@ -703,13 +703,11 @@ namespace Dune
     /** \} */
 
   public:
-    using Base::getRealImplementation;
-
     template< int codim >
     static const typename HostGrid::template Codim< codim >::Entity &
     getHostEntity( const typename Codim< codim >::Entity &entity )
     {
-      return getRealImplementation( entity ).hostEntity();
+      return entity.impl().hostEntity();
     }
 
   protected:

dune/grid/spheregrid/gridview.hh

@@ -165,13 +165,13 @@ namespace Dune
     IntersectionIterator ibegin ( const typename Codim< 0 >::Entity &entity ) const
     {
       typedef typename Traits::IntersectionIteratorImpl IntersectionIteratorImpl;
-      return IntersectionIteratorImpl( hostGridView().ibegin( Grid::getRealImplementation( entity ).hostEntity() ), mapToSphere() );
+      return IntersectionIteratorImpl( hostGridView().ibegin( entity.impl().hostEntity() ), mapToSphere() );
     }
 
     IntersectionIterator iend ( const typename Codim< 0 >::Entity &entity ) const
     {
       typedef typename Traits::IntersectionIteratorImpl IntersectionIteratorImpl;
-      return IntersectionIteratorImpl( hostGridView().iend( Grid::getRealImplementation( entity ).hostEntity() ), mapToSphere() );
+      return IntersectionIteratorImpl( hostGridView().iend( entity.impl().hostEntity() ), mapToSphere() );
     }
 
     const CollectiveCommunication &comm () const

dune/grid/spheregrid/hostgridaccess.hh

@@ -87,14 +87,14 @@ namespace Dune
     static const typename Codim< codim >::HostEntity &
     hostEntity ( const typename Codim< codim >::Entity &entity )
     {
-      return Grid::getRealImplementation( entity ).hostEntity();
+      return entity.impl().hostEntity();
     }
 
     template< class HostIntersection >
     static const HostIntersection &
     hostIntersection ( const Intersection< const Grid, SphereGridIntersection< const Grid, HostIntersection > > &intersection )
     {
-      return Grid::getRealImplementation( intersection ).hostIntersection();
+      return intersection.impl().hostIntersection();
     }
   };
 

dune/grid/spheregrid/intersection.hh

@@ -101,8 +101,7 @@ namespace Dune
     FieldVector< ctype, dimensionworld >
     integrationOuterNormal ( const FieldVector< ctype, dimension-1 > &local ) const
     {
-      const ReferenceElement< ctype, dimension > &refElement
-        = ReferenceElements< ctype, dimension >::simplex();
+      const auto& refElement = ReferenceElements< ctype, dimension >::simplex();
       const FieldVector< ctype, dimension > &refNormal = refElement.integrationOuterNormal( indexInInside() );
 
       const FieldVector< ctype, dimension > x( geometryInInside().global( local ) );
@@ -117,8 +116,7 @@ namespace Dune
     FieldVector< ctype, dimensionworld >
     outerNormal ( const FieldVector< ctype, dimension-1 > &local ) const
     {
-      const ReferenceElement< ctype, dimension > &refElement
-        = ReferenceElements< ctype, dimension >::simplex();
+      const auto& refElement = ReferenceElements< ctype, dimension >::simplex();
       const FieldVector< ctype, dimension > &refNormal = refElement.integrationOuterNormal( indexInInside() );
 
       const FieldVector< ctype, dimension > x( geometryInInside().global( local ) );

dune/grid/spheregrid/twistutility.hh

@@ -39,14 +39,14 @@ namespace Dune
       static int twistInSelf ( const GridType &grid, const Intersection &it )
       {
         return HostTwistUtilityType::twistInSelf( grid.hostGrid(),
-            GridType::getRealImplementation( it ).hostIntersection() );
+                  it.impl().hostIntersection() );
       }
 
       template< class Intersection >
       static int twistInNeighbor ( const GridType &grid, const Intersection &it )
       {
         return HostTwistUtilityType::twistInNeighbor( grid.hostGrid(),
-            GridType::getRealImplementation( it ).hostIntersection() );
+                  it.impl().hostIntersection() );
       }
 
       template< class Intersection >
@@ -54,8 +54,7 @@ namespace Dune
       elementGeometry ( const Intersection &intersection, const bool inside)
       {
         return HostTwistUtilityType::elementGeometry(
-            GridType::getRealImplementation( intersection ).hostIntersection(),
-            inside );
+                  intersection.impl().hostIntersection(), inside );
       }
     };
 

dune/grid/test/CMakeLists.txt

 set(GRIDTYPE YASPGRID)
 set(GRIDDIM  3)
-set(WORLDDIM  ${GRIDDIM})
+set(WORLDDIM ${GRIDDIM})
 
 set(METAGRIDS  idgrid)
 # set(METAGRIDS  idgrid,idgrid,idgrid)
 
-set(TESTS  test-cacheitgrid  test-cartesiangrid  test-filteredgrid  test-idgrid  test-metagrids test-parallelgrid test-spheregrid test-sfc test-prismgrid)
+set(TESTS  test-cacheitgrid  test-cartesiangrid  test-filteredgrid  test-idgrid  test-metagrids test-parallelgrid test-sfc test-prismgrid)
 
 foreach(_executable ${TESTS})
   dune_add_test(NAME ${_executable} SOURCES ${_executable}.cc)
@@ -16,5 +16,8 @@ foreach(_executable ${TESTS})
   # dune_target_enable_all_packages( ${_executable} )
 endforeach(_executable ${TESTS})
 
+dune_add_test(NAME test-spheregrid SOURCES test-spheregrid.cc CMAKE_GUARD dune-alugrid_FOUND)
+set_property(TARGET test-spheregrid APPEND PROPERTY COMPILE_DEFINITIONS "GRIDDIM=2" "WORLDDIM=3" "ALUGRID_CUBE")
+
 #add_directory_test_target(test_target)
 # add_dependencies(${test_target} ${TESTS})