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

Fix regression of cartesian_algo.py example

Browse Source
This commit is contained in:
eap 2020-03-03 14:57:40 +03:00
parent b3f2b68fc2
commit d46c8ad014
1 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/StdMeshers/StdMeshers_Cartesian_3D.cxx
View File

@ -375,7 +375,6 @@ namespace
bool _toUseThresholdForInternalFaces; bool _toUseThresholdForInternalFaces;
double _sizeThreshold; double _sizeThreshold;
vector< TGeomID > _shapeIDs; // returned by Hexahedron::getSolids()
SMESH_MesherHelper* _helper; SMESH_MesherHelper* _helper;
size_t CellIndex( size_t i, size_t j, size_t k ) const size_t CellIndex( size_t i, size_t j, size_t k ) const
@ -867,7 +866,7 @@ namespace
void init( size_t i ); void init( size_t i );
void setIJK( size_t i ); void setIJK( size_t i );
bool compute( const Solid* solid, const IsInternalFlag intFlag ); bool compute( const Solid* solid, const IsInternalFlag intFlag );
const vector< TGeomID >& getSolids(); size_t getSolids( TGeomID ids[] );
bool isCutByInternalFace( IsInternalFlag & maxFlag ); bool isCutByInternalFace( IsInternalFlag & maxFlag );
void addEdges(SMESH_MesherHelper& helper, void addEdges(SMESH_MesherHelper& helper,
vector< Hexahedron* >& intersectedHex, vector< Hexahedron* >& intersectedHex,
@ -2175,13 +2174,12 @@ namespace
/*! /*!
* \brief Return IDs of SOLIDs interfering with this Hexahedron * \brief Return IDs of SOLIDs interfering with this Hexahedron
*/ */
const vector< TGeomID >& Hexahedron::getSolids() size_t Hexahedron::getSolids( TGeomID ids[] )
{ {
_grid->_shapeIDs.clear();
if ( _grid->_geometry.IsOneSolid() ) if ( _grid->_geometry.IsOneSolid() )
{ {
_grid->_shapeIDs.push_back( _grid->GetSolid()->ID() ); ids[0] = _grid->GetSolid()->ID();
return _grid->_shapeIDs; return 1;
} }
// count intersection points belonging to each SOLID // count intersection points belonging to each SOLID
TID2Nb id2NbPoints; TID2Nb id2NbPoints;
@ -2231,12 +2229,12 @@ namespace
insertAndIncrement( solidIDs[i], id2NbPoints ); insertAndIncrement( solidIDs[i], id2NbPoints );
} }
_grid->_shapeIDs.reserve( id2NbPoints.size() ); size_t nbSolids = 0;
for ( TID2Nb::iterator id2nb = id2NbPoints.begin(); id2nb != id2NbPoints.end(); ++id2nb ) for ( TID2Nb::iterator id2nb = id2NbPoints.begin(); id2nb != id2NbPoints.end(); ++id2nb )
if ( id2nb->second >= 3 ) if ( id2nb->second >= 3 )
_grid->_shapeIDs.push_back( id2nb->first ); ids[ nbSolids++ ] = id2nb->first;
return _grid->_shapeIDs; return nbSolids;
} }
//================================================================================ //================================================================================
@ -2578,14 +2576,15 @@ namespace
solid = _grid->GetSolid(); solid = _grid->GetSolid();
if ( !_grid->_geometry.IsOneSolid() ) if ( !_grid->_geometry.IsOneSolid() )
{ {
const vector< TGeomID >& solidIDs = getSolids(); TGeomID solidIDs[20];
if ( solidIDs.size() > 1 ) size_t nbSolids = getSolids( solidIDs );
if ( nbSolids > 1 )
{ {
for ( size_t i = 0; i < solidIDs.size(); ++i ) for ( size_t i = 0; i < nbSolids; ++i )
{ {
solid = _grid->GetSolid( solidIDs[i] ); solid = _grid->GetSolid( solidIDs[i] );
ComputeElements( solid, i ); ComputeElements( solid, i );
if ( !_volumeDefs._nodes.empty() && i < solidIDs.size() - 1 ) if ( !_volumeDefs._nodes.empty() && i < nbSolids - 1 )
_volumeDefs.SetNext( new _volumeDef( _volumeDefs )); _volumeDefs.SetNext( new _volumeDef( _volumeDefs ));
} }
return; return;
@ -3238,6 +3237,7 @@ namespace
// add not split hexahedra to the mesh // add not split hexahedra to the mesh
int nbAdded = 0; int nbAdded = 0;
TGeomID solidIDs[20];
vector< Hexahedron* > intHexa; intHexa.reserve( nbIntHex ); vector< Hexahedron* > intHexa; intHexa.reserve( nbIntHex );
vector< const SMDS_MeshElement* > boundaryVolumes; boundaryVolumes.reserve( nbIntHex * 1.1 ); vector< const SMDS_MeshElement* > boundaryVolumes; boundaryVolumes.reserve( nbIntHex * 1.1 );
for ( size_t i = 0; i < allHexa.size(); ++i ) for ( size_t i = 0; i < allHexa.size(); ++i )
@ -3273,7 +3273,8 @@ namespace
} }
else else
{ {
solidID = getSolids()[0]; getSolids( solidIDs );
solidID = solidIDs[0];
} }
mesh->SetMeshElementOnShape( el, solidID ); mesh->SetMeshElementOnShape( el, solidID );
++nbAdded; ++nbAdded;