Salome HOME
projects
/
modules
/
smesh.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
bos #20256: [CEA 18523] Porting SMESH to int 64 bits
[modules/smesh.git]
/
src
/
SMESHDS
/
SMESHDS_SubMesh.hxx
diff --git
a/src/SMESHDS/SMESHDS_SubMesh.hxx
b/src/SMESHDS/SMESHDS_SubMesh.hxx
index 2caffb10b15b8e91a117f79f85abfaf3701feee2..8550561aaef3f15b7080a7df0afbdcfe0a31651c 100644
(file)
--- a/
src/SMESHDS/SMESHDS_SubMesh.hxx
+++ b/
src/SMESHDS/SMESHDS_SubMesh.hxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-20
16
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-20
21
CEA/DEN, EDF R&D, OPEN CASCADE
//
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
//
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@
-29,7
+29,9
@@
#include "SMESH_SMESHDS.hxx"
#include "SMESH_SMESHDS.hxx"
+#include "SMDS_ElementHolder.hxx"
#include "SMDS_Mesh.hxx"
#include "SMDS_Mesh.hxx"
+#include <smIdType.hxx>
#include <vector>
#include <boost/container/flat_set.hpp>
#include <vector>
#include <boost/container/flat_set.hpp>
@@
-42,10
+44,10
@@
typedef boost::shared_ptr< SMESHDS_SubMeshIterator > SMESHDS_SubMeshIteratorPtr;
class SMESHDS_Mesh;
class SMESHDS_Mesh;
-class SMESHDS_EXPORT SMESHDS_SubMesh
+class SMESHDS_EXPORT SMESHDS_SubMesh
: public SMDS_ElementHolder
{
public:
{
public:
- SMESHDS_SubMesh(SMESHDS_Mesh *parent, int index);
+ SMESHDS_SubMesh(
const
SMESHDS_Mesh *parent, int index);
virtual ~SMESHDS_SubMesh();
virtual bool IsComplexSubmesh() const { return !mySubMeshes.empty(); }
virtual ~SMESHDS_SubMesh();
virtual bool IsComplexSubmesh() const { return !mySubMeshes.empty(); }
@@
-55,20
+57,18
@@
class SMESHDS_EXPORT SMESHDS_SubMesh
virtual bool RemoveElement(const SMDS_MeshElement * ME); // ret true if ME was in
virtual void AddNode(const SMDS_MeshNode * ME);
virtual bool RemoveNode(const SMDS_MeshNode * ME); // ret true if ME was in
virtual bool RemoveElement(const SMDS_MeshElement * ME); // ret true if ME was in
virtual void AddNode(const SMDS_MeshNode * ME);
virtual bool RemoveNode(const SMDS_MeshNode * ME); // ret true if ME was in
- //virtual const SMDS_MeshElement* GetElement( size_t idInShape ) const;
- //virtual const SMDS_MeshNode* GetNode ( size_t idInShape ) const;
// if IsComplexSubmesh()
void AddSubMesh( const SMESHDS_SubMesh* theSubMesh );
bool RemoveSubMesh( const SMESHDS_SubMesh* theSubMesh );
void RemoveAllSubmeshes();
bool ContainsSubMesh( const SMESHDS_SubMesh* theSubMesh ) const;
// if IsComplexSubmesh()
void AddSubMesh( const SMESHDS_SubMesh* theSubMesh );
bool RemoveSubMesh( const SMESHDS_SubMesh* theSubMesh );
void RemoveAllSubmeshes();
bool ContainsSubMesh( const SMESHDS_SubMesh* theSubMesh ) const;
-
int
NbSubMeshes() const { return mySubMeshes.size(); }
+
size_t
NbSubMeshes() const { return mySubMeshes.size(); }
SMESHDS_SubMeshIteratorPtr GetSubMeshIterator() const;
// for both types
SMESHDS_SubMeshIteratorPtr GetSubMeshIterator() const;
// for both types
- virtual
int
NbElements() const;
- virtual
int
NbNodes() const;
+ virtual
smIdType
NbElements() const;
+ virtual
smIdType
NbNodes() const;
virtual SMDS_ElemIteratorPtr GetElements() const;
virtual SMDS_NodeIteratorPtr GetNodes() const;
virtual bool Contains(const SMDS_MeshElement * ME) const; // check if elem or node is in
virtual SMDS_ElemIteratorPtr GetElements() const;
virtual SMDS_NodeIteratorPtr GetNodes() const;
virtual bool Contains(const SMDS_MeshElement * ME) const; // check if elem or node is in
@@
-80,13
+80,21
@@
class SMESHDS_EXPORT SMESHDS_SubMesh
SMESHDS_Mesh* GetParent() const { return const_cast< SMESHDS_Mesh*>( myParent ); }
int GetID() const { return myIndex; }
SMESHDS_Mesh* GetParent() const { return const_cast< SMESHDS_Mesh*>( myParent ); }
int GetID() const { return myIndex; }
+ protected: // methods of SMDS_ElementHolder
+
+ virtual SMDS_ElemIteratorPtr getElements();
+ virtual void tmpClear();
+ virtual void add( const SMDS_MeshElement* element );
+ virtual void compact() {}
+
private:
private:
- int myIndex;
- int myNbElements;
- int myNbNodes;
- SMESHDS_Mesh * myParent;
- TSubMeshSet mySubMeshes;
+ int myIndex;
+ smIdType myNbElements;
+ smIdType myNbNodes;
+ const SMDS_MeshElement* my1stElemNode[2]; // elem and node with least ID, to optimize iteration
+ const SMESHDS_Mesh * myParent;
+ TSubMeshSet mySubMeshes;
};
#endif
};
#endif