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

22830: EDF 9557 SMESH: Quadratic conversion of a mesh fails (note 0019010)

Browse Source 
Problem with FACE having a bad tolerance
This commit is contained in:
eap 2015-01-22 16:15:34 +03:00 committed by vsr
parent 929ba51821
commit 750edb36ee
1 changed files with 28 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
src/SMESH/SMESH_MesherHelper.cxx
View File

@ -579,7 +579,7 @@ gp_XY SMESH_MesherHelper::GetNodeUV(const TopoDS_Face& F,
const SMDS_FacePosition* fpos = static_cast<const SMDS_FacePosition*>( Pos ); const SMDS_FacePosition* fpos = static_cast<const SMDS_FacePosition*>( Pos );
uv.SetCoord( fpos->GetUParameter(), fpos->GetVParameter() ); uv.SetCoord( fpos->GetUParameter(), fpos->GetVParameter() );
if ( check ) if ( check )
uvOK = CheckNodeUV( F, n, uv.ChangeCoord(), 10*getFaceMaxTol( F )); uvOK = CheckNodeUV( F, n, uv.ChangeCoord(), 2.*getFaceMaxTol( F )); // 2. from 22830
} }
else if ( Pos->GetTypeOfPosition() == SMDS_TOP_EDGE ) else if ( Pos->GetTypeOfPosition() == SMDS_TOP_EDGE )
{ {
@ -595,7 +595,7 @@ gp_XY SMESH_MesherHelper::GetNodeUV(const TopoDS_Face& F,
if ( validU ) uv = C2d->Value( u ); if ( validU ) uv = C2d->Value( u );
else uv.SetCoord( Precision::Infinite(),0.); else uv.SetCoord( Precision::Infinite(),0.);
if ( check || !validU ) if ( check || !validU )
uvOK = CheckNodeUV( F, n, uv.ChangeCoord(), 10*getFaceMaxTol( F ),/*force=*/ !validU ); uvOK = CheckNodeUV( F, n, uv.ChangeCoord(), 2.*getFaceMaxTol( F ),/*force=*/ !validU );
// for a node on a seam EDGE select one of UVs on 2 pcurves // for a node on a seam EDGE select one of UVs on 2 pcurves
if ( n2 && IsSeamShape( edgeID )) if ( n2 && IsSeamShape( edgeID ))
@ -691,10 +691,10 @@ gp_XY SMESH_MesherHelper::GetNodeUV(const TopoDS_Face& F,
} }
else else
{ {
uvOK = CheckNodeUV( F, n, uv.ChangeCoord(), 10*getFaceMaxTol( F )); uvOK = CheckNodeUV( F, n, uv.ChangeCoord(), 2.*getFaceMaxTol( F ));
} }
if ( check ) if ( check && !uvOK )
*check = uvOK; *check = uvOK;
return uv.XY(); return uv.XY();
@ -1415,21 +1415,20 @@ const SMDS_MeshNode* SMESH_MesherHelper::GetCentralNode(const SMDS_MeshNode* n1,
TopoDS_Face F; TopoDS_Face F;
gp_XY uvAvg; gp_XY uvAvg;
bool badTria=false;
if ( shapeType == TopAbs_FACE ) if ( shapeType == TopAbs_FACE )
{ {
F = TopoDS::Face( meshDS->IndexToShape( faceID )); F = TopoDS::Face( meshDS->IndexToShape( faceID ));
bool check; bool checkOK = true, badTria = false;
gp_XY uv1 = GetNodeUV( F, n1, n23, &check ); gp_XY uv1 = GetNodeUV( F, n1, n23, &checkOK );
gp_XY uv2 = GetNodeUV( F, n2, n31, &check ); gp_XY uv2 = GetNodeUV( F, n2, n31, &checkOK );
gp_XY uv3 = GetNodeUV( F, n3, n12, &check ); gp_XY uv3 = GetNodeUV( F, n3, n12, &checkOK );
gp_XY uv12 = GetNodeUV( F, n12, n3, &check ); gp_XY uv12 = GetNodeUV( F, n12, n3, &checkOK );
gp_XY uv23 = GetNodeUV( F, n23, n1, &check ); gp_XY uv23 = GetNodeUV( F, n23, n1, &checkOK );
gp_XY uv31 = GetNodeUV( F, n31, n2, &check ); gp_XY uv31 = GetNodeUV( F, n31, n2, &checkOK );
uvAvg = GetCenterUV( uv1,uv2,uv3, uv12,uv23,uv31, &badTria ); uvAvg = GetCenterUV( uv1,uv2,uv3, uv12,uv23,uv31, &badTria );
if ( badTria ) if ( badTria || !checkOK )
force3d = false; force3d = true;
} }
// Create a central node // Create a central node
@ -1499,7 +1498,7 @@ const SMDS_MeshNode* SMESH_MesherHelper::GetMediumNode(const SMDS_MeshNode* n1,
int faceID = -1, edgeID = -1; int faceID = -1, edgeID = -1;
TopoDS_Edge E; double u [2]; TopoDS_Edge E; double u [2];
TopoDS_Face F; gp_XY uv[2]; TopoDS_Face F; gp_XY uv[2];
bool uvOK[2] = { false, false }; bool uvOK[2] = { true, true };
const bool useCurSubShape = ( !myShape.IsNull() && myShape.ShapeType() == TopAbs_EDGE ); const bool useCurSubShape = ( !myShape.IsNull() && myShape.ShapeType() == TopAbs_EDGE );
pair<int, TopAbs_ShapeEnum> pos = GetMediumPos( n1, n2, useCurSubShape, expectedSupport ); pair<int, TopAbs_ShapeEnum> pos = GetMediumPos( n1, n2, useCurSubShape, expectedSupport );
@ -4990,17 +4989,28 @@ void SMESH_MesherHelper::FixQuadraticElements(SMESH_ComputeErrorPtr& compError,
// nodes // nodes
nodes.assign( tria->begin_nodes(), tria->end_nodes() ); nodes.assign( tria->begin_nodes(), tria->end_nodes() );
// UV // UV
bool uvOK = true, badTria;
for ( int i = 0; i < 6; ++i ) for ( int i = 0; i < 6; ++i )
{ {
uv[ i ] = GetNodeUV( F, nodes[i], nodes[(i+1)%3], &checkUV ); uv[ i ] = GetNodeUV( F, nodes[i], nodes[(i+1)%3], &uvOK );
// as this method is used after mesh generation, UV of nodes is not // as this method is used after mesh generation, UV of nodes is not
// updated according to bending links, so we update // updated according to bending links, so we update
if ( nodes[i]->GetPosition()->GetTypeOfPosition() == SMDS_TOP_FACE ) if ( nodes[i]->GetPosition()->GetTypeOfPosition() == SMDS_TOP_FACE )
CheckNodeUV( F, nodes[i], uv[ i ], 2*tol, /*force=*/true ); CheckNodeUV( F, nodes[i], uv[ i ], 2*tol, /*force=*/true );
} }
// move the central node // move the central node
gp_XY uvCent = GetCenterUV( uv[0], uv[1], uv[2], uv[3], uv[4], uv[5] ); gp_Pnt p;
gp_Pnt p = surf->Value( uvCent.X(), uvCent.Y() ).Transformed( loc ); if ( !uvOK || badTria )
{
p = ( SMESH_TNodeXYZ( nodes[3] ) +
SMESH_TNodeXYZ( nodes[4] ) +
SMESH_TNodeXYZ( nodes[5] )) / 3;
}
else
{
gp_XY uvCent = GetCenterUV( uv[0], uv[1], uv[2], uv[3], uv[4], uv[5], &badTria );
p = surf->Value( uvCent.X(), uvCent.Y() ).Transformed( loc );
}
GetMeshDS()->MoveNode( tria->GetNode(6), p.X(), p.Y(), p.Z() ); GetMeshDS()->MoveNode( tria->GetNode(6), p.X(), p.Y(), p.Z() );
} }
} }