merged from master.

dune/alugrid/common/intersectioniteratorwrapper.hh

@@ -49,6 +49,9 @@ public:
   //! type of normal vector
   typedef FieldVector<ctype , dimworld> NormalType;
 
+  typedef typename IntersectionIteratorImpl::Twists Twists;
+  typedef typename Twists::Twist Twist;
+
   //! constructor called from the ibegin and iend method
   template <class EntityImp>
   IntersectionIteratorWrapper(const EntityImp & en, int wLevel , bool end)
@@ -154,16 +157,10 @@ public:
   }
 
   //! twist of the face seen from the inner element
-  int twistInSelf() const { return it().twistInSelf(); }
-
-  //! twist of the face seen from the inner element
-  int twistInInside() const { return it().twistInInside(); }
-
-  //! twist of the face seen from the outer element
-  int twistInNeighbor() const { return it().twistInNeighbor(); }
+  Twist twistInInside() const { return it().twistInInside(); }
 
   //! twist of the face seen from the outer element
-  int twistInOutside() const { return it().twistInOutside(); }
+  Twist twistInOutside() const { return it().twistInOutside(); }
 
   //! return unit outer normal, this should be dependent on local
   //! coordinates for higher order boundary

dune/alugrid/common/persistentcontainer.hh

@@ -52,31 +52,11 @@ namespace Dune
     {}
   };
 
-#if 0
-  template< int dim, int dimworld, ALU2DSPACE ElementType elType, class T >
-  class PersistentContainer< ALU2dGrid< dim, dimworld, elType >, T >
-  : public ALUGridPersistentContainer< ALU2dGrid< dim, dimworld, elType >, T >
+  template< int dim, int dimworld, ALU3dGridElementType elType, class Comm, class T >
+  class PersistentContainer< ALU3dGrid< dim, dimworld, elType, Comm >, T >
+  : public ALUGridPersistentContainer< ALU3dGrid< dim, dimworld, elType, Comm >, T >
   {
-    typedef ALUGridPersistentContainer< ALU2dGrid< dim, dimworld, elType >, T > Base;
-
-  public:
-    typedef typename Base::Grid Grid;
-    typedef typename Base::Value Value;
-
-    /** \brief \deprecated typedef of class Grid */
-    typedef typename Base::Grid GridType;
-
-    PersistentContainer ( const Grid &grid, int codim, const Value &value = Value() )
-    : Base( grid, codim, value )
-    {}
-  };
-#endif  //if 0
-
-  template< int actualDim, int actualDimw, ALU3dGridElementType elType, class Comm, class T >
-  class PersistentContainer< ALU3dGrid< actualDim, actualDimw, elType, Comm >, T >
-  : public ALUGridPersistentContainer< ALU3dGrid< actualDim, actualDimw, elType, Comm >, T >
-  {
-    typedef ALUGridPersistentContainer< ALU3dGrid< actualDim, actualDimw, elType, Comm >, T > Base;
+    typedef ALUGridPersistentContainer< ALU3dGrid< dim, dimworld, elType, Comm >, T > Base;
 
   public:
     typedef typename Base::Grid Grid;

dune/alugrid/common/structuredgridfactory.hh

@@ -289,7 +289,7 @@ namespace Dune
     template <int codim, class Entity>
     int subEntities ( const Entity& entity ) const
     {
-#if DUNE_VERSION_NEWER_REV(DUNE_GRID,3,0,0)
+#if DUNE_VERSION_NEWER_REV(DUNE_GRID,2,4,0)
       return entity.subEntities( codim );
 #else
       return entity.template count< codim > ();