22473: EDF 2825 SMESH: Memory allocation problem with ViscousLayer2D

[modules/smesh.git] / src / SMESH / SMESH_MeshEditor.hxx

diff --git a/src/SMESH/SMESH_MeshEditor.hxx b/src/SMESH/SMESH_MeshEditor.hxx
index a042e4bcc19e7f176e5c41159fab43ea57075ca2..8380cc900323d7674d40cb3631fbf32ecb7862a8 100644 (file)
--- a/src/SMESH/SMESH_MeshEditor.hxx
+++ b/src/SMESH/SMESH_MeshEditor.hxx
@@ -137,7 +137,6 @@ public:
   bool TriToQuad (TIDSortedElemSet &                   theElems,
                   SMESH::Controls::NumericalFunctorPtr theCriterion,
                   const double                         theMaxAngle);
-
   /*!
    * \brief Split quadrangles into triangles.
    * \param theElems     - The faces to be splitted.
@@ -146,7 +145,6 @@ public:
    */
   bool QuadToTri (TIDSortedElemSet &                   theElems,
                   SMESH::Controls::NumericalFunctorPtr theCriterion);
-
   /*!
    * \brief Split quadrangles into triangles.
    * \param theElems  - The faces to be splitted.
@@ -155,6 +153,11 @@ public:
    */
   bool QuadToTri (TIDSortedElemSet & theElems,
                   const bool         the13Diag);
+  /*!
+   * \brief Split each of given quadrangles into 4 triangles.
+   * \param theElems - The faces to be splitted. If empty all faces are split.
+   */
+  void QuadTo4Tri (TIDSortedElemSet & theElems);
 
   /*!
    * \brief Find better diagonal for splitting.
@@ -166,11 +169,32 @@ public:
                  SMESH::Controls::NumericalFunctorPtr theCriterion);
 
 
-  enum SplitVolumToTetraFlags { HEXA_TO_5 = 1, HEXA_TO_6 = 2, HEXA_TO_24 = 3 };//!<arg of SplitVolumesIntoTetra()
+  typedef std::map < const SMDS_MeshElement*, int, TIDCompare > TFacetOfElem;
+
+    //!<2nd arg of SplitVolumes()
+  enum SplitVolumToTetraFlags { HEXA_TO_5 = 1, // split into tetrahedra
+                                HEXA_TO_6,
+                                HEXA_TO_24,
+                                HEXA_TO_2_PRISMS, // split into prisms
+                                HEXA_TO_4_PRISMS };
   /*!
-   * \brief Split volumic elements into tetrahedra.
+   * \brief Split volumic elements into tetrahedra or prisms.
+   *        If facet ID < 0, element is split into tetrahedra,
+   *        else a hexahedron is split into prisms so that the given facet is
+   *        split into triangles
    */
-  void SplitVolumesIntoTetra (const TIDSortedElemSet & theElems, const int theMethodFlags);
+  void SplitVolumes (const TFacetOfElem & theElems, const int theMethodFlags);
+
+  /*!
+   * \brief For hexahedra that will be split into prisms, finds facets to
+   *        split into triangles 
+   *  \param [in,out] theHexas - the hexahedra
+   *  \param [in]     theFacetNormal - facet normal
+   *  \param [out]    theFacets - the hexahedra and found facet IDs
+   */
+  void GetHexaFacetsToSplit( TIDSortedElemSet& theHexas,
+                             const gp_Ax1&     theFacetNormal,
+                             TFacetOfElem &    theFacets);
 
 
   enum SmoothMethod { LAPLACIAN = 0, CENTROIDAL };
@@ -190,6 +214,13 @@ public:
   // If the2D, smoothing is performed using UV parameters of nodes
   // on geometrical faces
 
