Salome HOME
projects
/
modules
/
smesh.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
0a33396
)
Fix regression SALOME_TESTS/Grids/smesh/viscous_layers_00/A6
author
eap
<eap@opencascade.com>
Thu, 8 Sep 2016 16:15:49 +0000
(19:15 +0300)
committer
eap
<eap@opencascade.com>
Thu, 8 Sep 2016 16:15:49 +0000
(19:15 +0300)
src/StdMeshers/StdMeshers_ViscousLayers.cxx
patch
|
blob
|
history
diff --git
a/src/StdMeshers/StdMeshers_ViscousLayers.cxx
b/src/StdMeshers/StdMeshers_ViscousLayers.cxx
index d6fabf343f92780aecabbd424f602484995a72d4..1ebf95af9e79c847b7f01659c13ad0e6ebd68cb6 100644
(file)
--- a/
src/StdMeshers/StdMeshers_ViscousLayers.cxx
+++ b/
src/StdMeshers/StdMeshers_ViscousLayers.cxx
@@
-95,7
+95,7
@@
#include <string>
#ifdef _DEBUG_
#include <string>
#ifdef _DEBUG_
-#define __myDEBUG
+
//
#define __myDEBUG
//#define __NOT_INVALIDATE_BAD_SMOOTH
//#define __NODES_AT_POS
#endif
//#define __NOT_INVALIDATE_BAD_SMOOTH
//#define __NODES_AT_POS
#endif
@@
-3395,11
+3395,16
@@
bool _ViscousBuilder::setEdgeData(_LayerEdge& edge,
if ( nbOkNorms == 0 )
return error(SMESH_Comment("Can't get normal to node ") << node->GetID(), data._index);
if ( nbOkNorms == 0 )
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 )
{
// opposite normals, re-get normals at shifted positions (IPAL 52426)
edge._normal.SetCoord( 0,0,0 );
if ( edge._normal.Modulus() < 1e-3 && nbOkNorms > 1 )
{
// opposite normals, re-get normals at shifted positions (IPAL 52426)
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;
geomNorm = getFaceNormal( node, F, helper, normOK, /*shiftInside=*/true );
{
const TopoDS_Face& F = face2Norm[iF].first;
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