Merge branch 'paramerge' of...

Merge branch 'paramerge' of https://users.dune-project.org/repositories/projects/dune-alugrid into paramerge

dune/alugrid/test/test-entities.cc

@@ -117,7 +117,9 @@ void checkEntity( HElemType* item )
   // checkGeom< Grid >( item );
 
   typedef Dune :: ALU3dGridEntity< 0, Grid::dimension, const Grid > EntityImpl;
-  typedef typename EntityImpl :: IMPLElementType  IMPLElementType ;
+  typedef Dune :: ALU3dImplTraits< Grid::elementType, typename Grid::MPICommunicatorType > ImplTraits;
+  typedef typename ImplTraits::IMPLElementType    IMPLElementType;
+
   const IMPLElementType& elem = *(dynamic_cast<IMPLElementType *> (item));
   Dune::ALUGridNoComm comm;
 
@@ -126,7 +128,7 @@ void checkEntity( HElemType* item )
 
   const int dim = Grid::dimension;
 
-  EntityImpl entity( grid.factory(), item->level() );
+  EntityImpl entity;
   entity.setElement( elem );
 
   checkGeometry( entity.geometry() );

dune/alugrid/test/test-geometries.cc

@@ -72,7 +72,7 @@ void checkGeom( HElemType* item )
     typedef Dune :: ALU3dGridGeometry< Grid::dimension-1, Grid::dimensionworld, const Grid > FaceGeometry;
     FaceGeometry faceGeom;
     const GEOFaceType* face = elem.myhface( i );
-    faceGeom.buildGeom( *face, elem.twist( i ), i );
+    faceGeom.buildGeom( *face, elem.twist( i ) );
     std::cout << "FACE: " << i << std::endl;
     // perform geometry check
     checkGeometry( faceGeom );
@@ -89,7 +89,7 @@ void checkGeom( HElemType* item )
       typedef Dune :: ALU3dGridGeometry< Grid::dimension-2, Grid::dimensionworld, const Grid > EdgeGeometry;
       EdgeGeometry edgeGeom;
       const GEOEdgeType* edge = elem.myhedge( i );
-      edgeGeom.buildGeom( *edge, elem.twist( i ), i );
+      edgeGeom.buildGeom( *edge, elem.twist( i ) );
       // perform geometry check
       checkGeometry( edgeGeom );
       edgeGeom.print( std::cout );
@@ -102,7 +102,7 @@ void checkGeom( HElemType* item )
     typedef Dune :: ALU3dGridGeometry< 0, Grid::dimensionworld, const Grid > PointGeometry;
     PointGeometry point ;
     const GEOVertexType* vertex = static_cast<const GEOVertexType*> (elem.myvertex( i ));
-    point.buildGeom( *vertex,0,0 );
+    point.buildGeom( *vertex, 0 );
     // perform geometry check
     checkGeometry( point );
     point.print( std::cout );