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
merge master
[modules/smesh.git]
/
src
/
SMESHDS
/
SMESHDS_Mesh.cxx
diff --git
a/src/SMESHDS/SMESHDS_Mesh.cxx
b/src/SMESHDS/SMESHDS_Mesh.cxx
index d4a018b10c6ba96ae17965035cb2934e9158c76d..a66f4482fe5a0f7c4523187dd12c57e5fa7c0815 100644
(file)
--- a/
src/SMESHDS/SMESHDS_Mesh.cxx
+++ b/
src/SMESHDS/SMESHDS_Mesh.cxx
@@
-965,7
+965,7
@@
void SMESHDS_Mesh::RemoveElement(const SMDS_MeshElement * elt)
if ( elt->getshapeId() > 0 )
subMesh = MeshElements( elt->getshapeId() );
if ( elt->getshapeId() > 0 )
subMesh = MeshElements( elt->getshapeId() );
- RemoveFreeElement( elt, subMesh, true);
+ RemoveFreeElement( elt, subMesh, true
);
return;
}
return;
}
@@
-974,7
+974,7
@@
void SMESHDS_Mesh::RemoveElement(const SMDS_MeshElement * elt)
list<const SMDS_MeshElement *> removedElems;
list<const SMDS_MeshElement *> removedNodes;
list<const SMDS_MeshElement *> removedElems;
list<const SMDS_MeshElement *> removedNodes;
- SMDS_Mesh::RemoveElement(elt, removedElems, removedNodes, false);
+ SMDS_Mesh::RemoveElement(elt, removedElems, removedNodes, false
);
removeFromContainers( this, myGroups, removedElems, false );
}
removeFromContainers( this, myGroups, removedElems, false );
}
@@
-1000,7
+1000,7
@@
void SMESHDS_Mesh::RemoveFreeElement(const SMDS_MeshElement * elt,
myScript->RemoveElement(elt->GetID());
// Rm from group
myScript->RemoveElement(elt->GetID());
// Rm from group
- //
Node
can belong to several groups
+ //
Element
can belong to several groups
if ( fromGroups && !myGroups.empty() ) {
set<SMESHDS_GroupBase*>::iterator GrIt = myGroups.begin();
for (; GrIt != myGroups.end(); GrIt++) {
if ( fromGroups && !myGroups.empty() ) {
set<SMESHDS_GroupBase*>::iterator GrIt = myGroups.begin();
for (; GrIt != myGroups.end(); GrIt++) {
@@
-1012,10
+1012,12
@@
void SMESHDS_Mesh::RemoveFreeElement(const SMDS_MeshElement * elt,
// Rm from sub-mesh
// Element should belong to only one sub-mesh
// Rm from sub-mesh
// Element should belong to only one sub-mesh
- if( subMesh )
- subMesh->RemoveElement(elt, /*deleted=*/false);
+ if ( !subMesh && elt->getshapeId() > 0 )
+ subMesh = MeshElements( elt->getshapeId() );
+ if ( subMesh )
+ subMesh->RemoveElement( elt, /*deleted=*/false );
- SMDS_Mesh::RemoveFreeElement(
elt
);
+ SMDS_Mesh::RemoveFreeElement(
elt
);
}
//================================================================================
}
//================================================================================