ForkMaster/smesh
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/smesh.git synced 2025-01-18 09:00:32 +05:00
Code Issues Packages Projects Releases Wiki Activity

PR: debug split into tetras

Browse Source
This commit is contained in:
prascle 2010-12-05 22:57:20 +00:00
parent 43a4d0b5c1
commit 7013eafe2d
2 changed files with 29 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/SMESH/SMESH_MeshEditor.cxx
View File

@ -1717,10 +1717,10 @@ void SMESH_MeshEditor::SplitVolumesIntoTetra (const TIDSortedElemSet & theElems,
}
for ( int i = 0; i < triangles.size(); ++i )
{
if ( !triangles.back() ) continue;
if ( !triangles[i] ) continue;
if ( fSubMesh )
fSubMesh->AddElement( triangles.back());
newElems.Append( triangles.back() );
fSubMesh->AddElement( triangles[i]);
newElems.Append( triangles[i] );
}
ReplaceElemInGroups( face, triangles, GetMeshDS() );
GetMeshDS()->RemoveFreeElement( face, fSubMesh, /*fromGroups=*/false );

31
src/SMESHDS/SMESHDS_SubMesh.cxx
View File

@ -55,13 +55,34 @@ void SMESHDS_SubMesh::AddElement(const SMDS_MeshElement * ME)
if (!IsComplexSubmesh())
{
//MESSAGE("in " << myIndex << " AddElement "<< ME->GetID());
int idInSubShape = ME->getIdInShape();
if (idInSubShape != -1)
int oldShapeId = ME->getshapeId();
if ( oldShapeId > 0 )
{
MESSAGE("add element in subshape already belonging to a subshape "
<< ME->GetID() << " " << ME->getIdInShape() << " " << ME->getshapeId());
throw SALOME_Exception(LOCALIZED("add element in subshape already belonging to a subshape"));
if (oldShapeId != myIndex)
{
MESSAGE("add element in subshape already belonging to another subshape "
<< ME->GetID() << " " << oldShapeId << " " << myIndex);
throw SALOME_Exception(LOCALIZED("add element in subshape already belonging to a subshape"));
}
else
{
int idInSubShape = ME->getIdInShape();
MESSAGE("add element in subshape already belonging to that subshape "
<< ME->GetID() << " " << oldShapeId << " " << idInSubShape);
// check if ok: do nothing if ok
if ((idInSubShape == -1) || (idInSubShape >= myElements.size()))
{
MESSAGE("out of bounds");
throw SALOME_Exception(LOCALIZED("out of bounds"));
}
if (ME != myElements[idInSubShape])
{
MESSAGE("not the same element");
throw SALOME_Exception(LOCALIZED("not the same element"));
}
}
}
SMDS_MeshElement* elem = (SMDS_MeshElement*) (ME);
elem->setShapeId(myIndex);
elem->setIdInShape(myElements.size());