merge with V5_1_main

diff --git a/src/SMDS/SMDSAbs_ElementType.hxx b/src/SMDS/SMDSAbs_ElementType.hxx
index 314c7895e3fb8a399eee23c6b64f0d057e85e9d3..1ffad0d92820e3087bb54c534c382cc518de4661 100644 (file)
--- a/src/SMDS/SMDSAbs_ElementType.hxx
+++ b/src/SMDS/SMDSAbs_ElementType.hxx
@@ -22,7 +22,7 @@
 //  SMESH SMDS : implementaion of Salome mesh data structure
 //  File   : SMDSAbs_ElementType.hxx
 //  Module : SMESH
-//
+
 #ifndef _SMDSAbs_ElementType_HeaderFile
 #define _SMDSAbs_ElementType_HeaderFile
 
@@ -30,14 +30,35 @@
 /// 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_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_HEXA,
+    SMDSGeom_PENTA,
+    SMDSGeom_POLYHEDRA,
+  };
+
 
 enum SMDSAbs_ElementOrder {
   ORDER_ANY,          /*! entities of any order */
@@ -45,4 +66,32 @@ 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_Quadrangle,
+  SMDSEntity_Quad_Quadrangle,
+  SMDSEntity_Polygon,
+  SMDSEntity_Quad_Polygon,
+  SMDSEntity_Tetra,
+  SMDSEntity_Quad_Tetra,
+  SMDSEntity_Pyramid,
+  SMDSEntity_Quad_Pyramid,
+  SMDSEntity_Hexa,
+  SMDSEntity_Quad_Hexa,
+  SMDSEntity_Penta,
+  SMDSEntity_Quad_Penta,
+  SMDSEntity_Polyhedra,
+  SMDSEntity_Quad_Polyhedra,
+  SMDSEntity_Last
+};
+
 #endif