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

[SALOME Forum] Viscous Layers on a complex geometry

Browse Source 
fix getFaceDir( const TopoDS_Face& F, const TopoDS_Vertex& fromV, ... )
for a vertex where 2 collinear EDGE's meet
This commit is contained in:
eap 2012-11-29 10:16:07 +00:00
parent ee5cb3d25c
commit 38ff6d2f27
1 changed files with 24 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/StdMeshers/StdMeshers_ViscousLayers.cxx
View File

@ -265,6 +265,7 @@ namespace VISCOUS_3D
{ {
double _r; // radius double _r; // radius
double _k; // factor to correct node smoothed position double _k; // factor to correct node smoothed position
double _h2lenRatio; // avgNormProj / (2*avgDist)
public: public:
static _Curvature* New( double avgNormProj, double avgDist ) static _Curvature* New( double avgNormProj, double avgDist )
{ {
@ -275,10 +276,12 @@ namespace VISCOUS_3D
c->_r = avgDist * avgDist / avgNormProj; c->_r = avgDist * avgDist / avgNormProj;
c->_k = avgDist * avgDist / c->_r / c->_r; c->_k = avgDist * avgDist / c->_r / c->_r;
c->_k *= ( c->_r < 0 ? 1/1.1 : 1.1 ); // not to be too restrictive c->_k *= ( c->_r < 0 ? 1/1.1 : 1.1 ); // not to be too restrictive
c->_h2lenRatio = avgNormProj / ( avgDist + avgDist );
} }
return c; return c;
} }
double lenDelta(double len) const { return _k * ( _r + len ); } double lenDelta(double len) const { return _k * ( _r + len ); }
double lenDeltaByDist(double dist) const { return dist * _h2lenRatio; }
}; };
struct _LayerEdge; struct _LayerEdge;
//-------------------------------------------------------------------------------- //--------------------------------------------------------------------------------
@ -730,27 +733,30 @@ namespace
gp_XYZ dir(0,0,0); gp_XYZ dir(0,0,0);
if ( !( ok = ( edges.size() > 0 ))) return dir; if ( !( ok = ( edges.size() > 0 ))) return dir;
// get average dir of edges going fromV // get average dir of edges going fromV
gp_Vec edgeDir; gp_XYZ edgeDir;
for ( unsigned i = 0; i < edges.size(); ++i ) //if ( edges.size() > 1 )
{ for ( unsigned i = 0; i < edges.size(); ++i )
edgeDir = getEdgeDir( edges[i], fromV ); {
double size2 = edgeDir.SquareMagnitude(); edgeDir = getEdgeDir( edges[i], fromV );
if ( size2 > numeric_limits<double>::min() ) double size2 = edgeDir.SquareModulus();
edgeDir /= sqrt( size2 ); if ( size2 > numeric_limits<double>::min() )
else edgeDir /= sqrt( size2 );
ok = false; else
dir += edgeDir.XYZ(); ok = false;
} dir += edgeDir;
}
gp_XYZ fromEdgeDir = getFaceDir( F, edges[0], node, helper, ok ); gp_XYZ fromEdgeDir = getFaceDir( F, edges[0], node, helper, ok );
if ( edges.size() == 1 || dir.SquareModulus() < 1e-10) if ( edges.size() == 1 )
dir = fromEdgeDir; dir = fromEdgeDir;
else if ( dir.SquareModulus() < 0.1 ) // ~< 20 degrees
dir = fromEdgeDir + getFaceDir( F, edges[1], node, helper, ok );
else if ( dir * fromEdgeDir < 0 ) else if ( dir * fromEdgeDir < 0 )
dir *= -1; dir *= -1;
if ( ok ) if ( ok )
{ {
//dir /= edges.size(); //dir /= edges.size();
if ( cosin ) { if ( cosin ) {
double angle = edgeDir.Angle( dir ); double angle = gp_Vec( edgeDir ).Angle( dir );
*cosin = cos( angle ); *cosin = cos( angle );
} }
} }
@ -1385,7 +1391,7 @@ bool _ViscousBuilder::makeLayer(_SolidData& data)
if ( data._stepSize < 1. ) if ( data._stepSize < 1. )
data._epsilon *= data._stepSize; data._epsilon *= data._stepSize;
// Put _LayerEdge's into a vector // Put _LayerEdge's into the vector data._edges
if ( !sortEdges( data, edgesByGeom )) if ( !sortEdges( data, edgesByGeom ))
return false; return false;
@ -1709,8 +1715,8 @@ bool _ViscousBuilder::setEdgeData(_LayerEdge& edge,
} }
case SMDS_TOP_VERTEX: { case SMDS_TOP_VERTEX: {
TopoDS_Vertex V = TopoDS::Vertex( helper.GetSubShapeByNode( node, getMeshDS())); TopoDS_Vertex V = TopoDS::Vertex( helper.GetSubShapeByNode( node, getMeshDS()));
gp_Vec inFaceDir = getFaceDir( F, V, node, helper, normOK); gp_XYZ inFaceDir = getFaceDir( F, V, node, helper, normOK);
double angle = inFaceDir.Angle( edge._normal ); // [0,PI] double angle = gp_Vec( inFaceDir).Angle( edge._normal ); // [0,PI]
edge._cosin = cos( angle ); edge._cosin = cos( angle );
//cout << "Cosin on VERTEX " << edge._cosin << " node " << node->GetID() << endl; //cout << "Cosin on VERTEX " << edge._cosin << " node " << node->GetID() << endl;
break; break;
@ -3061,7 +3067,8 @@ bool _LayerEdge::SmoothOnEdge(Handle(Geom_Surface)& surface,
double lenDelta = 0; double lenDelta = 0;
if ( _curvature ) if ( _curvature )
{ {
lenDelta = _curvature->lenDelta( _len ); //lenDelta = _curvature->lenDelta( _len );
lenDelta = _curvature->lenDeltaByDist( dist01 );
newPos.ChangeCoord() += _normal * lenDelta; newPos.ChangeCoord() += _normal * lenDelta;
} }