removed deprecated use of globalIndex and changed to new geometry tpyes.

[[Imported from SVN: r3008]]

grid/alu3dgrid/entity_imp.cc

@@ -642,7 +642,7 @@ namespace Dune {
   {
     if(! item_->up() )
     {
-      std::cerr << "ALU3dGridEntity<0," << dim << "," << dimworld << "> :: father() : no father of entity globalid = " << globalIndex() << "\n";
+      std::cerr << "ALU3dGridEntity<0," << dim << "," << dimworld << "> :: father() : no father of entity globalid = " << getIndex() << "\n";
       return ALU3dGridEntityPointer<0,GridImp> (grid_, static_cast<ALU3DSPACE HElementType &> (*item_));
     }
     return ALU3dGridEntityPointer<0,GridImp> (grid_, static_cast<ALU3DSPACE HElementType &> (*(item_->up())));

grid/alu3dgrid/geometry_imp.cc

@@ -241,43 +241,45 @@ namespace Dune {
     return true;
   }
 
+  /*
+     template <GeometryType eltype , int dim> struct ALU3dGridElType {
+     static inline GeometryType type () { return unknown; }
+     };
+     template <> struct ALU3dGridElType<tetrahedron,3> {
+     static inline GeometryType type () { return tetrahedron; }
+     };
+     template <> struct ALU3dGridElType<tetrahedron,2> {
+     static inline GeometryType type () { return triangle; }
+     };
+     template <GeometryType eltype> struct ALU3dGridElType<eltype,1> {
+     static inline GeometryType type () { return line; }
+     };
+     template <GeometryType eltype> struct ALU3dGridElType<eltype,0> {
+     static inline GeometryType type () { return vertex; }
+     };
+     template <> struct ALU3dGridElType<hexahedron,3> {
+     static inline GeometryType type () { return hexahedron; }
+     };
+     template <> struct ALU3dGridElType<hexahedron,2> {
+     static inline GeometryType type () { return quadrilateral; }
+     };
+   */
 
-  template <GeometryType eltype , int dim> struct ALU3dGridElType {
-    static inline GeometryType type () { return unknown; }
-  };
-  template <> struct ALU3dGridElType<tetrahedron,3> {
-    static inline GeometryType type () { return tetrahedron; }
-  };
-  template <> struct ALU3dGridElType<tetrahedron,2> {
-    static inline GeometryType type () { return triangle; }
-  };
-  template <GeometryType eltype> struct ALU3dGridElType<eltype,1> {
-    static inline GeometryType type () { return line; }
-  };
-  template <GeometryType eltype> struct ALU3dGridElType<eltype,0> {
-    static inline GeometryType type () { return vertex; }
-  };
-  template <> struct ALU3dGridElType<hexahedron,3> {
-    static inline GeometryType type () { return hexahedron; }
-  };
-  template <> struct ALU3dGridElType<hexahedron,2> {
-    static inline GeometryType type () { return quadrilateral; }
-  };
-
-
-  /* Comment in for adaptation to new GeometryType
-     template <int mydim, int cdim>
-     inline GeometryType
-     ALU3dGridGeometry<mydim,cdim,const ALU3dGrid<3, 3, tetra> > ::type () const {
-     return simplex;
-     }
 
-     template <int mydim, int cdim>
-     inline GeometryType
-     ALU3dGridGeometry<mydim,cdim,const ALU3dGrid<3, 3, hexa> > ::type () const {
-     return cube;
-     }
+  /* Comment in for adaptation to new GeometryType */
+  template <int mydim, int cdim>
+  inline GeometryType
+  ALU3dGridGeometry<mydim,cdim,const ALU3dGrid<3, 3, tetra> > ::type () const {
+    return simplex;
+  }
+
+  template <int mydim, int cdim>
+  inline GeometryType
+  ALU3dGridGeometry<mydim,cdim,const ALU3dGrid<3, 3, hexa> > ::type () const {
+    return cube;
+  }
 
+  /*
      template <>
      inline GeometryType
      ALU3dGridGeometry<0, 3, const ALU3dGrid<3, 3, tetra> > ::type () const {
@@ -291,11 +293,13 @@ namespace Dune {
      }
    */
 
-  template<int mydim, int cdim>
-  inline GeometryType ALU3dGridGeometry<mydim,cdim,const ALU3dGrid<3, 3, tetra> > ::type () const
-  {
-    return ALU3dGridElType<tetrahedron,mydim>::type();
-  }
+  /*
+     template<int mydim, int cdim>
+     inline GeometryType ALU3dGridGeometry<mydim,cdim,const ALU3dGrid<3, 3, tetra> > ::type () const
+     {
+     return ALU3dGridElType<tetrahedron,mydim>::type();
+     }
+   */
 
 
   template<int mydim, int cdim>
@@ -459,12 +463,13 @@ namespace Dune {
     delete biMap_;
   }
 
-
-  template<int mydim, int cdim>
-  inline GeometryType
-  ALU3dGridGeometry<mydim, cdim, const ALU3dGrid<3, 3, hexa> >::type() const {
-    return ALU3dGridElType<hexahedron, mydim>::type();
-  }
+  /*
+     template<int mydim, int cdim>
+     inline GeometryType
+     ALU3dGridGeometry<mydim, cdim, const ALU3dGrid<3, 3, hexa> >::type() const {
+     return ALU3dGridElType<hexahedron, mydim>::type();
+     }
+   */
 
 
   template <int mydim, int cdim>