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
Copyright update 2021
[modules/smesh.git]
/
src
/
SMESHDS
/
SMESHDS_Mesh.hxx
diff --git
a/src/SMESHDS/SMESHDS_Mesh.hxx
b/src/SMESHDS/SMESHDS_Mesh.hxx
index 92f631890ed558fb02a0d17d91a74548c109ae84..ad5f0aaeb11b6785f22394c21338e45ce3a7b469 100644
(file)
--- a/
src/SMESHDS/SMESHDS_Mesh.hxx
+++ b/
src/SMESHDS/SMESHDS_Mesh.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
@@
-66,7
+66,7
@@
class DownIdType;
class SMESHDS_EXPORT SMESHDS_Mesh : public SMDS_Mesh
{
class SMESHDS_EXPORT SMESHDS_Mesh : public SMDS_Mesh
{
-public:
+
public:
SMESHDS_Mesh(int theMeshID, bool theIsEmbeddedMode);
bool IsEmbeddedMode();
void SetPersistentId(int id);
SMESHDS_Mesh(int theMeshID, bool theIsEmbeddedMode);
bool IsEmbeddedMode();
void SetPersistentId(int id);
@@
-566,18
+566,18
@@
public:
virtual SMDS_MeshFace* AddQuadPolygonalFace(const std::vector<const SMDS_MeshNode*> & nodes);
virtual SMDS_MeshVolume* AddPolyhedralVolumeWithID
virtual SMDS_MeshFace* AddQuadPolygonalFace(const std::vector<const SMDS_MeshNode*> & nodes);
virtual SMDS_MeshVolume* AddPolyhedralVolumeWithID
-
(const std::vector<int>& nodes_ids,
-
const std::vector<int>& quantities,
-
const int ID);
+ (const std::vector<int>& nodes_ids,
+ const std::vector<int>& quantities,
+ const int ID);
virtual SMDS_MeshVolume* AddPolyhedralVolumeWithID
virtual SMDS_MeshVolume* AddPolyhedralVolumeWithID
-
(const std::vector<const SMDS_MeshNode*>& nodes,
-
const std::vector<int>& quantities,
-
const int ID);
+ (const std::vector<const SMDS_MeshNode*>& nodes,
+ const std::vector<int>& quantities,
+ const int ID);
virtual SMDS_MeshVolume* AddPolyhedralVolume
virtual SMDS_MeshVolume* AddPolyhedralVolume
-
(const std::vector<const SMDS_MeshNode*>& nodes,
-
const std::vector<int>& quantities);
+ (const std::vector<const SMDS_MeshNode*>& nodes,
+ const std::vector<int>& quantities);
virtual void MoveNode(const SMDS_MeshNode *, double x, double y, double z);
virtual void RemoveNode(const SMDS_MeshNode *);
virtual void MoveNode(const SMDS_MeshNode *, double x, double y, double z);
virtual void RemoveNode(const SMDS_MeshNode *);
@@
-587,7
+587,7
@@
public:
* Methods do not work for meshes with descendants.
* Implemented for fast cleaning of meshes.
*/
* Methods do not work for meshes with descendants.
* Implemented for fast cleaning of meshes.
*/
-
void
RemoveFreeNode (const SMDS_MeshNode *, SMESHDS_SubMesh *, bool fromGroups=true);
+
bool
RemoveFreeNode (const SMDS_MeshNode *, SMESHDS_SubMesh *, bool fromGroups=true);
void RemoveFreeElement(const SMDS_MeshElement *, SMESHDS_SubMesh *, bool fromGroups=true);
void ClearMesh();
void RemoveFreeElement(const SMDS_MeshElement *, SMESHDS_SubMesh *, bool fromGroups=true);
void ClearMesh();
@@
-597,9
+597,9
@@
public:
const int nbnodes);
bool ChangePolygonNodes(const SMDS_MeshElement * elem,
std::vector<const SMDS_MeshNode*> nodes);
const int nbnodes);
bool ChangePolygonNodes(const SMDS_MeshElement * elem,
std::vector<const SMDS_MeshNode*> nodes);
- bool ChangePolyhedronNodes(const SMDS_MeshElement * elem,
-
std::vector<const SMDS_MeshNode*>
nodes,
-
std::vector<int>
quantities);
+ bool ChangePolyhedronNodes(const SMDS_MeshElement *
elem,
+
const std::vector<const SMDS_MeshNode*>&
nodes,
+
const std::vector<int>&
quantities);
bool ModifyCellNodes(int smdsVolId, std::map<int,int> localClonedNodeIds);
void Renumber (const bool isNodes, const int startID=1, const int deltaID=1);
bool ModifyCellNodes(int smdsVolId, std::map<int,int> localClonedNodeIds);
void Renumber (const bool isNodes, const int startID=1, const int deltaID=1);
@@
-646,13
+646,13
@@
public:
bool IsGroupOfSubShapes (const TopoDS_Shape& aSubShape) const;
bool IsGroupOfSubShapes (const TopoDS_Shape& aSubShape) const;
- virtual void
c
ompactMesh();
+ virtual void
C
ompactMesh();
void CleanDownWardConnectivity();
void BuildDownWardConnectivity(bool withEdges);
~SMESHDS_Mesh();
void CleanDownWardConnectivity();
void BuildDownWardConnectivity(bool withEdges);
~SMESHDS_Mesh();
-private:
+
private:
ShapeToHypothesis myShapeToHypothesis;
ShapeToHypothesis myShapeToHypothesis;
@@
-665,12
+665,12
@@
private:
TopTools_IndexedMapOfShape myIndexToShape;
typedef std::set<SMESHDS_GroupBase*> TGroups;
TopTools_IndexedMapOfShape myIndexToShape;
typedef std::set<SMESHDS_GroupBase*> TGroups;
- TGroups myGroups;
+ TGroups
myGroups;
SMESHDS_Script* myScript;
bool myIsEmbeddedMode;
SMESHDS_Script* myScript;
bool myIsEmbeddedMode;
-
bool
add( const SMDS_MeshElement* elem, SMESHDS_SubMesh* subMesh );
+
int
add( const SMDS_MeshElement* elem, SMESHDS_SubMesh* subMesh );
SMESHDS_SubMesh* getSubmesh( const TopoDS_Shape & shape);
};
SMESHDS_SubMesh* getSubmesh( const TopoDS_Shape & shape);
};