TopoDS_Shape SMESH_MesherHelper::GetSubShapeByNode(const SMDS_MeshNode* node,
SMESHDS_Mesh* meshDS)
{
- int shapeID = node->GetPosition()->GetShapeId();
+ int shapeID = node->getshapeId();
if ( 0 < shapeID && shapeID <= meshDS->MaxShapeIndex() )
return meshDS->IndexToShape( shapeID );
else
myTLinkNodeMap.insert( make_pair(link,n12));
}
+//================================================================================
+/*!
+ * \brief Return true if position of nodes on the shape hasn't yet been checked or
+ * the positions proved to be invalid
+ */
+//================================================================================
+
+bool SMESH_MesherHelper::toCheckPosOnShape(int shapeID ) const
+{
+ map< int,bool >::const_iterator id_ok = myNodePosShapesValidity.find( shapeID );
+ return ( id_ok == myNodePosShapesValidity.end() || !id_ok->second );
+}
+
+//================================================================================
+/*!
+ * \brief Set validity of positions of nodes on the shape.
+ * Once set, validity is not changed
+ */
+//================================================================================
+
+void SMESH_MesherHelper::setPosOnShapeValidity(int shapeID, bool ok ) const
+{
+ ((SMESH_MesherHelper*)this)->myNodePosShapesValidity.insert( make_pair( shapeID, ok));
+}
+
//=======================================================================
//function : GetUVOnSeam
//purpose : Select UV on either of 2 pcurves of a seam edge, closest to the given UV
{
// node has position on face
const SMDS_FacePosition* fpos =
- static_cast<const SMDS_FacePosition*>(n->GetPosition().get());
+ static_cast<const SMDS_FacePosition*>(n->GetPosition());
uv.SetCoord(fpos->GetUParameter(),fpos->GetVParameter());
if ( check )
uvOK = CheckNodeUV( F, n, uv.ChangeCoord(), 10*MaxTolerance( F ));
// corresponding edge from face, get pcurve for this
// edge and retrieve value from this pcurve
const SMDS_EdgePosition* epos =
- static_cast<const SMDS_EdgePosition*>(n->GetPosition().get());
- int edgeID = Pos->GetShapeId();
+ static_cast<const SMDS_EdgePosition*>(n->GetPosition());
+ int edgeID = n->getshapeId();
TopoDS_Edge E = TopoDS::Edge(GetMeshDS()->IndexToShape(edgeID));
double f, l, u = epos->GetUParameter();
Handle(Geom2d_Curve) C2d = BRep_Tool::CurveOnSurface(E, F, f, l);
}
else if(Pos->GetTypeOfPosition()==SMDS_TOP_VERTEX)
{
- if ( int vertexID = n->GetPosition()->GetShapeId() ) {
+ if ( int vertexID = n->getshapeId() ) {
const TopoDS_Vertex& V = TopoDS::Vertex(GetMeshDS()->IndexToShape(vertexID));
try {
uv = BRep_Tool::Parameters( V, F );
const double tol,
const bool force) const
{
- if ( force || !myOkNodePosShapes.count( n->GetPosition()->GetShapeId() ))
+ int shapeID = n->getshapeId();
+ if ( force || toCheckPosOnShape( shapeID ))
{
+ double toldis = tol;
+ double tolmin = 1.e-7*myMesh->GetMeshDS()->getMaxDim(); // nodes coordinates are stored in float format
+ if (toldis < tolmin) toldis = tolmin;
// check that uv is correct
TopLoc_Location loc;
Handle(Geom_Surface) surface = BRep_Tool::Surface( F,loc );
if ( !loc.IsIdentity() ) nodePnt.Transform( loc.Transformation().Inverted() );
if ( Precision::IsInfinite( uv.X() ) ||
Precision::IsInfinite( uv.Y() ) ||
- nodePnt.Distance( surface->Value( uv.X(), uv.Y() )) > tol )
+ nodePnt.Distance( surface->Value( uv.X(), uv.Y() )) > toldis )
{
+ setPosOnShapeValidity( shapeID, false );
// uv incorrect, project the node to surface
GeomAPI_ProjectPointOnSurf& projector = GetProjector( F, loc, tol );
projector.Perform( nodePnt );
Quantity_Parameter U,V;
projector.LowerDistanceParameters(U,V);
uv.SetCoord( U,V );
- if ( nodePnt.Distance( surface->Value( U, V )) > tol )
+ if ( nodePnt.Distance( surface->Value( U, V )) > toldis )
{
MESSAGE( "SMESH_MesherHelper::CheckNodeUV(), invalid projection" );
return false;
}
+ // store the fixed UV on the face
+ if ( myShape.IsSame(F) && shapeID == myShapeID )
+ const_cast<SMDS_MeshNode*>(n)->SetPosition
+ ( SMDS_PositionPtr( new SMDS_FacePosition( U, V )));
}
else if ( uv.Modulus() > numeric_limits<double>::min() )
{
- ((SMESH_MesherHelper*) this)->myOkNodePosShapes.insert( n->GetPosition()->GetShapeId() );
+ setPosOnShapeValidity( shapeID, true );
}
}
return true;
const SMDS_PositionPtr pos = n->GetPosition();
if ( pos->GetTypeOfPosition()==SMDS_TOP_EDGE )
{
- const SMDS_EdgePosition* epos = static_cast<const SMDS_EdgePosition*>( pos.get() );
+ const SMDS_EdgePosition* epos = static_cast<const SMDS_EdgePosition*>( pos );
param = epos->GetUParameter();
}
else if( pos->GetTypeOfPosition() == SMDS_TOP_VERTEX )
else
{
SMESHDS_Mesh * meshDS = GetMeshDS();
- int vertexID = pos->GetShapeId();
+ int vertexID = n->getshapeId();
const TopoDS_Vertex& V = TopoDS::Vertex(meshDS->IndexToShape(vertexID));
param = BRep_Tool::Parameter( V, E );
}
double f,l; BRep_Tool::Range( E, f,l );
bool force = ( param < f-tol || param > l+tol );
if ( !force && pos->GetTypeOfPosition()==SMDS_TOP_EDGE )
- force = ( GetMeshDS()->ShapeToIndex( E ) != pos->GetShapeId() );
+ force = ( GetMeshDS()->ShapeToIndex( E ) != n->getshapeId() );
*check = CheckNodeU( E, n, param, 2*tol, force );
}
const bool force,
double* distance) const
{
- if ( force || !myOkNodePosShapes.count( n->GetPosition()->GetShapeId() ))
+ int shapeID = n->getshapeId();
+ if ( force || toCheckPosOnShape( shapeID ))
{
+ double toldis = tol;
+ double tolmin = 1.e-7*myMesh->GetMeshDS()->getMaxDim(); // nodes coordinates are stored in float format
+ if (toldis < tolmin) toldis = tolmin;
// check that u is correct
TopLoc_Location loc; double f,l;
Handle(Geom_Curve) curve = BRep_Tool::Curve( E,loc,f,l );
if ( !loc.IsIdentity() ) nodePnt.Transform( loc.Transformation().Inverted() );
double dist = nodePnt.Distance( curve->Value( u ));
if ( distance ) *distance = dist;
- if ( dist > tol )
+ if ( dist > toldis )
{
+ setPosOnShapeValidity( shapeID, false );
// u incorrect, project the node to the curve
int edgeID = GetMeshDS()->ShapeToIndex( E );
TID2ProjectorOnCurve& i2proj = const_cast< TID2ProjectorOnCurve&>( myEdge2Projector );
u = double( U );
dist = nodePnt.Distance( curve->Value( U ));
if ( distance ) *distance = dist;
- if ( dist > tol )
+ if ( dist > toldis )
{
MESSAGE( "SMESH_MesherHelper::CheckNodeU(), invalid projection" );
+ MESSAGE("distance " << nodePnt.Distance(curve->Value( U )) << " " << toldis);
return false;
}
- //u = double( U );
+ // store the fixed U on the edge
+ if ( myShape.IsSame(E) && shapeID == myShapeID )
+ const_cast<SMDS_MeshNode*>(n)->SetPosition
+ ( SMDS_PositionPtr( new SMDS_EdgePosition( U )));
}
else if ( fabs( u ) > numeric_limits<double>::min() )
{
- ((SMESH_MesherHelper*) this)->myOkNodePosShapes.insert( n->GetPosition()->GetShapeId() );
+ setPosOnShapeValidity( shapeID, true );
}
if (( u < f-tol || u > l+tol ) && force )
{
SMDS_MeshNode* n12;
SMESHDS_Mesh* meshDS = GetMeshDS();
+ if ( IsSeamShape( n1->getshapeId() ))
+ // to get a correct UV of a node on seam, the second node must have checked UV
+ std::swap( n1, n2 );
+
// get type of shape for the new medium node
int faceID = -1, edgeID = -1;
const SMDS_PositionPtr Pos1 = n1->GetPosition();
const SMDS_PositionPtr Pos2 = n2->GetPosition();
+ TopoDS_Edge E; double u [2];
+ TopoDS_Face F; gp_XY uv[2];
+ bool uvOK[2] = { false, false };
+
if( myShape.IsNull() )
{
if( Pos1->GetTypeOfPosition()==SMDS_TOP_FACE ) {
- faceID = Pos1->GetShapeId();
+ faceID = n1->getshapeId();
}
else if( Pos2->GetTypeOfPosition()==SMDS_TOP_FACE ) {
- faceID = Pos2->GetShapeId();
+ faceID = n2->getshapeId();
}
if( Pos1->GetTypeOfPosition()==SMDS_TOP_EDGE ) {
- edgeID = Pos1->GetShapeId();
+ edgeID = n1->getshapeId();
}
if( Pos2->GetTypeOfPosition()==SMDS_TOP_EDGE ) {
- edgeID = Pos2->GetShapeId();
+ edgeID = n2->getshapeId();
}
}
// get positions of the given nodes on shapes
- TopoDS_Edge E; double u [2];
- TopoDS_Face F; gp_XY uv[2];
- bool uvOK[2] = { false, false };
TopAbs_ShapeEnum shapeType = myShape.IsNull() ? TopAbs_SHAPE : myShape.ShapeType();
if ( faceID>0 || shapeType == TopAbs_FACE)
{
{
if ( Pos1->GetTypeOfPosition()==SMDS_TOP_EDGE &&
Pos2->GetTypeOfPosition()==SMDS_TOP_EDGE &&
- Pos1->GetShapeId() != Pos2->GetShapeId() ) // issue 0021006
+ n1->getshapeId() != n2->getshapeId() ) // issue 0021006
return getMediumNodeOnComposedWire(n1,n2,force3d);
if( myShape.IsNull() )
{
if ( uvOK[0] && uvOK[1] )
{
- if ( IsDegenShape( Pos1->GetShapeId() ))
+ if ( IsDegenShape( n1->getshapeId() )) {
if ( myParIndex & U_periodic ) uv[0].SetCoord( 1, uv[1].Coord( 1 ));
else uv[0].SetCoord( 2, uv[1].Coord( 2 ));
- else if ( IsDegenShape( Pos2->GetShapeId() ))
+ }
+ else if ( IsDegenShape( n2->getshapeId() )) {
if ( myParIndex & U_periodic ) uv[1].SetCoord( 1, uv[0].Coord( 1 ));
else uv[1].SetCoord( 2, uv[0].Coord( 2 ));
+ }
TopLoc_Location loc;
Handle(Geom_Surface) S = BRep_Tool::Surface(F,loc);
}
}
}
+
// 3d variant
double x = ( n1->X() + n2->X() )/2.;
double y = ( n1->Y() + n2->Y() )/2.;
double z = ( n1->Z() + n2->Z() )/2.;
n12 = meshDS->AddNode(x,y,z);
+
if ( !F.IsNull() )
{
gp_XY UV = ( uv[0] + uv[1] ) / 2.;
{
meshDS->SetNodeInVolume(n12, myShapeID);
}
+
myTLinkNodeMap.insert( make_pair( link, n12 ));
return n12;
}
return
aMesh->GetMeshDS()->ShapeToIndex( shape ) ||
// PAL16202
- shape.ShapeType() == TopAbs_COMPOUND && aMesh->GetMeshDS()->IsGroupOfSubShapes( shape );
+ (shape.ShapeType() == TopAbs_COMPOUND && aMesh->GetMeshDS()->IsGroupOfSubShapes( shape ));
}
//================================================================================
node2()->GetID() < other.node2()->GetID() :
node1()->GetID() < other.node1()->GetID());
}
- struct PtrComparator {
- bool operator() (const QLink* l1, const QLink* l2 ) const { return *l1 < *l2; }
- };
+// struct PtrComparator {
+// bool operator() (const QLink* l1, const QLink* l2 ) const { return *l1 < *l2; }
+// };
};
// ---------------------------------------------------------
/*!
/*!
* \brief Face shared by two volumes and bound by QLinks
*/
- struct QFace: public TIDSortedElemSet
+ struct QFace: public TIDSortedNodeSet
{
mutable const SMDS_MeshElement* _volumes[2];
mutable vector< const QLink* > _sides;
bool Contains( const SMDS_MeshNode* node ) const { return count(node); }
+ bool IsSpoiled(const QLink* bentLink ) const;
+
TLinkInSet GetBoundaryLink( const TLinkSet& links,
const TChainLink& avoidLink,
TLinkInSet * notBoundaryLink = 0,
ostream& operator << (ostream& out, const QFace& f)
{
out <<"QFace nodes: "/*<< &f << " "*/;
- for ( TIDSortedElemSet::const_iterator n = f.begin(); n != f.end(); ++n )
+ for ( TIDSortedNodeSet::const_iterator n = f.begin(); n != f.end(); ++n )
out << (*n)->GetID() << " ";
out << " \tvolumes: "
<< (f._volumes[0] ? f._volumes[0]->GetID() : 0) << " "
// propagate from quadrangle to neighbour faces
if ( link->MediumPos() >= pos ) {
int nbLinkFaces = link->_faces.size();
- if ( nbLinkFaces == 4 || nbLinkFaces < 4 && link->OnBoundary()) {
+ if ( nbLinkFaces == 4 || (nbLinkFaces < 4 && link->OnBoundary())) {
// hexahedral mesh or boundary quadrangles - goto a continous face
if ( const QFace* f = link->GetContinuesFace( this ))
return f->GetLinkChain( *chLink, chain, pos, error );
return fullLen;
}
+ //================================================================================
+ /*!
+ * \brief Checks if the face is distorted due to bentLink
+ */
+ //================================================================================
+
+ bool QFace::IsSpoiled(const QLink* bentLink ) const
+ {
+ // code is valid for convex faces only
+ gp_XYZ gc(0,0,0);
+ for ( TIDSortedNodeSet::const_iterator n = begin(); n!=end(); ++n)
+ gc += XYZ( *n ) / size();
+ for (unsigned i = 0; i < _sides.size(); ++i )
+ {
+ if ( _sides[i] == bentLink ) continue;
+ gp_Vec linkNorm = _normal ^ gp_Vec( XYZ(_sides[i]->node1()), XYZ(_sides[i]->node2()));
+ gp_Vec vecOut( gc, _sides[i]->MiddlePnt() );
+ if ( linkNorm * vecOut < 0 )
+ linkNorm.Reverse();
+ double mag2 = linkNorm.SquareMagnitude();
+ if ( mag2 > numeric_limits<double>::min() )
+ linkNorm /= sqrt( mag2 );
+ gp_Vec vecBent ( _sides[i]->MiddlePnt(), bentLink->MediumPnt());
+ gp_Vec vecStraight( _sides[i]->MiddlePnt(), bentLink->MiddlePnt());
+ if ( vecBent * linkNorm > -0.1*vecStraight.Magnitude() )
+ return true;
+ }
+ return false;
+
+ }
+
//================================================================================
/*!
* \brief Find pairs of continues faces
TLinkSet linkSet( allLinks.begin(), allLinks.end());
TLinkInSet linkIt = linkSet.begin(), linksEnd = linkSet.end();
- // move in 2d if we are on geom face
-// TopoDS_Face face;
-// TopLoc_Location loc;
-// SMESH_MesherHelper faceHelper( *helper.GetMesh());
-// while ( linkIt->IsBoundary()) ++linkIt;
-// if ( linkIt == linksEnd ) return;
-// if ( (*linkIt)->MediumPos() == SMDS_TOP_FACE ) {
-// bool checkPos = true;
-// TopoDS_Shape f = helper.GetSubShapeByNode( (*linkIt)->_mediumNode, helper.GetMeshDS() );
-// if ( !f.IsNull() && f.ShapeType() == TopAbs_FACE ) {
-// face = TopoDS::Face( f );
-// helper.GetNodeUV( face, (*linkIt)->_mediumNode, 0, &checkPos);
-// if (checkPos)
-// face.Nullify();
-// else
-// faceHelper.SetSubShape( face );
-// }
-// }
for ( linkIt = linkSet.begin(); linkIt != linksEnd; ++linkIt)
{
if ( linkIt->IsBoundary() && !(*linkIt)->IsStraight() && linkIt->_qfaces[0])
{
-// if ( !face.IsNull() ) {
-// const SMDS_MeshNode* inFaceNode =
-// faceHelper.GetNodeUVneedInFaceNode() ? linkIt->_qfaces[0]->GetNodeInFace() : 0;
-// gp_XY uvm = helper.GetNodeUV( face, (*linkIt)->_mediumNode, inFaceNode );
-// gp_XY uv1 = helper.GetNodeUV( face, (*linkIt)->node1(), inFaceNode);
-// gp_XY uv2 = helper.GetNodeUV( face, (*linkIt)->node2(), inFaceNode);
-// gp_XY uvMove = uvm - helper.GetMiddleUV( BRep_Tool::Surface(face,loc), uv1, uv2);
-// gp_Vec move( uvMove.X(), uvMove.Y(), 0 );
-// linkIt->_qfaces[0]->MoveByBoundary( *linkIt, move, linkSet, &faceHelper );
-// }
-// else {
- linkIt->_qfaces[0]->MoveByBoundary( *linkIt, (*linkIt)->_nodeMove, linkSet );
- //}
+ // move iff a boundary link is bent towards inside of a face (issue 0021084)
+ const QFace* face = linkIt->_qfaces[0];
+ gp_XYZ pIn = ( face->_sides[0]->MiddlePnt() +
+ face->_sides[1]->MiddlePnt() +
+ face->_sides[2]->MiddlePnt() ) / 3.;
+ gp_XYZ insideDir( pIn - (*linkIt)->MiddlePnt());
+ bool linkBentInside = ((*linkIt)->_nodeMove.Dot( insideDir ) > 0 );
+ //if ( face->IsSpoiled( linkIt->_qlink ))
+ if ( linkBentInside )
+ face->MoveByBoundary( *linkIt, (*linkIt)->_nodeMove, linkSet );
}
}
}
bool isCurved = false;
//bool hasRectFaces = false;
- set<int> nbElemNodeSet;
+ //set<int> nbElemNodeSet;
if ( elemType == SMDSAbs_Volume )
{
for ( int iF = 0; iF < volTool.NbFaces(); ++iF ) // loop on faces of volume
{
int nbN = volTool.NbFaceNodes( iF );
- nbElemNodeSet.insert( nbN );
+ //nbElemNodeSet.insert( nbN );
const SMDS_MeshNode** faceNodes = volTool.GetFaceNodes( iF );
vector< const QLink* > faceLinks( nbN/2 );
for ( int iN = 0; iN < nbN; iN += 2 ) // loop on links of a face
const SMDS_MeshElement* face = elemIt->next();
if ( !face->IsQuadratic() )
continue;
- nbElemNodeSet.insert( face->NbNodes() );
+ //nbElemNodeSet.insert( face->NbNodes() );
int nbN = face->NbNodes()/2;
vector< const QLink* > faceLinks( nbN );
for ( int iN = 0; iN < nbN; ++iN ) // loop on links of a face