ForkMaster/smesh
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/smesh.git synced 2024-12-28 18:30:35 +05:00
Code Issues Packages Projects Releases Wiki Activity

0021821: EDF 2356 SMESH: Wrong GHS3D mesh with Viscous Layer hypothesis

Browse Source 
Log node movement not only in DEBUG mode
This commit is contained in:
eap 2012-09-13 12:25:09 +00:00
parent 0b6314ea9e
commit 5e940de5e3
1 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/StdMeshers/StdMeshers_ViscousLayers.cxx
View File

@ -3377,6 +3377,15 @@ bool _ViscousBuilder::refine(_SolidData& data)
} }
} }
if ( !getMeshDS()->IsEmbeddedMode() )
// Log node movement
for ( unsigned i = 0; i < data._edges.size(); ++i )
{
_LayerEdge& edge = *data._edges[i];
SMESH_TNodeXYZ p ( edge._nodes.back() );
getMeshDS()->MoveNode( p._node, p.X(), p.Y(), p.Z() );
}
// TODO: make quadratic prisms and polyhedrons(?) // TODO: make quadratic prisms and polyhedrons(?)
helper.SetElementsOnShape(true); helper.SetElementsOnShape(true);
@ -3465,7 +3474,7 @@ bool _ViscousBuilder::shrink()
helper.ToFixNodeParameters( true ); helper.ToFixNodeParameters( true );
// EDGE's to shrink // EDGE's to shrink
map< int, _Shrinker1D > e2shrMap; map< TGeomID, _Shrinker1D > e2shrMap;
// loop on FACES to srink mesh on // loop on FACES to srink mesh on
map< TGeomID, _SolidData* >::iterator f2sd = f2sdMap.begin(); map< TGeomID, _SolidData* >::iterator f2sd = f2sdMap.begin();
@ -3635,7 +3644,8 @@ bool _ViscousBuilder::shrink()
for ( unsigned i = 0; i < nodesToSmooth.size(); ++i ) for ( unsigned i = 0; i < nodesToSmooth.size(); ++i )
{ {
moved |= nodesToSmooth[i].Smooth( badNb,surface,helper,refSign, moved |= nodesToSmooth[i].Smooth( badNb,surface,helper,refSign,
/*isCentroidal=*/isConcaveFace,/*set3D=*/false ); /*isCentroidal=*/isConcaveFace,
/*set3D=*/isConcaveFace);
} }
if ( badNb < oldBadNb ) if ( badNb < oldBadNb )
nbNoImpSteps = 0; nbNoImpSteps = 0;
@ -3652,12 +3662,10 @@ bool _ViscousBuilder::shrink()
bool highQuality; bool highQuality;
{ {
const bool hasTria = _mesh->NbTriangles(), hasQuad = _mesh->NbQuadrangles(); const bool hasTria = _mesh->NbTriangles(), hasQuad = _mesh->NbQuadrangles();
if ( hasTria != hasQuad ) if ( hasTria != hasQuad ) {
{
highQuality = hasQuad; highQuality = hasQuad;
} }
else else {
{
set<int> nbNodesSet; set<int> nbNodesSet;
SMDS_ElemIteratorPtr fIt = smDS->GetElements(); SMDS_ElemIteratorPtr fIt = smDS->GetElements();
while ( fIt->more() && nbNodesSet.size() < 2 ) while ( fIt->more() && nbNodesSet.size() < 2 )
@ -3678,6 +3686,14 @@ bool _ViscousBuilder::shrink()
// Set an event listener to clear FACE sub-mesh together with SOLID sub-mesh // Set an event listener to clear FACE sub-mesh together with SOLID sub-mesh
_SrinkShapeListener::ToClearSubMeshWithSolid( sm, data._solid ); _SrinkShapeListener::ToClearSubMeshWithSolid( sm, data._solid );
if ( !getMeshDS()->IsEmbeddedMode() )
// Log node movement
for ( unsigned i = 0; i < nodesToSmooth.size(); ++i )
{
SMESH_TNodeXYZ p ( nodesToSmooth[i]._node );
getMeshDS()->MoveNode( nodesToSmooth[i]._node, p.X(), p.Y(), p.Z() );
}
} // loop on FACES to srink mesh on } // loop on FACES to srink mesh on