Fix regression SALOME_TESTS/Grids/smesh/viscous_layers_00/A6

This commit is contained in:
eap 2016-09-08 19:15:49 +03:00
parent 0a3339671c
commit 560d5a794f

View File

@ -95,7 +95,7 @@
#include <string> #include <string>
#ifdef _DEBUG_ #ifdef _DEBUG_
#define __myDEBUG //#define __myDEBUG
//#define __NOT_INVALIDATE_BAD_SMOOTH //#define __NOT_INVALIDATE_BAD_SMOOTH
//#define __NODES_AT_POS //#define __NODES_AT_POS
#endif #endif
@ -3395,11 +3395,16 @@ bool _ViscousBuilder::setEdgeData(_LayerEdge& edge,
if ( nbOkNorms == 0 ) if ( nbOkNorms == 0 )
return error(SMESH_Comment("Can't get normal to node ") << node->GetID(), data._index); return error(SMESH_Comment("Can't get normal to node ") << node->GetID(), data._index);
if ( totalNbFaces >= 3 )
{
edge._normal = getNormalByOffset( &edge, face2Norm, totalNbFaces, fromVonF );
}
if ( edge._normal.Modulus() < 1e-3 && nbOkNorms > 1 ) if ( edge._normal.Modulus() < 1e-3 && nbOkNorms > 1 )
{ {
// opposite normals, re-get normals at shifted positions (IPAL 52426) // opposite normals, re-get normals at shifted positions (IPAL 52426)
edge._normal.SetCoord( 0,0,0 ); edge._normal.SetCoord( 0,0,0 );
for ( int iF = 0; iF < totalNbFaces; ++iF ) for ( int iF = 0; iF < totalNbFaces - fromVonF; ++iF )
{ {
const TopoDS_Face& F = face2Norm[iF].first; const TopoDS_Face& F = face2Norm[iF].first;
geomNorm = getFaceNormal( node, F, helper, normOK, /*shiftInside=*/true ); geomNorm = getFaceNormal( node, F, helper, normOK, /*shiftInside=*/true );
@ -3410,11 +3415,6 @@ bool _ViscousBuilder::setEdgeData(_LayerEdge& edge,
edge._normal += face2Norm[ iF ].second; edge._normal += face2Norm[ iF ].second;
} }
} }
if ( totalNbFaces >= 3 )
{
edge._normal = getNormalByOffset( &edge, face2Norm, totalNbFaces, fromVonF );
}
} }
} }
else // !useGeometry - get _normal using surrounding mesh faces else // !useGeometry - get _normal using surrounding mesh faces