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

0021153: [CEA] non regression test fails

Browse Source 
Improve removeFromContainers() by taking into account that now mesh
         element knows the sub-mesh it belongs to
This commit is contained in:
eap 2011-02-10 13:30:00 +00:00
parent a91bb00475
commit 7d73daf123
1 changed files with 12 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/SMESHDS/SMESHDS_Mesh.cxx
View File

@ -714,31 +714,19 @@ static void removeFromContainers (map<int,SMESHDS_SubMesh*>& theSubMeshes,
// Rm from sub-meshes // Rm from sub-meshes
// Element should belong to only one sub-mesh // Element should belong to only one sub-mesh
map<int,SMESHDS_SubMesh*>::iterator SubIt = theSubMeshes.begin(); if ( !theSubMeshes.empty() )
for ( ; SubIt != theSubMeshes.end(); SubIt++ )
{ {
int size = isNode ? (*SubIt).second->NbNodes() : (*SubIt).second->NbElements(); SMESHDS_Mesh* mesh = theSubMeshes.begin()->second->getParent();
if ( size == 0 ) continue;
list<const SMDS_MeshElement *>::iterator elIt = theElems.begin(); list<const SMDS_MeshElement *>::iterator elIt = theElems.begin();
while ( elIt != theElems.end() ) if ( isNode ) {
{ for ( ; elIt != theElems.end(); ++elIt )
bool removed = false; if ( SMESHDS_SubMesh* sm = mesh->MeshElements( (*elIt)->getshapeId() ))
if ( isNode ) sm->RemoveNode( static_cast<const SMDS_MeshNode*> (*elIt), deleted );
removed = (*SubIt).second->RemoveNode( static_cast<const SMDS_MeshNode*> (*elIt), deleted );
else
removed = (*SubIt).second->RemoveElement( *elIt, deleted );
if (removed)
{
elIt = theElems.erase( elIt );
if ( theElems.empty() )
return; // all elements are found and removed
}
else
{
elIt++ ;
} }
else {
for ( ; elIt != theElems.end(); ++elIt )
if ( SMESHDS_SubMesh* sm = mesh->MeshElements( (*elIt)->getshapeId() ))
sm->RemoveElement( *elIt, deleted );
} }
} }
} }