From: eap <eap@opencascade.com>
Date: Tue, 19 May 2009 15:41:19 +0000 (+0000)
Subject: 0020279: [CEA 334] control the "random" use when using mesh algorithms
X-Git-Tag: V5_1_2rc1~23
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=c8e501d713b8ffd94e05015411434365c0d3765d;p=modules%2Fsmesh.git

0020279: [CEA 334] control the "random" use when using mesh algorithms
   sort faces by IDs
---

diff --git a/src/StdMeshers/StdMeshers_QuadToTriaAdaptor.hxx b/src/StdMeshers/StdMeshers_QuadToTriaAdaptor.hxx
index 1e2ed138f..89d747cbe 100644
--- a/src/StdMeshers/StdMeshers_QuadToTriaAdaptor.hxx
+++ b/src/StdMeshers/StdMeshers_QuadToTriaAdaptor.hxx
@@ -48,15 +48,15 @@ public:
 
   bool Compute(SMESH_Mesh& aMesh);
 
-  std::list<const SMDS_FaceOfNodes*> GetTriangles(const SMDS_MeshElement* aFace);
+  const std::list<const SMDS_FaceOfNodes*>* GetTriangles(const SMDS_MeshElement* aFace);
 
 protected:
 
   //bool CheckDegenerate(const SMDS_MeshElement* aFace);
 
   int Preparation(const SMDS_MeshElement* face,
-                  Handle(TColgp_HArray1OfPnt) PN,
-                  Handle(TColgp_HArray1OfVec) VN,
+                  Handle(TColgp_HArray1OfPnt)& PN,
+                  Handle(TColgp_HArray1OfVec)& VN,
                   std::vector<const SMDS_MeshNode*>& FNodes,
                   gp_Pnt& PC, gp_Vec& VNorm);
 
@@ -67,8 +67,10 @@ protected:
 
   bool Compute2ndPart(SMESH_Mesh& aMesh);
 
+  typedef std::map< const SMDS_MeshElement*, const SMDS_MeshElement*, TIDCompare > TF2PyramMap;
+
   std::map< const SMDS_MeshElement*, std::list<const SMDS_FaceOfNodes*> > myResMap;
-  std::map< const SMDS_MeshElement*, const SMDS_MeshElement* > myMapFPyram;
+  TF2PyramMap myMapFPyram;
   std::list< const SMDS_MeshNode* > myDegNodes;
 
 };