ForkMaster/smesh
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/smesh.git synced 2024-12-27 09:50:34 +05:00
Code Issues Packages Projects Releases Wiki Activity

23444: EDF 14244 - Viscous Layer

Browse Source 
fix a regression (too limited thickness) after the previous commit
This commit is contained in:
eap 2017-06-26 18:39:30 +03:00
parent 7647033197
commit 6466454bba
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/StdMeshers/StdMeshers_ViscousLayers.cxx
View File

@ -500,6 +500,7 @@ namespace VISCOUS_3D
gp_Ax1 LastSegment(double& segLen, _EdgesOnShape& eos) const; gp_Ax1 LastSegment(double& segLen, _EdgesOnShape& eos) const;
gp_XY LastUV( const TopoDS_Face& F, _EdgesOnShape& eos, int which=-1 ) const; gp_XY LastUV( const TopoDS_Face& F, _EdgesOnShape& eos, int which=-1 ) const;
bool IsOnEdge() const { return _2neibors; } bool IsOnEdge() const { return _2neibors; }
bool IsOnFace() const { return ( _nodes[0]->GetPosition()->GetDim() == 2 ); }
gp_XYZ Copy( _LayerEdge& other, _EdgesOnShape& eos, SMESH_MesherHelper& helper ); gp_XYZ Copy( _LayerEdge& other, _EdgesOnShape& eos, SMESH_MesherHelper& helper );
void SetCosin( double cosin ); void SetCosin( double cosin );
void SetNormal( const gp_XYZ& n ) { _normal = n; } void SetNormal( const gp_XYZ& n ) { _normal = n; }
@ -4908,8 +4909,8 @@ bool _ViscousBuilder::smoothAndCheck(_SolidData& data,
_LayerEdge* edge = eos._edges[i]; _LayerEdge* edge = eos._edges[i];
if ( edge->_nodes.size() < 2 ) continue; if ( edge->_nodes.size() < 2 ) continue;
SMESH_TNodeXYZ tgtXYZ = edge->_nodes.back(); SMESH_TNodeXYZ tgtXYZ = edge->_nodes.back();
SMESH_TNodeXYZ prevXYZ = edge->_nodes[0]; //SMESH_TNodeXYZ prevXYZ = edge->_nodes[0];
//gp_XYZ prevXYZ = edge->PrevCheckPos( &eos ); gp_XYZ prevXYZ = edge->PrevCheckPos( &eos );
//const gp_XYZ& prevXYZ = edge->PrevPos(); //const gp_XYZ& prevXYZ = edge->PrevPos();
for ( size_t j = 0; j < edge->_simplices.size(); ++j ) for ( size_t j = 0; j < edge->_simplices.size(); ++j )
if ( !edge->_simplices[j].IsForward( &prevXYZ, &tgtXYZ, vol )) if ( !edge->_simplices[j].IsForward( &prevXYZ, &tgtXYZ, vol ))
@ -7020,9 +7021,10 @@ bool _ViscousBuilder::updateNormals( _SolidData& data,
for ( e2neIt = edge2newEdge.begin(); e2neIt != edge2newEdge.end(); ++e2neIt ) for ( e2neIt = edge2newEdge.begin(); e2neIt != edge2newEdge.end(); ++e2neIt )
{ {
_LayerEdge* edge = e2neIt->first; _LayerEdge* edge = e2neIt->first;
if ( edge->Is( _LayerEdge::BLOCKED )) continue;
_LayerEdge& newEdge = e2neIt->second; _LayerEdge& newEdge = e2neIt->second;
_EdgesOnShape* eos = data.GetShapeEdges( edge ); _EdgesOnShape* eos = data.GetShapeEdges( edge );
if ( edge->Is( _LayerEdge::BLOCKED && newEdge._maxLen > edge->_len ))
continue;
// Check if a new _normal is OK: // Check if a new _normal is OK:
newEdge._normal.Normalize(); newEdge._normal.Normalize();
@ -7929,7 +7931,7 @@ bool _LayerEdge::FindIntersection( SMESH_ElementSearcher& searcher,
gp_XYZ _LayerEdge::PrevCheckPos( _EdgesOnShape* eos ) const gp_XYZ _LayerEdge::PrevCheckPos( _EdgesOnShape* eos ) const
{ {
size_t i = Is( NORMAL_UPDATED ) ? _pos.size()-2 : 0; size_t i = Is( NORMAL_UPDATED ) && IsOnFace() ? _pos.size()-2 : 0;
if ( !eos || eos->_sWOL.IsNull() ) if ( !eos || eos->_sWOL.IsNull() )
return _pos[ i ]; return _pos[ i ];
@ -9489,7 +9491,7 @@ void _LayerEdge::Block( _SolidData& data )
{ {
_EdgesOnShape* eos = data.GetShapeEdges( neibor ); _EdgesOnShape* eos = data.GetShapeEdges( neibor );
while ( neibor->_len > neibor->_maxLen && while ( neibor->_len > neibor->_maxLen &&
neibor->NbSteps() > 1 ) neibor->NbSteps() > 0 )
neibor->InvalidateStep( neibor->NbSteps(), *eos, /*restoreLength=*/true ); neibor->InvalidateStep( neibor->NbSteps(), *eos, /*restoreLength=*/true );
neibor->SetNewLength( neibor->_maxLen, *eos, data.GetHelper() ); neibor->SetNewLength( neibor->_maxLen, *eos, data.GetHelper() );
//neibor->Block( data ); //neibor->Block( data );
@ -9541,6 +9543,9 @@ void _LayerEdge::InvalidateStep( size_t curStep, const _EdgesOnShape& eos, bool
if ( restoreLength ) if ( restoreLength )
{ {
if ( NbSteps() == 0 )
_len = 0.;
else
_len -= ( nXYZ.XYZ() - curXYZ ).Modulus() / _lenFactor; _len -= ( nXYZ.XYZ() - curXYZ ).Modulus() / _lenFactor;
} }
} }