ForkMaster/smesh
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/smesh.git synced 2024-11-15 10:08:34 +05:00
Code Issues Packages Projects Releases Wiki Activity

0021151: [CEA] unit test fails

Browse Source 
Index of sub-shape might be greater than 32767 (max allowed value for short type)
This commit is contained in:
vsr 2011-01-25 11:23:48 +00:00
parent 266561983c
commit 029dc689fe
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/SMDS/SMDS_MeshElement.cxx
View File

@ -40,12 +40,12 @@ SMDS_MeshElement::SMDS_MeshElement(int ID)
init(ID); init(ID);
} }
SMDS_MeshElement::SMDS_MeshElement(int id, ShortType meshId, ShortType shapeId) SMDS_MeshElement::SMDS_MeshElement(int id, ShortType meshId, LongType shapeId)
{ {
init(id, meshId, shapeId); init(id, meshId, shapeId);
} }
void SMDS_MeshElement::init(int id, ShortType meshId, ShortType shapeId ) void SMDS_MeshElement::init(int id, ShortType meshId, LongType shapeId )
{ {
myID = id; myID = id;
myMeshId = meshId; myMeshId = meshId;

11
src/SMDS/SMDS_MeshElement.hxx
View File

@ -43,6 +43,7 @@
//typedef unsigned short UShortType; //typedef unsigned short UShortType;
typedef short ShortType; typedef short ShortType;
typedef long LongType;
class SMDS_MeshNode; class SMDS_MeshNode;
class SMDS_MeshEdge; class SMDS_MeshEdge;
@ -140,18 +141,18 @@ public:
int GetNodeIndex( const SMDS_MeshNode* node ) const; int GetNodeIndex( const SMDS_MeshNode* node ) const;
inline ShortType getMeshId() const {return myMeshId; } inline ShortType getMeshId() const {return myMeshId; }
inline ShortType getshapeId() const {return myShapeId; } inline LongType getshapeId() const {return myShapeId; }
inline int getIdInShape() const { return myIdInShape; } inline int getIdInShape() const { return myIdInShape; }
inline int getVtkId() const { return myVtkID; } inline int getVtkId() const { return myVtkID; }
protected: protected:
inline void setId(int id) {myID = id; } inline void setId(int id) {myID = id; }
inline void setShapeId(ShortType shapeId) {myShapeId = shapeId; } inline void setShapeId(LongType shapeId) {myShapeId = shapeId; }
inline void setIdInShape(int id) { myIdInShape = id; } inline void setIdInShape(int id) { myIdInShape = id; }
inline void setVtkId(int vtkId) { myVtkID = vtkId; } inline void setVtkId(int vtkId) { myVtkID = vtkId; }
SMDS_MeshElement(int ID=-1); SMDS_MeshElement(int ID=-1);
SMDS_MeshElement(int id, ShortType meshId, ShortType shapeId = 0); SMDS_MeshElement(int id, ShortType meshId, LongType shapeId = 0);
virtual void init(int id = -1, ShortType meshId = -1, ShortType shapeId = 0); virtual void init(int id = -1, ShortType meshId = -1, LongType shapeId = 0);
virtual void Print(std::ostream & OS) const; virtual void Print(std::ostream & OS) const;
//! Element index in vector SMDS_Mesh::myNodes or SMDS_Mesh::myCells //! Element index in vector SMDS_Mesh::myNodes or SMDS_Mesh::myCells
@ -161,7 +162,7 @@ protected:
//! SMDS_Mesh identification in SMESH //! SMDS_Mesh identification in SMESH
ShortType myMeshId; ShortType myMeshId;
//! SubShape and SubMesh identification in SMESHDS //! SubShape and SubMesh identification in SMESHDS
ShortType myShapeId; LongType myShapeId;
//! Element index in SMESHDS_SubMesh vector //! Element index in SMESHDS_SubMesh vector
int myIdInShape; int myIdInShape;
}; };