ForkMaster/smesh
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/smesh.git synced 2025-03-16 06:51:26 +05:00
Code Issues Packages Projects Releases Wiki Activity

Merge from 1.10.2.4.6.5

Browse Source
This commit is contained in:
prascle 2010-12-06 17:02:23 +00:00
parent 85f3ec887b
commit 1df03b4615
1 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/SMESHDS/SMESHDS_SubMesh.cxx
View File

@ -67,12 +67,14 @@ void SMESHDS_SubMesh::AddElement(const SMDS_MeshElement * ME)
else else
{ {
int idInSubShape = ME->getIdInShape(); int idInSubShape = ME->getIdInShape();
if (idInSubShape >= 0)
{
MESSAGE("add element in subshape already belonging to that subshape " MESSAGE("add element in subshape already belonging to that subshape "
<< ME->GetID() << " " << oldShapeId << " " << idInSubShape); << ME->GetID() << " " << oldShapeId << " " << idInSubShape);
// check if ok: do nothing if ok // check if ok: do nothing if ok
if ((idInSubShape == -1) || (idInSubShape >= myElements.size())) if (idInSubShape >= myElements.size())
{ {
MESSAGE("out of bounds"); MESSAGE("out of bounds " << idInSubShape << " " << myElements.size());
throw SALOME_Exception(LOCALIZED("out of bounds")); throw SALOME_Exception(LOCALIZED("out of bounds"));
} }
if (ME != myElements[idInSubShape]) if (ME != myElements[idInSubShape])
@ -80,6 +82,9 @@ void SMESHDS_SubMesh::AddElement(const SMDS_MeshElement * ME)
MESSAGE("not the same element"); MESSAGE("not the same element");
throw SALOME_Exception(LOCALIZED("not the same element")); throw SALOME_Exception(LOCALIZED("not the same element"));
} }
MESSAGE("already done, OK, nothing to do");
return;
}
} }
} }