subIndexes test

dune/alugrid/3d/entity_imp.cc

@@ -195,12 +195,12 @@ namespace Dune {
 
   //********* begin method subIndex ********************
   // partial specialisation of subIndex 
-  template <int dim, class IMPLElemType, ALU3dGridElementType type, int codim> 
+  template <int dim, class IMPLElemType, ALU3dGridElementType type, class Comm, int codim> 
   struct IndexWrapper {};
 
   // specialisation for vertices
-  template <int dim, class IMPLElemType, ALU3dGridElementType type> 
-  struct IndexWrapper<dim, IMPLElemType, type, 3>
+  template <int dim, class IMPLElemType, ALU3dGridElementType type, class Comm> 
+  struct IndexWrapper<dim, IMPLElemType, type, Comm, 3>
   {
     typedef ElementTopologyMapping<type> ElemTopo;
 
@@ -211,20 +211,20 @@ namespace Dune {
   };
 
   // specialisation for faces
-  template <int dim, class IMPLElemType, ALU3dGridElementType type> 
-  struct IndexWrapper<dim, IMPLElemType, type , 1>
+  template <int dim, class IMPLElemType, ALU3dGridElementType type, class Comm> 
+  struct IndexWrapper<dim, IMPLElemType, type , Comm, 1>
   {
     static int subIndex(const IMPLElemType &elem, int i)
     {
       // is specialised for each element type and uses 
       // the dune2aluFace mapping and also specialised for dim 2
-      return (getFace(elem,i))->getIndex();
+      return (ALU3dGridFaceGetter< Comm >::getFace(elem,i))->getIndex();
     }
   };
 
   // specialisation for edges 
-  template <int dim, class IMPLElemType, ALU3dGridElementType type> 
-  struct IndexWrapper<dim, IMPLElemType, type, 2>
+  template <int dim, class IMPLElemType, ALU3dGridElementType type, class Comm> 
+  struct IndexWrapper<dim, IMPLElemType, type, Comm, 2>
   {
     typedef ElementTopologyMapping<type> ElemTopo;
     
@@ -256,8 +256,8 @@ namespace Dune {
   };
 
   // specialisation for elements
-  template <int dim, class IMPLElemType, ALU3dGridElementType type> 
-  struct IndexWrapper<dim, IMPLElemType, type, 0>
+  template <int dim, class IMPLElemType, ALU3dGridElementType type, class Comm> 
+  struct IndexWrapper<dim, IMPLElemType, type, Comm, 0>
   {
     static int subIndex(const IMPLElemType &elem, int i) {
       // just return the elements index 
@@ -271,7 +271,7 @@ namespace Dune {
   {
     alugrid_assert (item_ != 0);
     typedef typename  ImplTraits::IMPLElementType IMPLElType;
-    return IndexWrapper<GridImp::dimension, IMPLElType,GridImp::elementType,cc>::subIndex ( *item_, i);
+    return IndexWrapper<GridImp::dimension, IMPLElType,GridImp::elementType, typename GridImp::MPICommunicatorType, cc>::subIndex ( *item_, i);
   }
 
   template<int dim, class GridImp>

dune/alugrid/test/test-entities.cc

@@ -128,24 +128,29 @@ void checkEntity( HElemType* item )
   entity.setElement( elem );
 
   checkGeometry( entity.geometry() );
-  printGeometry( entity.geometry() );
-
+ // printGeometry( entity.geometry() );
+/*
   const int faces = entity.subEntities( 1 );
   for( int i=0; i<faces; ++i ) 
     {
-      std::cout << "Face: " << i << std::endl;
+      std::cout << "SubFace: " << i << std::endl;
       checkGeometry( entity.template subEntity<1>( i )->geometry() ); 
       printGeometry( entity.template subEntity<1>( i )->geometry() );
+      std::cout << "face index: " << entity.template getSubIndex<1>( i ) << std::endl;
+      //std::cout << "face index: " << entity.subIndex( i, 1) << std::endl; 
     }
+   */
     
   const int vertices = entity.subEntities( 2 );
   for( int i=0; i<vertices; ++i ) 
     {
-      std::cout << "Vertex: " << i << std::endl;
+      std::cout << "SubVertex: " << i << std::endl;
       checkGeometry( entity.template subEntity<2>( i )->geometry() ); 
       printGeometry( entity.template subEntity<2>( i )->geometry() ); 
+      std::cout << "vertex index: " << entity.template getSubIndex<2>( i ) << std::endl;
+      //std::cout << "vertex index: " << entity.subIndex( i, 2) << std::endl; 
     }
-
+   
 }
 
 template <class Gitter>