removed obsolete GeometryTypes

[[Imported from SVN: r2383]]

grid/uggrid/uggridgeometry.cc

@@ -94,7 +94,7 @@ inline GeometryType UGGridGeometry<mydim,coorddim,GridImp>::type() const
   switch (mydim)
   {
   case 0 : return vertex;
-  case 1 : return line;
+  case 1 : return simplex;
   case 2 :
 #ifdef _2
     switch (UG_NS<coorddim>::Tag(target_)) {
@@ -127,7 +127,7 @@ inline GeometryType UGGridGeometry<mydim,coorddim,GridImp>::type() const
   }
 
   // Just to calm the compiler
-  return tetrahedron;
+  return simplex;
 }
 
 template< int mydim, int coorddim, class GridImp>
@@ -238,7 +238,7 @@ global(const FieldVector<typename GridImp::ctype, 2>& local) const
 
   FieldVector<UGCtype, 3> result;
 
-  if (elementType_ == triangle) {
+  if (elementType_ == simplex) {
 
     for (int i=0; i<3; i++)
       result[i] = (1.0-local[0]-local[1])*coord_[0][i]

grid/uggrid/uggridgeometry.hh

@@ -211,7 +211,7 @@ namespace Dune {
     GeometryType type () const {return elementType_;}
 
     //! return the number of corners of this element. Corners are numbered 0...n-1
-    int corners () const {return (elementType_==triangle) ? 3 : 4;}
+    int corners () const {return (elementType_==simplex) ? 3 : 4;}
 
     //! access to coordinates of corners. Index is the number of the corner
     const FieldVector<UGCtype, 3>& operator[] (int i) const {
@@ -249,7 +249,7 @@ namespace Dune {
 
     void setNumberOfCorners(int n) {
       assert(n==3 || n==4);
-      elementType_ = (n==3) ? triangle : quadrilateral;
+      elementType_ = (n==3) ? simplex : cube;
     }
 
     //! The element type, either triangle or quadrilateral
@@ -290,8 +290,9 @@ namespace Dune {
     UGGridGeometry()
     {}
 
-    /** Return the element type identifier.  This class always returns 'line' */
-    GeometryType type () const {return line;}
+    /** \brief Return the element type identifier.  This class always returns 'simplex',
+       because a one-dimensional simplex is a line.*/
+    GeometryType type () const {return simplex;}
 
     //! return the number of corners of this element. This class always returns 2
     int corners () const {return 2;}