mirror of
https://git.salome-platform.org/gitpub/modules/smesh.git
synced 2024-12-26 17:30:35 +05:00
BUG: EDF 2655: Low performance of hexa to tetra splitting
The whole procedure performance was almost O(n^2) due to insertion of for example 5 elements in a mesh with a free ID at the beginning. The second element is then inserted with a O(n) complexity. The hexas are now removed after all tetra insertions, which guarantees a O(n) complexity for the whole procedure at a limited memory cost (transient additional cost of 1/5 of total memory occupation at the end).
This commit is contained in:
parent
1fa8c22987
commit
3f3beb8b95
@ -1899,6 +1899,20 @@ namespace
|
|||||||
};
|
};
|
||||||
} // namespace
|
} // namespace
|
||||||
|
|
||||||
|
class TElemToDelete
|
||||||
|
{
|
||||||
|
public:
|
||||||
|
TElemToDelete(const SMDS_MeshElement* theElem, SMESHDS_SubMesh* theSubMesh)
|
||||||
|
{
|
||||||
|
elem = theElem;
|
||||||
|
subMesh = theSubMesh;
|
||||||
|
}
|
||||||
|
const SMDS_MeshElement* Elem() const {return elem;}
|
||||||
|
SMESHDS_SubMesh* Submesh() {return subMesh;}
|
||||||
|
const SMDS_MeshElement* elem;
|
||||||
|
SMESHDS_SubMesh* subMesh;
|
||||||
|
};
|
||||||
|
|
||||||
//=======================================================================
|
//=======================================================================
|
||||||
//function : SplitVolumesIntoTetra
|
//function : SplitVolumesIntoTetra
|
||||||
//purpose : Split volume elements into tetrahedra.
|
//purpose : Split volume elements into tetrahedra.
|
||||||
@ -1924,6 +1938,7 @@ void SMESH_MeshEditor::SplitVolumesIntoTetra (const TIDSortedElemSet & theElems,
|
|||||||
double bc[3];
|
double bc[3];
|
||||||
|
|
||||||
TIDSortedElemSet::const_iterator elem = theElems.begin();
|
TIDSortedElemSet::const_iterator elem = theElems.begin();
|
||||||
|
std::vector<TElemToDelete> elem_to_delete;
|
||||||
for ( ; elem != theElems.end(); ++elem )
|
for ( ; elem != theElems.end(); ++elem )
|
||||||
{
|
{
|
||||||
if ( (*elem)->GetType() != SMDSAbs_Volume )
|
if ( (*elem)->GetType() != SMDSAbs_Volume )
|
||||||
@ -2087,11 +2102,26 @@ void SMESH_MeshEditor::SplitVolumesIntoTetra (const TIDSortedElemSet & theElems,
|
|||||||
}
|
}
|
||||||
ReplaceElemInGroups( face, triangles, GetMeshDS() );
|
ReplaceElemInGroups( face, triangles, GetMeshDS() );
|
||||||
GetMeshDS()->RemoveFreeElement( face, fSubMesh, /*fromGroups=*/false );
|
GetMeshDS()->RemoveFreeElement( face, fSubMesh, /*fromGroups=*/false );
|
||||||
|
// TElemToDelete faceToDelete(face, fSubMesh);
|
||||||
|
// elem_to_delete.push_back(faceToDelete);
|
||||||
}
|
}
|
||||||
|
|
||||||
} // loop on volume faces to split them into triangles
|
} // loop on volume faces to split them into triangles
|
||||||
|
|
||||||
GetMeshDS()->RemoveFreeElement( *elem, subMesh, /*fromGroups=*/false );
|
// GetMeshDS()->RemoveFreeElement( *elem, subMesh, /*fromGroups=*/false );
|
||||||
|
|
||||||
|
// rnc : don't delete the elem here because it results in a mesh with a free
|
||||||
|
// ID at the beginning of the ID list. The first tetra is then inserted in O(1)
|
||||||
|
// but the second one is inserted in O(n), then the whole procedure has almost a O(n^2)
|
||||||
|
// complexity. If all elements to remove are stored and removed after tetra creation
|
||||||
|
// we get a O(n) complexity for the whole procedure.
|
||||||
|
// The memory cost is at worst a 6*n*constant memory occupation (where n is the number of elements)
|
||||||
|
// before deletion of the hexas and then 5*n*constant instead of a maximum of 5*n*constant.
|
||||||
|
// So there is a transient 1/5*(memory occupation) additional cost.
|
||||||
|
|
||||||
|
// Store the elements to delete
|
||||||
|
TElemToDelete elemToDelete(*elem, subMesh);
|
||||||
|
elem_to_delete.push_back(elemToDelete);
|
||||||
|
|
||||||
if ( geomType == SMDSEntity_TriQuad_Hexa )
|
if ( geomType == SMDSEntity_TriQuad_Hexa )
|
||||||
{
|
{
|
||||||
@ -2102,6 +2132,13 @@ void SMESH_MeshEditor::SplitVolumesIntoTetra (const TIDSortedElemSet & theElems,
|
|||||||
}
|
}
|
||||||
} // loop on volumes to split
|
} // loop on volumes to split
|
||||||
|
|
||||||
|
// Delete stored elements
|
||||||
|
std::vector<TElemToDelete>::iterator it;
|
||||||
|
for( it = elem_to_delete.begin(); it!= elem_to_delete.end(); it++)
|
||||||
|
{
|
||||||
|
GetMeshDS()->RemoveFreeElement( it->Elem(), it->Submesh(), /*fromGroups=*/false );
|
||||||
|
}
|
||||||
|
|
||||||
myLastCreatedNodes = newNodes;
|
myLastCreatedNodes = newNodes;
|
||||||
myLastCreatedElems = newElems;
|
myLastCreatedElems = newElems;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user