ForkMaster/smesh
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/smesh.git synced 2025-04-08 10:47:27 +05:00
Code Issues Packages Projects Releases Wiki Activity

Optimize ConvertToQuadratic

Browse Source 
avoid computing octree->getHeight() upon each FindClosestTo() in SMESH_MesherHelper::FixQuadraticElements()
This commit is contained in:
eap 2016-11-16 16:48:50 +03:00
parent 81bd088581
commit cf35807108
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/MEFISTO2/aptrte.cxx
View File

@ -866,6 +866,5 @@ void
if( nbtrianeg>0 ) if( nbtrianeg>0 )
MESSAGE( "ATTENTION: "<< nbtrianeg << " TRIANGLES d'AIRE NEGATIVE" ); MESSAGE( "ATTENTION: "<< nbtrianeg << " TRIANGLES d'AIRE NEGATIVE" );
MESSAGE(" ");
return; return;
} }

11
src/SMESHUtils/SMESH_MeshAlgos.cxx
View File

@ -442,6 +442,7 @@ struct SMESH_ElementSearcherImpl: public SMESH_ElementSearcher
SMDS_Mesh* _mesh; SMDS_Mesh* _mesh;
SMDS_ElemIteratorPtr _meshPartIt; SMDS_ElemIteratorPtr _meshPartIt;
ElementBndBoxTree* _ebbTree; ElementBndBoxTree* _ebbTree;
int _ebbTreeHeight;
SMESH_NodeSearcherImpl* _nodeSearcher; SMESH_NodeSearcherImpl* _nodeSearcher;
SMDSAbs_ElementType _elementType; SMDSAbs_ElementType _elementType;
double _tolerance; double _tolerance;
@ -451,7 +452,7 @@ struct SMESH_ElementSearcherImpl: public SMESH_ElementSearcher
SMESH_ElementSearcherImpl( SMDS_Mesh& mesh, SMESH_ElementSearcherImpl( SMDS_Mesh& mesh,
double tol=-1, double tol=-1,
SMDS_ElemIteratorPtr elemIt=SMDS_ElemIteratorPtr()) SMDS_ElemIteratorPtr elemIt=SMDS_ElemIteratorPtr())
: _mesh(&mesh),_meshPartIt(elemIt),_ebbTree(0),_nodeSearcher(0),_tolerance(tol),_outerFacesFound(false) {} : _mesh(&mesh),_meshPartIt(elemIt),_ebbTree(0),_ebbTreeHeight(-1),_nodeSearcher(0),_tolerance(tol),_outerFacesFound(false) {}
virtual ~SMESH_ElementSearcherImpl() virtual ~SMESH_ElementSearcherImpl()
{ {
if ( _ebbTree ) delete _ebbTree; _ebbTree = 0; if ( _ebbTree ) delete _ebbTree; _ebbTree = 0;
@ -479,6 +480,12 @@ struct SMESH_ElementSearcherImpl: public SMESH_ElementSearcher
{ {
return _outerFaces.empty() || _outerFaces.count(face); return _outerFaces.empty() || _outerFaces.count(face);
} }
int getTreeHeight()
{
if ( _ebbTreeHeight < 0 )
_ebbTreeHeight = _ebbTree->getHeight();
return _ebbTreeHeight;
}
struct TInters //!< data of intersection of the line and the mesh face (used in GetPointState()) struct TInters //!< data of intersection of the line and the mesh face (used in GetPointState())
{ {
@ -796,7 +803,7 @@ SMESH_ElementSearcherImpl::FindClosestTo( const gp_Pnt& point,
if ( _ebbTree->getBox()->IsOut( point.XYZ() )) if ( _ebbTree->getBox()->IsOut( point.XYZ() ))
radius = point.Distance( boxCenter ) - 0.5 * _ebbTree->maxSize(); radius = point.Distance( boxCenter ) - 0.5 * _ebbTree->maxSize();
if ( radius < 0 ) if ( radius < 0 )
radius = _ebbTree->maxSize() / pow( 2., _ebbTree->getHeight()) / 2; radius = _ebbTree->maxSize() / pow( 2., getTreeHeight()) / 2;
while ( suspectElems.empty() ) while ( suspectElems.empty() )
{ {
_ebbTree->getElementsInSphere( point.XYZ(), radius, suspectElems ); _ebbTree->getElementsInSphere( point.XYZ(), radius, suspectElems );