ForkMaster/smesh
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/smesh.git synced 2025-04-03 06:34:29 +05:00
Code Issues Packages Projects Releases Wiki Activity

Regression SALOME_TESTS/Grids/smesh/viscous_layers_01/B8

Browse Source 
Fix negative volumes
This commit is contained in:
eap 2017-09-19 14:38:30 +03:00
parent 25d9ba81c5
commit 400f6d87de
1 changed files with 39 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/StdMeshers/StdMeshers_ViscousLayers.cxx
View File

@ -501,6 +501,7 @@ namespace VISCOUS_3D
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 ); } bool IsOnFace() const { return ( _nodes[0]->GetPosition()->GetDim() == 2 ); }
int BaseShapeDim() const { return _nodes[0]->GetPosition()->GetDim(); }
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; }
@ -9673,10 +9674,23 @@ void _LayerEdge::SmoothPos( const vector< double >& segLen, const double tol )
int iSmoothed = GetSmoothedPos( tol ); int iSmoothed = GetSmoothedPos( tol );
if ( !iSmoothed ) return; if ( !iSmoothed ) return;
//if ( 1 || Is( DISTORTED ))
{
gp_XYZ normal = _normal; gp_XYZ normal = _normal;
if ( Is( NORMAL_UPDATED )) if ( Is( NORMAL_UPDATED ))
{
double minDot = 1;
for ( size_t i = 0; i < _neibors.size(); ++i )
{
if ( _neibors[i]->IsOnFace() )
{
double dot = _normal * _neibors[i]->_normal;
if ( dot < minDot )
{
normal = _neibors[i]->_normal;
minDot = dot;
}
}
}
if ( minDot == 1. )
for ( size_t i = 1; i < _pos.size(); ++i ) for ( size_t i = 1; i < _pos.size(); ++i )
{ {
normal = _pos[i] - _pos[0]; normal = _pos[i] - _pos[0];
@ -9687,6 +9701,7 @@ void _LayerEdge::SmoothPos( const vector< double >& segLen, const double tol )
break; break;
} }
} }
}
const double r = 0.2; const double r = 0.2;
for ( int iter = 0; iter < 50; ++iter ) for ( int iter = 0; iter < 50; ++iter )
{ {
@ -9708,21 +9723,7 @@ void _LayerEdge::SmoothPos( const vector< double >& segLen, const double tol )
if ( minDot > 0.5 * 0.5 ) if ( minDot > 0.5 * 0.5 )
break; break;
} }
} return;
// else
// {
// for ( size_t i = 1; i < _pos.size()-1; ++i )
// {
// if ((int) i < iSmoothed && ( segLen[i] / segLen.back() < 0.5 ))
// continue;
// double wgt = segLen[i] / segLen.back();
// gp_XYZ normPos = _pos[0] + _normal * wgt * _len;
// gp_XYZ tgtPos = ( 1 - wgt ) * _pos[0] + wgt * _pos.back();
// gp_XYZ newPos = ( 1 - wgt ) * normPos + wgt * tgtPos;
// _pos[i] = newPos;
// }
// }
} }
//================================================================================ //================================================================================