+  typedef TIDTypeCompare TElemSort;
+  typedef std::map < const SMDS_MeshElement*,
+    std::list<const SMDS_MeshElement*>, TElemSort >                        TTElemOfElemListMap;
+  typedef std::map<const SMDS_MeshNode*, std::list<const SMDS_MeshNode*> > TNodeOfNodeListMap;
+  typedef TNodeOfNodeListMap::iterator                                     TNodeOfNodeListMapItr;
+  typedef std::vector<TNodeOfNodeListMapItr>                               TVecOfNnlmiMap;
+  typedef std::map<const SMDS_MeshElement*, TVecOfNnlmiMap, TElemSort >    TElemOfVecOfNnlmiMap;
   typedef std::auto_ptr< std::list<int> > PGroupIDs;
 
   PGroupIDs RotationSweep (TIDSortedElemSet & theElements,
@@ -243,13 +274,13 @@ public:
    * @param theTolerance - uses for comparing locations of nodes if flag
    *   EXTRUSION_FLAG_SEW is set
    */
-  PGroupIDs ExtrusionSweep (TIDSortedElemSet &  theElems,
-                            const gp_Vec&       theStep,
-                            const int           theNbSteps,
-                            TElemOfElemListMap& newElemsMap,
-                            const bool          theMakeGroups,
-                            const int           theFlags = EXTRUSION_FLAG_BOUNDARY,
-                            const double        theTolerance = 1.e-6);
+  PGroupIDs ExtrusionSweep (TIDSortedElemSet &   theElems,
+                            const gp_Vec&        theStep,
+                            const int            theNbSteps,
+                            TTElemOfElemListMap& newElemsMap,
+                            const bool           theMakeGroups,
+                            const int            theFlags = EXTRUSION_FLAG_BOUNDARY,
+                            const double         theTolerance = 1.e-6);
   
   /*!
    * Generate new elements by extrusion of theElements
@@ -261,12 +292,12 @@ public:
    *   EXTRUSION_FLAG_SEW is set
    * @param theParams - special structure for manage of extrusion
    */
-  PGroupIDs ExtrusionSweep (TIDSortedElemSet &  theElems,
-                            ExtrusParam&        theParams,
-                            TElemOfElemListMap& newElemsMap,
-                            const bool          theMakeGroups,
-                            const int           theFlags,
-                            const double        theTolerance);
+  PGroupIDs ExtrusionSweep (TIDSortedElemSet &   theElems,
+                            ExtrusParam&         theParams,
+                            TTElemOfElemListMap& newElemsMap,
+                            const bool           theMakeGroups,
+                            const int            theFlags,
+                            const double         theTolerance);
 
 
   // Generate new elements by extrusion of theElements 
@@ -501,6 +532,8 @@ public:
   // Return an index of the shape theElem is on
   // or zero if a shape not found
 
+  void DoubleElements( const TIDSortedElemSet& theElements );
+
   bool DoubleNodes( const std::list< int >& theListOfNodes, 
                     const std::list< int >& theListOfModifiedElems );
   
@@ -576,13 +609,6 @@ public:
                            const SMESH_SequenceOfElemPtr& elemGens,
                            const std::string&             postfix,
                            SMESH_Mesh*                    targetMesh=0);
-
-
-  typedef std::map<const SMDS_MeshNode*, std::list<const SMDS_MeshNode*> > TNodeOfNodeListMap;
-  typedef TNodeOfNodeListMap::iterator                                     TNodeOfNodeListMapItr;
-  typedef std::vector<TNodeOfNodeListMapItr>                               TVecOfNnlmiMap;
-  typedef std::map<const SMDS_MeshElement*, TVecOfNnlmiMap, TIDCompare >   TElemOfVecOfNnlmiMap;
-
   /*!
    * \brief Create elements by sweeping an element
    * \param elem - element to sweep
@@ -607,7 +633,7 @@ public:
    * \param srcElements - to append elem for each generated element
    */
   void makeWalls (TNodeOfNodeListMap &     mapNewNodes,
-                  TElemOfElemListMap &     newElemsMap,
+                  TTElemOfElemListMap &    newElemsMap,
                   TElemOfVecOfNnlmiMap &   elemNewNodesMap,
                   TIDSortedElemSet&        elemSet,
                   const int                nbSteps,