From a39a872e35529a7739bae404cdff3fe8213696dc Mon Sep 17 00:00:00 2001 From: eap Date: Wed, 20 May 2009 15:46:33 +0000 Subject: [PATCH] 0020279: [CEA 334] control the "random" use when using mesh algorithms Compare TNode's by node ID --- src/StdMeshers/StdMeshers_Prism_3D.hxx | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/src/StdMeshers/StdMeshers_Prism_3D.hxx b/src/StdMeshers/StdMeshers_Prism_3D.hxx index 8fa469b76..5c29f63ec 100644 --- a/src/StdMeshers/StdMeshers_Prism_3D.hxx +++ b/src/StdMeshers/StdMeshers_Prism_3D.hxx @@ -84,7 +84,7 @@ struct TNode bool IsNeighbor( const TNode& other ) const; TNode(const SMDS_MeshNode* node = 0): myNode(node), myParams(-1,-1,-1) {} - bool operator < (const TNode& other) const { return myNode < other.myNode; } + bool operator < (const TNode& other) const { return myNode->GetID() < other.myNode->GetID(); } }; // =============================================================== @@ -242,9 +242,9 @@ private: TopoDS_Edge myBaseEdge; // first and last normalized params and orientaion for each component or it-self std::vector< std::pair< double, double> > myParams; - bool myIsForward; - std::vector< TSideFace* > myComponents; - SMESH_MesherHelper * myHelper; + bool myIsForward; + std::vector< TSideFace* > myComponents; + SMESH_MesherHelper * myHelper; public: TSideFace( SMESH_MesherHelper* helper, const int faceID, @@ -358,7 +358,7 @@ private: myError = SMESH_ComputeError::New(error,comment); return myError->IsOK(); } - //vector< SMESH_subMesh* > mySubMeshesVec; // submesh by in-block id + //std::vector< SMESH_subMesh* > mySubMeshesVec; // submesh by in-block id }; // ============================================= @@ -429,12 +429,11 @@ private: StdMeshers_PrismAsBlock myBlock; SMESH_MesherHelper* myHelper; - std::vector myShapeXYZ; // point on each sub-shape + std::vector myShapeXYZ; // point on each sub-shape // map of bottom nodes to the column of nodes above them // (the column includes the bottom node) - typedef std::map< TNode, TNodeColumn > TNode2ColumnMap; - TNode2ColumnMap myBotToColumnMap; + TNode2ColumnMap myBotToColumnMap; }; #endif -- 2.39.2