X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSMDS%2FSMDSAbs_ElementType.hxx;h=3d49857599677292124b570ea528544ca3fa5e2c;hb=19d01592bac2322ac881aa4666466840c1804841;hp=a76772e3f05b483433ba6b233be2013dd2a0fd89;hpb=0635c9fc80f67d1e5dc0e94ec85f487286a92070;p=modules%2Fsmesh.git

diff --git a/src/SMDS/SMDSAbs_ElementType.hxx b/src/SMDS/SMDSAbs_ElementType.hxx
index a76772e3f..3d4985759 100644
--- a/src/SMDS/SMDSAbs_ElementType.hxx
+++ b/src/SMDS/SMDSAbs_ElementType.hxx
@@ -1,24 +1,25 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2013  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-//  This library is free software; you can redistribute it and/or
-//  modify it under the terms of the GNU Lesser General Public
-//  License as published by the Free Software Foundation; either
-//  version 2.1 of the License.
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
 //
-//  This library is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-//  Lesser General Public License for more details.
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
 //
-//  You should have received a copy of the GNU Lesser General Public
-//  License along with this library; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
-//  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  SMESH SMDS : implementaion of Salome mesh data structure
 //  File   : SMDSAbs_ElementType.hxx
 //  Module : SMESH
@@ -30,33 +31,40 @@
 /// Type (node, edge, face or volume) of elements
 ///////////////////////////////////////////////////////////////////////////////
 enum SMDSAbs_ElementType
-{
-	SMDSAbs_All,
-	SMDSAbs_Node,
-	SMDSAbs_Edge,
-	SMDSAbs_Face,
-	SMDSAbs_Volume,
-        SMDSAbs_NbElementTypes
-};
+  {
+    SMDSAbs_All,
+    SMDSAbs_Node,
+    SMDSAbs_Edge,
+    SMDSAbs_Face,
+    SMDSAbs_Volume,
+    SMDSAbs_0DElement,
+    SMDSAbs_Ball,
+    SMDSAbs_NbElementTypes
+  };
 
 /*! enumeration for element geometry type */
 enum SMDSAbs_GeometryType
-{
-  // 0D element
-  SMDSGeom_POINT,
-  // 1D element
-  SMDSGeom_EDGE,
-  // 2D element
-  SMDSGeom_TRIANGLE,
-  SMDSGeom_QUADRANGLE,
-  SMDSGeom_POLYGON,
-  // 3D element
-  SMDSGeom_TETRA,
-  SMDSGeom_PYRAMID,
-  SMDSGeom_PENTA,
-  SMDSGeom_HEXA,
-  SMDSGeom_POLYHEDRA,
-};
+  {
+    // 0D element
+    SMDSGeom_POINT,
+    // 1D element
+    SMDSGeom_EDGE,
+    // 2D element
+    SMDSGeom_TRIANGLE,
+    SMDSGeom_QUADRANGLE,
+    SMDSGeom_POLYGON,
+    // 3D element
+    SMDSGeom_TETRA,
+    SMDSGeom_PYRAMID,
+    SMDSGeom_HEXA,
+    SMDSGeom_PENTA,
+    SMDSGeom_HEXAGONAL_PRISM,
+    SMDSGeom_POLYHEDRA,
+    // Discrete elements
+    SMDSGeom_BALL,
+    //
+    SMDSGeom_NONE
+  };
 
 
 enum SMDSAbs_ElementOrder {
@@ -65,4 +73,37 @@ enum SMDSAbs_ElementOrder {
   ORDER_QUADRATIC     /*! entities of 2nd order */
 };
 
+/*!
+ * Enumeration of entity type uses in mesh info array,
+ *  and should be synchronised with enum in SMDS  
+ */
+enum SMDSAbs_EntityType {
+  SMDSEntity_Node,
+  SMDSEntity_0D,
+  SMDSEntity_Edge,
+  SMDSEntity_Quad_Edge,
+  SMDSEntity_Triangle,
+  SMDSEntity_Quad_Triangle,
+  SMDSEntity_BiQuad_Triangle,
+  SMDSEntity_Quadrangle,
+  SMDSEntity_Quad_Quadrangle,
+  SMDSEntity_BiQuad_Quadrangle,
+  SMDSEntity_Polygon,
+  SMDSEntity_Quad_Polygon,
+  SMDSEntity_Tetra,
+  SMDSEntity_Quad_Tetra,
+  SMDSEntity_Pyramid,
+  SMDSEntity_Quad_Pyramid,
+  SMDSEntity_Hexa,
+  SMDSEntity_Quad_Hexa,
+  SMDSEntity_TriQuad_Hexa,
+  SMDSEntity_Penta,
+  SMDSEntity_Quad_Penta,
+  SMDSEntity_Hexagonal_Prism,
+  SMDSEntity_Polyhedra,
+  SMDSEntity_Quad_Polyhedra,
+  SMDSEntity_Ball,
+  SMDSEntity_Last
+};
+
 #endif