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

0021940: EDF 2460 SMESH : Issue with ConvertToQuadratic

Browse Source 
1) Take FACE periodicity into accound if the FACE has no seam EDGE
In FixQuadraticElements():
2) Correctly enable fixing node parameters
3) detect curved links 2D by links on EDGES only
This commit is contained in:
eap 2012-11-13 11:22:37 +00:00
parent 5894f538ab
commit 405388e7fa
1 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/SMESH/SMESH_MesherHelper.cxx
View File

@ -283,6 +283,18 @@ void SMESH_MesherHelper::SetSubShape(const TopoDS_Shape& aSh)
myDegenShapeIds.insert( meshDS->ShapeToIndex( v.Current() )); myDegenShapeIds.insert( meshDS->ShapeToIndex( v.Current() ));
} }
} }
if ( !myDegenShapeIds.empty() && !myParIndex ) {
if ( surface->IsUPeriodic() || surface->IsUClosed() ) {
myParIndex |= U_periodic;
myPar1[0] = surf.FirstUParameter();
myPar2[0] = surf.LastUParameter();
}
else if ( surface->IsVPeriodic() || surface->IsVClosed() ) {
myParIndex |= V_periodic;
myPar1[1] = surf.FirstVParameter();
myPar2[1] = surf.LastVParameter();
}
}
} }
} }
} }
@ -3428,7 +3440,7 @@ namespace { // Structures used by FixQuadraticElements()
*/ */
//======================================================================= //=======================================================================
void SMESH_MesherHelper::FixQuadraticElements(SMESH_ComputeErrorPtr& error, void SMESH_MesherHelper::FixQuadraticElements(SMESH_ComputeErrorPtr& compError,
bool volumeOnly) bool volumeOnly)
{ {
// setenv NO_FixQuadraticElements to know if FixQuadraticElements() is guilty of bad conversion // setenv NO_FixQuadraticElements to know if FixQuadraticElements() is guilty of bad conversion
@ -3462,7 +3474,8 @@ void SMESH_MesherHelper::FixQuadraticElements(SMESH_ComputeErrorPtr& error,
#endif #endif
SMESH_MesherHelper h(*myMesh); SMESH_MesherHelper h(*myMesh);
h.SetSubShape( s.Current() ); h.SetSubShape( s.Current() );
h.FixQuadraticElements( error, false ); h.ToFixNodeParameters(true);
h.FixQuadraticElements( compError, false );
} }
} }
// fix nodes on geom faces // fix nodes on geom faces
@ -3473,12 +3486,12 @@ void SMESH_MesherHelper::FixQuadraticElements(SMESH_ComputeErrorPtr& error,
MSG("FIX FACE " << nbfaces-- << " #" << GetMeshDS()->ShapeToIndex(fIt.Key())); MSG("FIX FACE " << nbfaces-- << " #" << GetMeshDS()->ShapeToIndex(fIt.Key()));
SMESH_MesherHelper h(*myMesh); SMESH_MesherHelper h(*myMesh);
h.SetSubShape( fIt.Key() ); h.SetSubShape( fIt.Key() );
h.FixQuadraticElements( error, true);
h.ToFixNodeParameters(true); h.ToFixNodeParameters(true);
h.FixQuadraticElements( compError, true);
} }
//perf_print_all_meters(1); //perf_print_all_meters(1);
if ( error && error->myName == EDITERR_NO_MEDIUM_ON_GEOM ) if ( compError && compError->myName == EDITERR_NO_MEDIUM_ON_GEOM )
error->myComment = "during conversion to quadratic, " compError->myComment = "during conversion to quadratic, "
"some medium nodes were not placed on geometry to avoid distorting elements"; "some medium nodes were not placed on geometry to avoid distorting elements";
return; return;
} }
@ -3521,7 +3534,7 @@ void SMESH_MesherHelper::FixQuadraticElements(SMESH_ComputeErrorPtr& error,
// Issue 0020982 // Issue 0020982
// Move medium nodes to the link middle for elements whose corner nodes // Move medium nodes to the link middle for elements whose corner nodes
// are out of geometrical boundary to fix distorted elements. // are out of geometrical boundary to fix distorted elements.
force3DOutOfBoundary( *this, error ); force3DOutOfBoundary( *this, compError );
if ( elemType == SMDSAbs_Volume ) if ( elemType == SMDSAbs_Volume )
{ {
@ -3595,7 +3608,9 @@ void SMESH_MesherHelper::FixQuadraticElements(SMESH_ComputeErrorPtr& error,
QLink link( face->GetNode(iN), face->GetNode((iN+1)%nbN), face->GetNode(iN+nbN) ); QLink link( face->GetNode(iN), face->GetNode((iN+1)%nbN), face->GetNode(iN+nbN) );
pLink = links.insert( link ).first; pLink = links.insert( link ).first;
faceLinks[ iN ] = & *pLink; faceLinks[ iN ] = & *pLink;
if ( !isCurved ) if ( !isCurved &&
link.node1()->GetPosition()->GetTypeOfPosition() < 2 &&
link.node2()->GetPosition()->GetTypeOfPosition() < 2 )
isCurved = !link.IsStraight(); isCurved = !link.IsStraight();
} }
// store QFace // store QFace