Commit Graph

72 Commits

Author SHA1 Message Date
prascle
ef59152514 PR : merge from V7_2_1p1
memory leaks, bug in import 1D for cracks
M src/SMDS/SMDS_UnstructuredGrid.cxx
M src/SMESH/SMESH_MeshEditor.cxx
M src/SMESH/SMESH_MesherHelper.cxx
M src/SMESHUtils/SMESH_MeshAlgos.cxx
M src/SMESHUtils/SMESH_MeshAlgos.hxx
M src/SMESHUtils/SMESH_Octree.hxx
M src/SMESHUtils/SMESH_Tree.hxx
M src/SMESH_PY/smeshstudytools.py
M src/StdMeshers/StdMeshers_Import_1D.cxx
2013-08-03 11:11:12 +00:00
eap
c17253baf7 Fix GetNodeIndex() for polygon 2013-07-29 12:15:22 +00:00
eap
01d8b02caa Rm duplicated SMDS_MeshElement::setVtkId(int vtkId)
-  inline void setVtkId(int vtkId) { myVtkID = vtkId; };
2013-07-29 11:51:02 +00:00
eap
6ae2a9da94 Optimize SMDS_MeshElement::GetNodeIndex()
+  virtual int GetNodeIndex( const SMDS_MeshNode* node ) const;
2013-07-29 11:49:21 +00:00
eap
da2b448af1 Optimize SMDS_MeshElement::GetNodeIndex()
-  int GetNodeIndex( const SMDS_MeshNode* node ) const;
+  virtual int GetNodeIndex( const SMDS_MeshNode* node ) const;
2013-07-29 11:48:56 +00:00
eap
4689443745 22261: EDF 2698 SMESH: Memory leak when displaying 2D quadratic elements as arcs
-      newFaceLocations->Register(this);
-      newFaces->Register(this);
2013-07-24 14:46:09 +00:00
rnc
094287b4df BUG: EDF 2655: Hexa splitting into tetra low performance
A better fix has been found by improving the getNextFree() method in ObjectPool.hxx. When there is no "hole" in the ID list we don't iterate on the _freeList to find the next free ID. We jump straight to the last occupied ID.
This fix is simpler and can benefit to other methods of SMESH_Editor like QuadTo4Tri for example.
2013-07-22 08:46:57 +00:00
eap
c25ddc7d49 0022108: EDF 2547 SMESH: Duplicate elements only
More filters

+  struct Filter
+  {
+    virtual bool operator()(const SMDS_MeshElement* e) const = 0;
+    ~Filter() {}
+  };
+  struct NonNullFilter: public Filter
2013-05-28 16:41:00 +00:00
eap
c922a9cc64 Fix GetNode() for polyhedron 2013-05-28 16:40:15 +00:00
eap
82b050103f + void SetParameters(double aUparam, double aVparam); 2013-05-22 14:54:20 +00:00
eap
c2c0a21343 - virtual SMDS_ElemIteratorPtr nodesIteratorToUNV() const;
-  virtual SMDS_ElemIteratorPtr interlacedNodesElemIterator() const;
+  virtual SMDS_NodeIteratorPtr nodesIteratorToUNV() const;
+  virtual SMDS_NodeIteratorPtr interlacedNodesIterator() const;
2013-05-16 16:17:16 +00:00
eap
1267641d31 0022100: EDF 2413 SMESH: Take into account TRIA7
Now  SMDS_VtkCellIteratorToUNV inherits from SMDS_NodeIterator and
hence next() returns a node

-class SMDS_VtkCellIteratorToUNV: public SMDS_VtkCellIterator
+class SMDS_VtkCellIteratorToUNV: public SMDS_NodeIterator, protected SMDS_VtkCellIterator
 {
 public:
   SMDS_VtkCellIteratorToUNV(SMDS_Mesh* mesh, int vtkCellId, SMDSAbs_EntityType aType);
+  virtual const SMDS_MeshNode* next();
+  virtual bool more();
   virtual ~SMDS_VtkCellIteratorToUNV();
 };
2013-05-16 16:16:22 +00:00
eap
5030955be8 Make IsFreeFace() fast, the old implementation of IsFreeFace() is renamed -> IsFreeFaceAdv()
bool IsFreeFace(  int faceIndex, const SMDS_MeshElement** otherVol=0 ) const;
-  // Check that all volumes built on the face nodes lays on one side
+  // Fast check that only one volume is built on nodes of a given face
+  // otherVol returns another volume sharing the given facet
+
+  bool IsFreeFaceAdv(  int faceIndex, const SMDS_MeshElement** otherVol=0 ) const;
+  // Thorough check that all volumes built on the face nodes lays on one side

+  bool IsPoly() const { return myPolyedre; }
2013-05-16 16:14:01 +00:00
eap
580dfddb72 0022100: EDF 2413 SMESH: Take into account TRIA7 2013-05-16 16:11:35 +00:00
eap
c448c8ff74 - SMDS_ElemIteratorPtr interlacedNodesElemIterator() const; 2013-05-16 16:10:37 +00:00
eap
010ee1ec71 0022100: EDF 2413 SMESH: Take into account TRIA7
+  int NbBiQuadTriangles() const { return myNbBiQuadTriangles; }
2013-05-16 16:08:36 +00:00
eap
24d5088297 - virtual SMDS_ElemIteratorPtr nodesIteratorToUNV() const;
+  virtual SMDS_NodeIteratorPtr nodeIterator() const;
+  virtual SMDS_NodeIteratorPtr interlacedNodesIterator() const;
+  virtual SMDS_NodeIteratorPtr nodesIteratorToUNV() const;
2013-05-16 16:08:00 +00:00
eap
90925ba7c0 0022100: EDF 2413 SMESH: Take into account TRIA7
+  virtual SMDS_MeshFace* AddFace(const SMDS_MeshNode * n1,
+                                 const SMDS_MeshNode * n2,
+                                 const SMDS_MeshNode * n3,
+                                 const SMDS_MeshNode * n12,
+                                 const SMDS_MeshNode * n23,
+                                 const SMDS_MeshNode * n31,
+                                 const SMDS_MeshNode * nCenter);

