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

Regression of 21859: Add conversion from QUAD8 to QUAD9 and from HEXA20 to HEXA27

Browse Source
This commit is contained in:
eap 2014-10-20 19:08:24 +04:00
parent 54f2672f6a
commit 82d27750a5
1 changed files with 33 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/SMESH/SMESH_MesherHelper.cxx
View File

@ -254,25 +254,49 @@ void SMESH_MesherHelper::SetSubShape(const TopoDS_Shape& aSh)
myPar2[1] = surf.LastVParameter(); myPar2[1] = surf.LastVParameter();
} }
gp_Pnt2d uv1, uv2;
for (TopExp_Explorer exp( face, TopAbs_EDGE ); exp.More(); exp.Next()) for (TopExp_Explorer exp( face, TopAbs_EDGE ); exp.More(); exp.Next())
{ {
// look for a "seam" edge, actually an edge on period boundary // look for a "seam" edge, a real seam or an edge on period boundary
const TopoDS_Edge& edge = TopoDS::Edge( exp.Current() ); TopoDS_Edge edge = TopoDS::Edge( exp.Current() );
if ( myParIndex ) if ( myParIndex )
{ {
BRep_Tool::UVPoints( edge, face, uv1, uv2 );
const double du = Abs( uv1.Coord(1) - uv2.Coord(1) );
const double dv = Abs( uv1.Coord(2) - uv2.Coord(2) );
bool isSeam = BRep_Tool::IsClosed( edge, face ); bool isSeam = BRep_Tool::IsClosed( edge, face );
if ( !isSeam ) if ( isSeam ) // real seam - having two pcurves on face
{ {
gp_Pnt2d uv1, uv2; // pcurve can lie not on pediod boundary (22582, mesh_Quadratic_01/C9)
BRep_Tool::UVPoints( edge, face, uv1, uv2 ); if ( du < dv )
const double du = Abs( uv1.Coord(1) - uv2.Coord(1) ); {
const double dv = Abs( uv1.Coord(2) - uv2.Coord(2) ); double u1 = uv1.Coord(1);
if ( du < Precision::PConfusion() ) edge.Reverse();
BRep_Tool::UVPoints( edge, face, uv1, uv2 );
double u2 = uv1.Coord(1);
myPar1[0] = Min( u1, u2 );
myPar2[0] = Max( u1, u2 );
}
else
{
double v1 = uv1.Coord(2);
edge.Reverse();
BRep_Tool::UVPoints( edge, face, uv1, uv2 );
double v2 = uv1.Coord(2);
myPar1[1] = Min( v1, v2 );
myPar2[1] = Max( v1, v2 );
}
}
else //if ( !isSeam )
{
// one pcurve but on period boundary (22772, mesh_Quadratic_01/D1)
if (( myParIndex & U_periodic ) && du < Precision::PConfusion() )
{ {
isSeam = ( Abs( uv1.Coord(1) - myPar1[0] ) < Precision::PConfusion() || isSeam = ( Abs( uv1.Coord(1) - myPar1[0] ) < Precision::PConfusion() ||
Abs( uv1.Coord(1) - myPar2[0] ) < Precision::PConfusion() ); Abs( uv1.Coord(1) - myPar2[0] ) < Precision::PConfusion() );
} }
else if ( dv < Precision::PConfusion() ) else if (( myParIndex & V_periodic ) && dv < Precision::PConfusion() )
{ {
isSeam = ( Abs( uv1.Coord(2) - myPar1[1] ) < Precision::PConfusion() || isSeam = ( Abs( uv1.Coord(2) - myPar1[1] ) < Precision::PConfusion() ||
Abs( uv1.Coord(2) - myPar2[1] ) < Precision::PConfusion() ); Abs( uv1.Coord(2) - myPar2[1] ) < Precision::PConfusion() );