Merge branch 'V9_6_BR'

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 214e61df56074d7b6c41ba88176ca35f52198e91..98b959e2daf1d92087ea12b67d75bfa5c301ef44 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -25,7 +25,7 @@ PROJECT(SalomeHYBRIDPLUGIN C CXX)
 STRING(TOUPPER ${PROJECT_NAME} PROJECT_NAME_UC)
 
 SET(${PROJECT_NAME_UC}_MAJOR_VERSION 9)
-SET(${PROJECT_NAME_UC}_MINOR_VERSION 5)
+SET(${PROJECT_NAME_UC}_MINOR_VERSION 6)
 SET(${PROJECT_NAME_UC}_PATCH_VERSION 0)
 SET(${PROJECT_NAME_UC}_VERSION
   ${${PROJECT_NAME_UC}_MAJOR_VERSION}.${${PROJECT_NAME_UC}_MINOR_VERSION}.${${PROJECT_NAME_UC}_PATCH_VERSION})

diff --git a/src/HYBRIDPlugin/MG_HYBRID_API.cxx b/src/HYBRIDPlugin/MG_HYBRID_API.cxx
index 248283f0a6eb8ae39c8ffbd3584158edbb295058..6ad3f0d65c75a37eb2c3c49dc5abb0e0ea3ab911 100644 (file)
--- a/src/HYBRIDPlugin/MG_HYBRID_API.cxx
+++ b/src/HYBRIDPlugin/MG_HYBRID_API.cxx
@@ -362,6 +362,27 @@ struct MG_HYBRID_API::LibData
     ++_count;
   }
 
+  void ReadPyramidNodes( int* node1, int* node2, int* node3, int* node4, int* node5, int* domain )
+  {
+    integer vtx[6];
+    status_t ret = mesh_get_pyramid_vertices( _hybrid_mesh, _count, vtx);
+    if (ret != STATUS_OK) MG_Error( "unable to get resulting pyramid" );
+
+    *node1 = vtx[0];
+    *node2 = vtx[1];
+    *node3 = vtx[2];
+    *node4 = vtx[3];
+    *node5 = vtx[4];
+
+    integer tag;
+    ret = mesh_get_pyramid_tag( _hybrid_mesh, _count, &tag );
+    if (ret != STATUS_OK) MG_Error( "unable to get resulting pyramid tag" );
+
+    *domain = tag;
+
+    ++_count;
+  }
+
   void ReadCorner( int* node )
   {
     if ( _count <= ReadNbCorners() )