From da68d59ab6481e3e419f836622c730a954e619a2 Mon Sep 17 00:00:00 2001
From: eap <eap@opencascade.com>
Date: Fri, 16 Dec 2011 09:14:54 +0000
Subject: [PATCH] 0021347: [CEA 497] Visualisation into SMESH and VISU of
 hexagonal prism cells (MED_OCTA12) 0021380: EDF 1937 SMESH: Take into account
 QUAD9 and HEXA27

+  int NbBiQuadQuadrangles() const throw(SALOME_Exception);
+  int NbTriQuadraticHexas() const throw(SALOME_Exception);
+  int NbHexagonalPrisms() const throw(SALOME_Exception);
---
 src/SMESH/SMESH_Mesh.cxx | 36 ++++++++++++++++++++++++++++++++++++
 src/SMESH/SMESH_Mesh.hxx |  6 ++++++
 2 files changed, 42 insertions(+)

diff --git a/src/SMESH/SMESH_Mesh.cxx b/src/SMESH/SMESH_Mesh.cxx
index c750600c4..af627a594 100644
--- a/src/SMESH/SMESH_Mesh.cxx
+++ b/src/SMESH/SMESH_Mesh.cxx
@@ -1387,6 +1387,18 @@ int SMESH_Mesh::NbQuadrangles(SMDSAbs_ElementOrder order) const throw(SALOME_Exc
   return _myMeshDS->GetMeshInfo().NbQuadrangles(order);
 }
 
+//================================================================================
+/*!
+ * \brief Return number of biquadratic quadrangles in the mesh
+ */
+//================================================================================
+
+int SMESH_Mesh::NbBiQuadQuadrangles() const throw(SALOME_Exception)
+{
+  Unexpect aCatch(SalomeException);
+  return _myMeshDS->GetMeshInfo().NbBiQuadQuadrangles();
+}
+
 //================================================================================
 /*!
  * \brief Return the number of polygonal faces in the mesh
@@ -1435,6 +1447,18 @@ int SMESH_Mesh::NbHexas(SMDSAbs_ElementOrder order) const throw(SALOME_Exception
   return _myMeshDS->GetMeshInfo().NbHexas(order);
 }
 
+//================================================================================
+/*!
+ * \brief  Return number of triquadratic hexahedrons in the mesh
+ */
+//================================================================================
+
+int SMESH_Mesh::NbTriQuadraticHexas() const throw(SALOME_Exception)
+{
+  Unexpect aCatch(SalomeException);
+  return _myMeshDS->GetMeshInfo().NbTriQuadHexas();
+}
+
 //================================================================================
 /*!
  * \brief  Return number of pyramids of given order in the mesh
@@ -1459,6 +1483,18 @@ int SMESH_Mesh::NbPrisms(SMDSAbs_ElementOrder order) const throw(SALOME_Exceptio
   return _myMeshDS->GetMeshInfo().NbPrisms(order);
 }
 
+//================================================================================
+/*!
+ * \brief  Return number of hexagonal prisms in the mesh
+ */
+//================================================================================
+
+int SMESH_Mesh::NbHexagonalPrisms() const throw(SALOME_Exception)
+{
+  Unexpect aCatch(SalomeException);
+  return _myMeshDS->GetMeshInfo().NbHexPrisms();
+}
+
 //================================================================================
 /*!
  * \brief  Return number of polyhedrons in the mesh
diff --git a/src/SMESH/SMESH_Mesh.hxx b/src/SMESH/SMESH_Mesh.hxx
index 41a2832ec..fc607868f 100644
--- a/src/SMESH/SMESH_Mesh.hxx
+++ b/src/SMESH/SMESH_Mesh.hxx
@@ -252,6 +252,8 @@ public:
   
   int NbQuadrangles(SMDSAbs_ElementOrder order = ORDER_ANY) const throw(SALOME_Exception);
 
+  int NbBiQuadQuadrangles() const throw(SALOME_Exception);
+  
   int NbPolygons() const throw(SALOME_Exception);
   
   int NbVolumes(SMDSAbs_ElementOrder order = ORDER_ANY) const throw(SALOME_Exception);
@@ -260,10 +262,14 @@ public:
   
   int NbHexas(SMDSAbs_ElementOrder order = ORDER_ANY) const throw(SALOME_Exception);
   
+  int NbTriQuadraticHexas() const throw(SALOME_Exception);
+  
   int NbPyramids(SMDSAbs_ElementOrder order = ORDER_ANY) const throw(SALOME_Exception);
 
   int NbPrisms(SMDSAbs_ElementOrder order = ORDER_ANY) const throw(SALOME_Exception);
   
+  int NbHexagonalPrisms() const throw(SALOME_Exception);
+  
   int NbPolyhedrons() const throw(SALOME_Exception);
   
   int NbSubMesh() const throw(SALOME_Exception);