ForkMaster/smesh
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/smesh.git synced 2025-01-14 02:30:33 +05:00
Code Issues Packages Projects Releases Wiki Activity

23457: EDF 11636 - Mesh with Viscous Layer fails

Browse Source
This commit is contained in:
eap 2017-06-21 20:11:14 +03:00
parent f3a96580b4
commit e956f25bc6
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/StdMeshers/StdMeshers_ViscousLayers.cxx
View File

@ -4908,7 +4908,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();
gp_XYZ prevXYZ = edge->PrevCheckPos( &eos ); SMESH_TNodeXYZ prevXYZ = edge->_nodes[0];
//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 ))
@ -5916,8 +5917,9 @@ bool _Smoother1D::smoothComplexEdge( _SolidData& data,
// project tgt nodes of extreme _LayerEdge's to the offset segments // project tgt nodes of extreme _LayerEdge's to the offset segments
// ----------------------------------------------------------------- // -----------------------------------------------------------------
if ( e[0]->Is( _LayerEdge::NORMAL_UPDATED )) _iSeg[0] = 0; const int updatedOrBlocked = _LayerEdge::NORMAL_UPDATED | _LayerEdge::BLOCKED;
if ( e[1]->Is( _LayerEdge::NORMAL_UPDATED )) _iSeg[1] = _offPoints.size()-2; if ( e[0]->Is( updatedOrBlocked )) _iSeg[0] = 0;
if ( e[1]->Is( updatedOrBlocked )) _iSeg[1] = _offPoints.size()-2;
gp_Pnt pExtreme[2], pProj[2]; gp_Pnt pExtreme[2], pProj[2];
for ( int is2nd = 0; is2nd < 2; ++is2nd ) for ( int is2nd = 0; is2nd < 2; ++is2nd )
@ -5973,10 +5975,14 @@ bool _Smoother1D::smoothComplexEdge( _SolidData& data,
gp_Vec vDiv1( pExtreme[1], pProj[1] ); gp_Vec vDiv1( pExtreme[1], pProj[1] );
double d0 = vDiv0.Magnitude(); double d0 = vDiv0.Magnitude();
double d1 = vDiv1.Magnitude(); double d1 = vDiv1.Magnitude();
if ( e[0]->Is( _LayerEdge::BLOCKED )) {
if ( e[0]->_normal * vDiv0.XYZ() < 0 ) e[0]->_len += d0; if ( e[0]->_normal * vDiv0.XYZ() < 0 ) e[0]->_len += d0;
else e[0]->_len -= d0; else e[0]->_len -= d0;
}
if ( e[1]->Is( _LayerEdge::BLOCKED )) {
if ( e[1]->_normal * vDiv1.XYZ() < 0 ) e[1]->_len += d1; if ( e[1]->_normal * vDiv1.XYZ() < 0 ) e[1]->_len += d1;
else e[1]->_len -= d1; else e[1]->_len -= d1;
}
// --------------------------------------------------------------------------------- // ---------------------------------------------------------------------------------
// compute normalized length of the offset segments located between the projections // compute normalized length of the offset segments located between the projections