+  virtual void MoveNode(const SMDS_MeshNode *n, double x, double y, double z);
2013-05-16 16:06:21 +00:00
eap
77bf33663f indentation 2013-05-16 16:04:50 +00:00
eap
7cd54f6b75 0022100: EDF 2413 SMESH: Take into account TRIA7
+      _cellDimension[VTK_BIQUADRATIC_TRIANGLE] = 2;
2013-05-16 16:04:30 +00:00
eap
42462cd3f9 0022100: EDF 2413 SMESH: Take into account TRIA7
+  SMDSEntity_BiQuad_Triangle,
2013-05-16 16:04:10 +00:00
eap
250c4f2244 Regression of XSMESH_TEST/SMESHCOMMON/SMESH_TEST/Grids/smesh/bugs12/M6
Fix the ensuring stability of SMESH_MeshEditor::makeWalls(). Allow
storing both nodes and cells in one map sorted by ID.


struct TIDCompare {
   bool operator () (const SMDS_MeshElement* e1, const SMDS_MeshElement* e2) const
-  { return e1->GetID() < e2->GetID(); }
+  { return e1->GetType() == e2->GetType() ? e1->GetID() < e2->GetID() : e1->GetType() < e2->GetType(); }
2013-04-26 11:46:58 +00:00
vsr
bd8f1aee7c Merge from V6_main 01/04/2013 2013-04-01 13:05:47 +00:00
vsr
de9ffb0699 Merge from V6_main 19/03/2013 2013-03-19 16:22:36 +00:00
vsr
7aebb99e42 Merge from V6_main 06/03/2013 2013-03-06 13:57:01 +00:00
vsr
ae29d46509 Merge from BR_PORTING_VTK6 01/03/2013 2013-03-01 13:13:25 +00:00
vsr
88b3dbe23b Merge from V6_main 28/02/2013 2013-02-28 15:07:35 +00:00
vsr
9a54694a0a Merge from V6_main 11/02/2013 2013-02-12 14:37:44 +00:00
vsr
1067ffa6e7 Merge from V6_main 13/12/2012 2012-12-13 11:41:29 +00:00
vsr
f5016d85b7 Merge from V6_main (04/10/2012) 2012-10-08 11:56:59 +00:00
vsr
bd4e115a78 Merge from V6_main_20120808 08Aug12 2012-08-09 10:03:55 +00:00
vsr
0635c9fc80 Merge from BR_V5_DEV 16Feb09 2009-02-17 05:27:49 +00:00
jfa
79b1ac2b6d Join modifications from BR_Dev_For_4_0 tag V4_1_1. 2008-03-07 07:47:05 +00:00
jfa
c63ee099ad Join modifications from branch BR_DEBUG_3_2_0b1 2006-06-01 11:39:17 +00:00
jfa
57b43b4d01 Join modifications from branch OCC_debug_for_3_2_0b1 2006-05-06 08:51:48 +00:00
jfa
4ff5bd6154 Join modifications from branch OCC_development_for_3_2_0a2 2006-03-13 15:29:49 +00:00
smh
2754c581d3 Copyrights update 2005-12-05 16:31:55 +00:00
eap
52f87e4dea IMP 10199 (add Volume Control). Implement GetSize(). Add GetVolumeType() of instance 2005-10-10 14:38:24 +00:00
eap
365fd031c5 IMP 10199 (add Volume Control). Add GetVolumeType() of instance 2005-10-10 14:37:11 +00:00
szy
d9d247d43d Windows porting 2005-08-31 10:10:42 +00:00
szy
42c7eb97f9 Windows porting 2005-08-30 12:57:02 +00:00
sln
bbfbac1990 GetElementType method added 2005-08-23 08:58:58 +00:00
eap
5a053fbfd0 fix compilation error 2005-06-15 05:31:12 +00:00
eap
5467bb25d4 PAL9163. Fix GetFaceNormal() for badly shaped quadrangles 2005-06-14 10:19:12 +00:00
smh
c38c10811a SMH: Preparation version 3.0.0 - merge (HEAD+POLYWORK) 2005-06-07 13:22:20 +00:00
san
e465982eeb Implementation of new pattern mapping algorthm (mesh refinement) 2005-01-20 14:44:17 +00:00
admin
090aff0726 Merge with OCC_development_01 2005-01-20 06:25:54 +00:00
admin
e4737e85f0 Merge with version on tag OCC-V2_1_0d 2004-12-01 10:48:31 +00:00
yfr
c3bf92bd87 DCQ : Merge with Ecole_Ete_a6. 2004-06-18 08:34:31 +00:00
jrt
9fad60b470 Fix bug SMESH5512 (Crash on DEBIAN woody, V1_4_0b). 2004-03-23 09:48:58 +00:00