#include <BRepBuilderAPI_Copy.hxx>
#include <BRepBuilderAPI_MakeFace.hxx>
#include <BRepTools.hxx>
+#include <BRepTopAdaptor_FClass2d.hxx>
#include <BRep_Builder.hxx>
#include <BRep_Tool.hxx>
#include <Bnd_B3d.hxx>
//#define _MY_DEBUG_
#endif
-#if OCC_VERSION_LARGE <= 0x06050300
-// workaround is required only for OCCT6.5.3 and older (see OCC22809)
-#define ELLIPSOLID_WORKAROUND
-#endif
-
-#ifdef ELLIPSOLID_WORKAROUND
-#include <BRepIntCurveSurface_Inter.hxx>
-#include <BRepTopAdaptor_TopolTool.hxx>
-#include <BRepAdaptor_HSurface.hxx>
-#endif
-
//=============================================================================
/*!
* Constructor
void ComputeUVW(const gp_XYZ& p, double uvw[3]);
void ComputeNodes(SMESH_MesherHelper& helper);
};
-#ifdef ELLIPSOLID_WORKAROUND
- // --------------------------------------------------------------------------
- /*!
- * \brief struct temporary replacing IntCurvesFace_Intersector until
- * OCCT bug 0022809 is fixed
- * http://tracker.dev.opencascade.org/view.php?id=22809
- */
- struct TMP_IntCurvesFace_Intersector
- {
- BRepAdaptor_Surface _surf;
- double _tol;
- BRepIntCurveSurface_Inter _intcs;
- vector<IntCurveSurface_IntersectionPoint> _points;
- BRepTopAdaptor_TopolTool _clsf;
-
- TMP_IntCurvesFace_Intersector(const TopoDS_Face& face, const double tol)
- :_surf( face ), _tol( tol ), _clsf( new BRepAdaptor_HSurface(_surf) ) {}
- Bnd_Box Bounding() const { Bnd_Box b; BRepBndLib::Add (_surf.Face(), b); return b; }
- void Perform( const gp_Lin& line, const double w0, const double w1 )
- {
- _points.clear();
- for ( _intcs.Init( _surf.Face(), line, _tol ); _intcs.More(); _intcs.Next() )
- if ( w0 <= _intcs.W() && _intcs.W() <= w1 )
- _points.push_back( _intcs.Point() );
- }
- bool IsDone() const { return true; }
- int NbPnt() const { return _points.size(); }
- IntCurveSurface_TransitionOnCurve Transition( const int i ) const { return _points[ i-1 ].Transition(); }
- double WParameter( const int i ) const { return _points[ i-1 ].W(); }
- TopAbs_State ClassifyUVPoint(const gp_Pnt2d& p) { return _clsf.Classify( p, _tol ); }
- };
-#define __IntCurvesFace_Intersector TMP_IntCurvesFace_Intersector
-#else
-#define __IntCurvesFace_Intersector IntCurvesFace_Intersector
-#endif
// --------------------------------------------------------------------------
/*!
* \brief Intersector of TopoDS_Face with all GridLine's
TGeomID _faceID;
Grid* _grid;
Bnd_Box _bndBox;
- __IntCurvesFace_Intersector* _surfaceInt;
+ IntCurvesFace_Intersector* _surfaceInt;
vector< std::pair< GridLine*, F_IntersectPoint > > _intersections;
FaceGridIntersector(): _grid(0), _surfaceInt(0) {}
GetCurveFaceIntersector();
return _bndBox;
}
- __IntCurvesFace_Intersector* GetCurveFaceIntersector()
+ IntCurvesFace_Intersector* GetCurveFaceIntersector()
{
if ( !_surfaceInt )
{
- _surfaceInt = new __IntCurvesFace_Intersector( _face, Precision::PConfusion() );
+ _surfaceInt = new IntCurvesFace_Intersector( _face, Precision::PConfusion() );
_bndBox = _surfaceInt->Bounding();
if ( _bndBox.IsVoid() )
BRepBndLib::Add (_face, _bndBox);
gp_Cone _cone;
gp_Sphere _sphere;
gp_Torus _torus;
- __IntCurvesFace_Intersector* _surfaceInt;
+ IntCurvesFace_Intersector* _surfaceInt;
vector< F_IntersectPoint > _intPoints;
:_node(n), _intPoint(ip), _usedInFace(0) {}
const SMDS_MeshNode* Node() const
{ return ( _intPoint && _intPoint->_node ) ? _intPoint->_node : _node; }
- //const F_IntersectPoint* FaceIntPnt() const
- //{ return static_cast< const F_IntersectPoint* >( _intPoint ); }
const E_IntersectPoint* EdgeIntPnt() const
{ return static_cast< const E_IntersectPoint* >( _intPoint ); }
bool IsUsedInFace( const _Face* polygon = 0 )
_intPoint->Add( ip->_faceIDs );
}
}
- int IsLinked( const B_IntersectPoint* other,
- int avoidFace=-1 ) const // returns id of a common face
+ TGeomID IsLinked( const B_IntersectPoint* other,
+ TGeomID avoidFace=-1 ) const // returns id of a common face
{
return _intPoint ? _intPoint->HasCommonFace( other, avoidFace ) : 0;
}
- bool IsOnFace( int faceID ) const // returns true if faceID is found
+ bool IsOnFace( TGeomID faceID ) const // returns true if faceID is found
{
return _intPoint ? _intPoint->IsOnFace( faceID ) : false;
}
return eip->_point;
return gp_Pnt( 1e100, 0, 0 );
}
+ TGeomID ShapeID() const
+ {
+ if ( const E_IntersectPoint* eip = dynamic_cast< const E_IntersectPoint* >( _intPoint ))
+ return eip->_shapeID;
+ return 0;
+ }
};
// --------------------------------------------------------------------------------
struct _Link // link connecting two _Node's
}
else if ( _link->_faces[0] == f )
{
- _link->_faces[0];
+ _link->_faces[0] = 0;
if ( _link->_faces[1] )
{
_link->_faces[0] = _link->_faces[1];
vector< _OrientedLink > _links; // links on GridLine's
vector< _Link > _polyLinks; // links added to close a polygonal face
vector< _Node* > _eIntNodes; // nodes at intersection with EDGEs
- bool isPolyLink( const _OrientedLink& ol )
+ bool IsPolyLink( const _OrientedLink& ol )
{
return _polyLinks.empty() ? false :
( &_polyLinks[0] <= ol._link && ol._link <= &_polyLinks.back() );
}
+ void AddPolyLink(_Node* n0, _Node* n1, _Face* faceToFindEqual=0)
+ {
+ if ( faceToFindEqual && faceToFindEqual != this ) {
+ for ( size_t iL = 0; iL < faceToFindEqual->_polyLinks.size(); ++iL )
+ if ( faceToFindEqual->_polyLinks[iL]._nodes[0] == n1 &&
+ faceToFindEqual->_polyLinks[iL]._nodes[1] == n0 )
+ {
+ _links.push_back
+ ( _OrientedLink( & faceToFindEqual->_polyLinks[iL], /*reverse=*/true ));
+ return;
+ }
+ }
+ _Link l;
+ l._nodes[0] = n0;
+ l._nodes[1] = n1;
+ _polyLinks.push_back( l );
+ _links.push_back( _OrientedLink( &_polyLinks.back() ));
+ }
};
// --------------------------------------------------------------------------------
struct _volumeDef // holder of nodes of a volume mesh element
void set( const vector< _Node* >& nodes,
const vector< int >& quant = vector< int >() )
{ _nodes = nodes; _quantities = quant; }
+ void set( _Node** nodes, int nb )
+ { _nodes.assign( nodes, nodes + nb ); }
};
// topology of a hexahedron
int ijk[], int dIJK[] );
bool findChain( _Node* n1, _Node* n2, _Face& quad, vector<_Node*>& chainNodes );
bool closePolygon( _Face* polygon, vector<_Node*>& chainNodes ) const;
+ bool findChainOnEdge( const vector< _OrientedLink >& splits,
+ const _OrientedLink& prevSplit,
+ const _OrientedLink& avoidSplit,
+ size_t & iS,
+ _Face& quad,
+ vector<_Node*>& chn);
int addElements(SMESH_MesherHelper& helper);
- bool is1stNodeOut( _Link& link ) const;
+ bool isOutPoint( _Link& link, int iP, SMESH_MesherHelper& helper ) const;
+ void sortVertexNodes(vector<_Node*>& nodes, _Node* curNode, TGeomID face);
bool isInHole() const;
bool checkPolyhedronSize() const;
bool addHexa ();
bool addPenta();
bool addPyra ();
bool debugDumpLink( _Link* link );
- _Node* FindEqualNode( vector< _Node* >& nodes,
+ _Node* findEqualNode( vector< _Node* >& nodes,
const E_IntersectPoint* ip,
const double tol2 )
{
return nodes[i];
return 0;
}
+ bool isImplementEdges() const { return !_grid->_edgeIntP.empty(); }
+ bool isOutParam(const double uvw[3]) const;
};
#ifdef WITH_TBB
struct ParallelHexahedron
{
vector< Hexahedron* >& _hexVec;
- vector<int>& _index;
- ParallelHexahedron( vector< Hexahedron* >& hv, vector<int>& ind): _hexVec(hv), _index(ind) {}
+ ParallelHexahedron( vector< Hexahedron* >& hv ): _hexVec(hv) {}
void operator() ( const tbb::blocked_range<size_t>& r ) const
{
for ( size_t i = r.begin(); i != r.end(); ++i )
- if ( Hexahedron* hex = _hexVec[ _index[i]] )
+ if ( Hexahedron* hex = _hexVec[ i ] )
hex->ComputeElements();
}
};
/*
* Intersect a line with a plane
*/
- void FaceLineIntersector::IntersectWithPlane (const GridLine& gridLine)
+ void FaceLineIntersector::IntersectWithPlane(const GridLine& gridLine)
{
IntAna_IntConicQuad linPlane( gridLine._line, _plane, Precision::Angular());
_w = linPlane.ParamOnConic(1);
}
}
}
-
+
//================================================================================
/*!
* \brief Initializes its data by given grid cell
_nbCornerNodes += bool( _hexNodes[iN]._node );
_nbBndNodes += bool( _hexNodes[iN]._intPoint );
}
-
_sideLength[0] = _grid->_coords[0][i+1] - _grid->_coords[0][i];
_sideLength[1] = _grid->_coords[1][j+1] - _grid->_coords[1][j];
_sideLength[2] = _grid->_coords[2][k+1] - _grid->_coords[2][k];
{
_intNodes.reserve( 3 * _nbBndNodes + _nbFaceIntNodes + _eIntPoints.size() );
- _Link split;
+ // this method can be called in parallel, so use own helper
+ SMESH_MesherHelper helper( *_grid->_helper->GetMesh() );
+
// create sub-links (_splits) by splitting links with _fIntPoints
+ _Link split;
for ( int iLink = 0; iLink < 12; ++iLink )
{
_Link& link = _hexLinks[ iLink ];
link._splits.clear();
split._nodes[ 0 ] = link._nodes[0];
- bool isOut = ( ! link._nodes[0]->Node() ); // is1stNodeOut( iLink );
+ bool isOut = ( ! link._nodes[0]->Node() );
bool checkTransition;
for ( size_t i = 0; i < link._fIntNodes.size(); ++i )
{
- if ( link._fIntNodes[i]->Node() ) // intersection non-coinsident with a grid node
+ const bool isGridNode = ( ! link._fIntNodes[i]->Node() );
+ if ( !isGridNode ) // intersection non-coincident with a grid node
{
if ( split._nodes[ 0 ]->Node() && !isOut )
{
split._nodes[ 0 ] = link._fIntNodes[i];
checkTransition = true;
}
- else // FACE intersection coinsident with a grid node
+ else // FACE intersection coincident with a grid node (at link ends)
{
- checkTransition = ( link._nodes[0]->Node() );
+ checkTransition = ( i == 0 && link._nodes[0]->Node() );
}
if ( checkTransition )
{
- switch ( link._fIntPoints[i]->_transition ) {
- case Trans_OUT: isOut = true; break;
- case Trans_IN : isOut = false; break;
- default:
- if ( !link._fIntNodes[i]->Node() && i == 0 )
- isOut = is1stNodeOut( link );
- else
- ; // isOut remains the same
- }
+ if ( link._fIntPoints[i]->_faceIDs.size() > 1 || _eIntPoints.size() > 0 )
+ isOut = isOutPoint( link, i, helper );
+ else
+ switch ( link._fIntPoints[i]->_transition ) {
+ case Trans_OUT: isOut = true; break;
+ case Trans_IN : isOut = false; break;
+ default:
+ isOut = isOutPoint( link, i, helper );
+ }
}
}
if ( link._nodes[ 1 ]->Node() && split._nodes[ 0 ]->Node() && !isOut )
case 1: // in a _Face
{
_Face& quad = _hexQuads[ facets[0] - SMESH_Block::ID_FirstF ];
- equalNode = FindEqualNode( quad._eIntNodes, _eIntPoints[ iP ], tol2 );
+ equalNode = findEqualNode( quad._eIntNodes, _eIntPoints[ iP ], tol2 );
if ( equalNode ) {
equalNode->Add( _eIntPoints[ iP ] );
}
_Link& link = _hexLinks[ subEntity - SMESH_Block::ID_FirstE ];
if ( link._splits.size() > 0 )
{
- equalNode = FindEqualNode( link._fIntNodes, _eIntPoints[ iP ], tol2 );
+ equalNode = findEqualNode( link._fIntNodes, _eIntPoints[ iP ], tol2 );
if ( equalNode )
equalNode->Add( _eIntPoints[ iP ] );
}
for ( int iF = 0; iF < 2; ++iF )
{
_Face& quad = _hexQuads[ facets[iF] - SMESH_Block::ID_FirstF ];
- equalNode = FindEqualNode( quad._eIntNodes, _eIntPoints[ iP ], tol2 );
+ equalNode = findEqualNode( quad._eIntNodes, _eIntPoints[ iP ], tol2 );
if ( equalNode ) {
equalNode->Add( _eIntPoints[ iP ] );
}
for ( int iF = 0; iF < 3; ++iF )
{
_Face& quad = _hexQuads[ facets[iF] - SMESH_Block::ID_FirstF ];
- equalNode = FindEqualNode( quad._eIntNodes, _eIntPoints[ iP ], tol2 );
+ equalNode = findEqualNode( quad._eIntNodes, _eIntPoints[ iP ], tol2 );
if ( equalNode ) {
equalNode->Add( _eIntPoints[ iP ] );
}
if ( nbFacets == 0 ||
_grid->_shapes( _eIntPoints[ iP ]->_shapeID ).ShapeType() == TopAbs_VERTEX )
{
- equalNode = FindEqualNode( _vIntNodes, _eIntPoints[ iP ], tol2 );
+ equalNode = findEqualNode( _vIntNodes, _eIntPoints[ iP ], tol2 );
if ( equalNode ) {
equalNode->Add( _eIntPoints[ iP ] );
}
- else {
+ else if ( nbFacets == 0 ) {
if ( _intNodes.empty() || _intNodes.back().EdgeIntPnt() != _eIntPoints[ iP ])
_intNodes.push_back( _Node( 0, _eIntPoints[ iP ]));
_vIntNodes.push_back( & _intNodes.back() );
// Create polygons from quadrangles
// --------------------------------
- _Link polyLink;
vector< _OrientedLink > splits;
- vector<_Node*> chainNodes, usedEdgeNodes;
+ vector<_Node*> chainNodes;
_Face* coplanarPolyg;
bool hasEdgeIntersections = !_eIntPoints.empty();
// polygon's boundary closed
int nbSplits = splits.size();
- if ( nbSplits < 2 && quad._eIntNodes.empty() )
+ if (( nbSplits == 1 ) &&
+ ( quad._eIntNodes.empty() ||
+ splits[0].FirstNode()->IsLinked( splits[0].LastNode()->_intPoint )))
+ //( quad._eIntNodes.empty() || _nbCornerNodes + nbIntersections > 6 ))
nbSplits = 0;
#ifdef _DEBUG_
quad._eIntNodes[ iP ]->_usedInFace = 0;
#endif
int nbUsedEdgeNodes = 0;
+ _Face* prevPolyg = 0; // polygon previously created from this quad
while ( nbSplits > 0 )
{
if ( !split ) continue;
n1 = split.FirstNode();
- if ( n1 != n2 )
+ if ( n1 == n2 &&
+ n1->_intPoint &&
+ n1->_intPoint->_faceIDs.size() > 1 )
+ {
+ // n1 is at intersection with EDGE
+ if ( findChainOnEdge( splits, polygon->_links.back(), split, iS, quad, chainNodes ))
+ {
+ for ( size_t i = 1; i < chainNodes.size(); ++i )
+ polygon->AddPolyLink( chainNodes[i-1], chainNodes[i], prevPolyg );
+ prevPolyg = polygon;
+ n2 = chainNodes.back();
+ continue;
+ }
+ }
+ else if ( n1 != n2 )
{
// try to connect to intersections with EDGEs
if ( quad._eIntNodes.size() > nbUsedEdgeNodes &&
{
for ( size_t i = 1; i < chainNodes.size(); ++i )
{
- polyLink._nodes[0] = chainNodes[i-1];
- polyLink._nodes[1] = chainNodes[i];
- polygon->_polyLinks.push_back( polyLink );
- polygon->_links.push_back( _OrientedLink( &polygon->_polyLinks.back() ));
- nbUsedEdgeNodes += ( polyLink._nodes[1]->IsUsedInFace( polygon ));
+ polygon->AddPolyLink( chainNodes[i-1], chainNodes[i] );
+ nbUsedEdgeNodes += ( chainNodes[i]->IsUsedInFace( polygon ));
}
if ( chainNodes.back() != n1 )
{
if (( foundSplit = splits[ i ]) &&
( n2->IsLinked( foundSplit.FirstNode()->_intPoint )))
{
- polyLink._nodes[0] = n2;
- polyLink._nodes[1] = foundSplit.FirstNode();
- polygon->_polyLinks.push_back( polyLink );
- polygon->_links.push_back( _OrientedLink( &polygon->_polyLinks.back() ));
iS = i - 1;
}
else
}
if ( foundSplit )
{
- n2 = foundSplit.FirstNode();
+ if ( n2 != foundSplit.FirstNode() )
+ {
+ polygon->AddPolyLink( n2, foundSplit.FirstNode() );
+ n2 = foundSplit.FirstNode();
+ }
continue;
}
else
{
if ( n2->IsLinked( nFirst->_intPoint ))
break;
- polyLink._nodes[0] = n2;
- polyLink._nodes[1] = n1;
- polygon->_polyLinks.push_back( polyLink );
- polygon->_links.push_back( _OrientedLink( &polygon->_polyLinks.back() ));
+ polygon->AddPolyLink( n2, n1, prevPolyg );
}
}
- }
+ } // if ( n1 != n2 )
+
polygon->_links.push_back( split );
split._link = 0;
--nbSplits;
if ( !findChain( n2, nFirst, quad, chainNodes ))
{
if ( !closePolygon( polygon, chainNodes ))
- chainNodes.push_back( nFirst );
+ if ( !isImplementEdges() )
+ chainNodes.push_back( nFirst );
}
for ( size_t i = 1; i < chainNodes.size(); ++i )
{
- polyLink._nodes[0] = chainNodes[i-1];
- polyLink._nodes[1] = chainNodes[i];
- polygon->_polyLinks.push_back( polyLink );
- polygon->_links.push_back( _OrientedLink( &polygon->_polyLinks.back() ));
- nbUsedEdgeNodes += bool( polyLink._nodes[1]->IsUsedInFace( polygon ));
+ polygon->AddPolyLink( chainNodes[i-1], chainNodes[i], prevPolyg );
+ nbUsedEdgeNodes += bool( chainNodes[i]->IsUsedInFace( polygon ));
}
}
}
} // while ( nbSplits > 0 )
- // if ( quad._eIntNodes.size() > nbUsedEdgeNodes )
- // {
- // // make _vIntNodes from not used _eIntNodes
- // const double tol = 0.05 * Min( Min( _sideLength[0], _sideLength[1] ), _sideLength[0] );
- // for ( size_t iP = 0; iP < quad._eIntNodes.size(); ++iP )
- // {
- // if ( quad._eIntNodes[ iP ]->IsUsedInFace() ) continue;
- // _Node* equalNode =
- // FindEqualNode( _vIntNodes, quad._eIntNodes[ iP ].EdgeIntPnt(), tol*tol );
- // if ( equalNode )
- // equalNode->Add( quad._eIntNodes[ iP ].EdgeIntPnt() );
- // else
- // _vIntNodes.push_back( quad._eIntNodes[ iP ]);
- // }
- // }
-
if ( polygon->_links.size() < 3 )
{
_polygons.pop_back();
- //usedEdgeNodes.resize( usedEdgeNodes.size() - nbUsedEdgeNodes );
}
} // loop on 6 hexahedron sides
_Face& polygon = _polygons[ iP ];
for ( size_t iL = 0; iL < polygon._links.size(); ++iL )
if ( polygon._links[ iL ].NbFaces() < 2 )
- {
freeLinks.push_back( & polygon._links[ iL ]);
- freeLinks.back()->FirstNode()->IsUsedInFace() == true;
- }
}
int nbFreeLinks = freeLinks.size();
- if ( nbFreeLinks > 0 && nbFreeLinks < 3 ) return;
+ if ( nbFreeLinks == 1 ) return;
// put not used intersection nodes to _vIntNodes
int nbVertexNodes = 0; // nb not used vertex nodes
if ( _intNodes[ iN ].IsUsedInFace() ) continue;
if ( dynamic_cast< const F_IntersectPoint* >( _intNodes[ iN ]._intPoint )) continue;
_Node* equalNode =
- FindEqualNode( _vIntNodes, _intNodes[ iN ].EdgeIntPnt(), tol*tol );
- if ( !equalNode /*|| equalNode->IsUsedInFace()*/ )
+ findEqualNode( _vIntNodes, _intNodes[ iN ].EdgeIntPnt(), tol*tol );
+ if ( !equalNode )
{
_vIntNodes.push_back( &_intNodes[ iN ]);
++nbVertexNodes;
}
set<TGeomID> usedFaceIDs;
+ vector< TGeomID > faces;
TGeomID curFace = 0;
const size_t nbQuadPolygons = _polygons.size();
+ E_IntersectPoint ipTmp;
// create polygons by making closed chains of free links
size_t iPolygon = _polygons.size();
while ( nbFreeLinks > 0 )
{
if ( iPolygon == _polygons.size() )
+ {
_polygons.resize( _polygons.size() + 1 );
+ _polygons[ iPolygon ]._polyLinks.reserve( 20 );
+ _polygons[ iPolygon ]._links.reserve( 20 );
+ }
_Face& polygon = _polygons[ iPolygon ];
- polygon._polyLinks.reserve( 20 );
- polygon._links.reserve( 20 );
_OrientedLink* curLink = 0;
_Node* curNode;
}
else // there are intersections with EDGEs
{
- // get a remaining link to start from, one lying on minimal
- // nb of FACEs
+ // get a remaining link to start from, one lying on minimal nb of FACEs
{
- vector< pair< TGeomID, int > > facesOfLink[3];
- pair< TGeomID, int > faceOfLink( -1, -1 );
- vector< TGeomID > faces;
+ typedef pair< TGeomID, int > TFaceOfLink;
+ TFaceOfLink faceOfLink( -1, -1 );
+ TFaceOfLink facesOfLink[3] = { faceOfLink, faceOfLink, faceOfLink };
for ( size_t iL = 0; iL < freeLinks.size(); ++iL )
if ( freeLinks[ iL ] )
{
faces = freeLinks[ iL ]->GetNotUsedFace( usedFaceIDs );
if ( faces.size() == 1 )
{
- faceOfLink = make_pair( faces[0], iL );
+ faceOfLink = TFaceOfLink( faces[0], iL );
if ( !freeLinks[ iL ]->HasEdgeNodes() )
break;
- facesOfLink[0].push_back( faceOfLink );
+ facesOfLink[0] = faceOfLink;
}
- else if ( facesOfLink[0].empty() )
+ else if ( facesOfLink[0].first < 0 )
{
- faceOfLink = make_pair(( faces.empty() ? -1 : faces[0]), iL );
- facesOfLink[ 1 + faces.empty() ].push_back( faceOfLink );
+ faceOfLink = TFaceOfLink(( faces.empty() ? -1 : faces[0]), iL );
+ facesOfLink[ 1 + faces.empty() ] = faceOfLink;
}
}
- for ( int i = 0; faceOfLink.second < 0 && i < 3; ++i )
- if ( !facesOfLink[i].empty() )
- faceOfLink = facesOfLink[i][0];
+ for ( int i = 0; faceOfLink.first < 0 && i < 3; ++i )
+ faceOfLink = facesOfLink[i];
if ( faceOfLink.first < 0 ) // all faces used
{
- for ( size_t i = 0; i < facesOfLink[2].size() && faceOfLink.first < 1; ++i )
- {
- curLink = freeLinks[ facesOfLink[2][i].second ];
- faceOfLink.first = curLink->FirstNode()->IsLinked( curLink->LastNode()->_intPoint );
- }
+ for ( size_t iL = 0; iL < freeLinks.size() && faceOfLink.first < 1; ++iL )
+ if (( curLink = freeLinks[ iL ]))
+ {
+ faceOfLink.first =
+ curLink->FirstNode()->IsLinked( curLink->LastNode()->_intPoint );
+ faceOfLink.second = iL;
+ }
usedFaceIDs.clear();
}
curFace = faceOfLink.first;
polygon._links.push_back( *curLink );
--nbFreeLinks;
- // find all links bounding a FACE of curLink
+ // find all links lying on a curFace
do
{
// go forward from curLink
if ( nbVertexNodes > 0 )
{
// add links with _vIntNodes if not already used
+ chainNodes.clear();
for ( size_t iN = 0; iN < _vIntNodes.size(); ++iN )
if ( !_vIntNodes[ iN ]->IsUsedInFace() &&
_vIntNodes[ iN ]->IsOnFace( curFace ))
{
_vIntNodes[ iN ]->_usedInFace = &polygon;
- --nbVertexNodes;
- polyLink._nodes[0] = _vIntNodes[ iN ];
- polyLink._nodes[1] = curNode;
- polygon._polyLinks.push_back( polyLink );
- polygon._links.push_back( _OrientedLink( &polygon._polyLinks.back() ));
- freeLinks.push_back( &polygon._links.back() );
- ++nbFreeLinks;
- curNode = _vIntNodes[ iN ];
- // TODO: to reorder _vIntNodes within polygon, if there are several ones
+ chainNodes.push_back( _vIntNodes[ iN ] );
}
+ if ( chainNodes.size() > 1 )
+ {
+ sortVertexNodes( chainNodes, curNode, curFace );
+ }
+ for ( int i = 0; i < chainNodes.size(); ++i )
+ {
+ polygon.AddPolyLink( chainNodes[ i ], curNode );
+ curNode = chainNodes[ i ];
+ freeLinks.push_back( &polygon._links.back() );
+ ++nbFreeLinks;
+ }
+ nbVertexNodes -= chainNodes.size();
}
// if ( polygon._links.size() > 1 )
{
- polyLink._nodes[0] = polygon._links[0].LastNode();
- polyLink._nodes[1] = curNode;
- polygon._polyLinks.push_back( polyLink );
- polygon._links.push_back( _OrientedLink( &polygon._polyLinks.back() ));
+ polygon.AddPolyLink( polygon._links[0].LastNode(), curNode );
freeLinks.push_back( &polygon._links.back() );
++nbFreeLinks;
}
if ( polygon._links.back().NbFaces() > 0 )
polygon._links.front().AddFace( polygon._links.back()._link->_faces[0] );
- _polygons.pop_back();
+ if ( iPolygon == _polygons.size()-1 )
+ _polygons.pop_back();
}
else // polygon._links.size() >= 2
{
polygon._links[ iL ].AddFace( &polygon );
polygon._links[ iL ].Reverse();
}
- if ( hasEdgeIntersections && iPolygon == _polygons.size() - 1 )
+ if ( /*hasEdgeIntersections &&*/ iPolygon == _polygons.size() - 1 )
{
- // check that a polygon does not lie in the plane of another polygon
+ // check that a polygon does not lie on a hexa side
coplanarPolyg = 0;
for ( size_t iL = 0; iL < polygon._links.size() && !coplanarPolyg; ++iL )
{
coplanarPolyg = polygon._links[ iL ]._link->_faces[0];
for ( iL2 = iL + 1; iL2 < polygon._links.size(); ++iL2 )
if ( polygon._links[ iL2 ]._link->_faces[0] == coplanarPolyg &&
- !coplanarPolyg->isPolyLink( polygon._links[ iL2 ]) &&
+ !coplanarPolyg->IsPolyLink( polygon._links[ iL ]) &&
+ !coplanarPolyg->IsPolyLink( polygon._links[ iL2 ]) &&
coplanarPolyg < & _polygons[ nbQuadPolygons ])
break;
if ( iL2 == polygon._links.size() )
coplanarPolyg = 0;
}
- if ( 0 /*coplanarPolyg*/ ) // coplanar polygon found
+ if ( coplanarPolyg ) // coplanar polygon found
{
freeLinks.resize( freeLinks.size() - polygon._polyLinks.size() );
nbFreeLinks -= polygon._polyLinks.size();
+ // an E_IntersectPoint used to mark nodes of coplanarPolyg
+ // as lying on curFace while they are not at intersection with geometry
+ ipTmp._faceIDs.resize(1);
+ ipTmp._faceIDs[0] = curFace;
+
// fill freeLinks with links not shared by coplanarPolyg and polygon
for ( size_t iL = 0; iL < polygon._links.size(); ++iL )
if ( polygon._links[ iL ]._link->_faces[1] &&
for ( size_t iL2 = 0; iL2 < p->_links.size(); ++iL2 )
if ( p->_links[ iL2 ]._link == coplanarPolyg->_links[ iL ]._link )
{
- freeLinks.push_back( & p->_links[ iL2 ] );
+ // set links of coplanarPolyg in place of used freeLinks
+ // to re-create coplanarPolyg next
+ size_t iL3 = 0;
+ for ( ; iL3 < freeLinks.size() && freeLinks[ iL3 ]; ++iL3 );
+ if ( iL3 < freeLinks.size() )
+ freeLinks[ iL3 ] = ( & p->_links[ iL2 ] );
+ else
+ freeLinks.push_back( & p->_links[ iL2 ] );
++nbFreeLinks;
- freeLinks.back()->RemoveFace( coplanarPolyg );
+ freeLinks[ iL3 ]->RemoveFace( coplanarPolyg );
+ // mark nodes of coplanarPolyg as lying on curFace
+ for ( int iN = 0; iN < 2; ++iN )
+ {
+ _Node* n = freeLinks[ iL3 ]->_link->_nodes[ iN ];
+ if ( n->_intPoint ) n->_intPoint->Add( ipTmp._faceIDs );
+ else n->_intPoint = &ipTmp;
+ }
break;
}
}
_polygons[ iPolygon ]._polyLinks.clear();
break;
}
- if ( freeLinks.back() == &polygon._links.back() )
- {
- freeLinks.pop_back();
- --nbFreeLinks;
- }
_polygons.pop_back();
usedFaceIDs.erase( curFace );
continue;
} // if ( coplanarPolyg )
- } // if ( hasEdgeIntersections )
+ } // if ( hasEdgeIntersections ) - search for coplanarPolyg
iPolygon = _polygons.size();
return;
}
+ for ( size_t i = 0; i < 8; ++i )
+ if ( _hexNodes[ i ]._intPoint == &ipTmp )
+ _hexNodes[ i ]._intPoint = 0;
+
// create a classic cell if possible
- const int nbNodes = _nbCornerNodes + nbIntersections;
+
+ int nbPolygons = 0;
+ for ( size_t iF = 0; iF < _polygons.size(); ++iF )
+ nbPolygons += (_polygons[ iF ]._links.size() > 0 );
+
+ //const int nbNodes = _nbCornerNodes + nbIntersections;
+ int nbNodes = 0;
+ for ( size_t i = 0; i < 8; ++i )
+ nbNodes += _hexNodes[ i ].IsUsedInFace();
+ for ( size_t i = 0; i < _intNodes.size(); ++i )
+ nbNodes += _intNodes[ i ].IsUsedInFace();
+
bool isClassicElem = false;
- if ( nbNodes == 8 && _polygons.size() == 6 ) isClassicElem = addHexa();
- else if ( nbNodes == 4 && _polygons.size() == 4 ) isClassicElem = addTetra();
- else if ( nbNodes == 6 && _polygons.size() == 5 ) isClassicElem = addPenta();
- else if ( nbNodes == 5 && _polygons.size() == 5 ) isClassicElem = addPyra ();
+ if ( nbNodes == 8 && nbPolygons == 6 ) isClassicElem = addHexa();
+ else if ( nbNodes == 4 && nbPolygons == 4 ) isClassicElem = addTetra();
+ else if ( nbNodes == 6 && nbPolygons == 5 ) isClassicElem = addPenta();
+ else if ( nbNodes == 5 && nbPolygons == 5 ) isClassicElem = addPyra ();
if ( !isClassicElem )
{
_volumeDefs._nodes.clear();
for ( size_t iF = 0; iF < _polygons.size(); ++iF )
{
const size_t nbLinks = _polygons[ iF ]._links.size();
+ if ( nbLinks == 0 ) continue;
_volumeDefs._quantities.push_back( nbLinks );
for ( size_t iL = 0; iL < nbLinks; ++iL )
_volumeDefs._nodes.push_back( _polygons[ iF ]._links[ iL ].FirstNode() );
_grid->_coords[1].size() - 1,
_grid->_coords[2].size() - 1 };
const size_t nbGridCells = nbCells[0] * nbCells[1] * nbCells[2];
- vector< Hexahedron* > intersectedHex( nbGridCells, 0 );
+ vector< Hexahedron* > allHexa( nbGridCells, 0 );
int nbIntHex = 0;
- // set intersection nodes from GridLine's to links of intersectedHex
+ // set intersection nodes from GridLine's to links of allHexa
int i,j,k, iDirOther[3][2] = {{ 1,2 },{ 0,2 },{ 0,1 }};
for ( int iDir = 0; iDir < 3; ++iDir )
{
k < 0 || k >= nbCells[2] ) continue;
const size_t hexIndex = _grid->CellIndex( i,j,k );
- Hexahedron *& hex = intersectedHex[ hexIndex ];
+ Hexahedron *& hex = allHexa[ hexIndex ];
if ( !hex)
{
hex = new Hexahedron( *this );
}
// implement geom edges into the mesh
- addEdges( helper, intersectedHex, edge2faceIDsMap );
+ addEdges( helper, allHexa, edge2faceIDsMap );
// add not split hexadrons to the mesh
int nbAdded = 0;
- vector<int> intHexInd( nbIntHex );
- nbIntHex = 0;
- for ( size_t i = 0; i < intersectedHex.size(); ++i )
+ vector< Hexahedron* > intHexa( nbIntHex, (Hexahedron*) NULL );
+ for ( size_t i = 0; i < allHexa.size(); ++i )
{
- Hexahedron * & hex = intersectedHex[ i ];
+ Hexahedron * & hex = allHexa[ i ];
if ( hex )
{
- intHexInd[ nbIntHex++ ] = i;
+ intHexa.push_back( hex );
if ( hex->_nbFaceIntNodes > 0 || hex->_eIntPoints.size() > 0 )
continue; // treat intersected hex later
this->init( hex->_i, hex->_j, hex->_k );
mesh->SetMeshElementOnShape( el, helper.GetSubShapeID() );
++nbAdded;
if ( hex )
- {
- delete hex;
- intersectedHex[ i ] = 0;
- --nbIntHex;
- }
+ intHexa.pop_back();
}
else if ( _nbCornerNodes > 3 && !hex )
{
hex->_i = _i;
hex->_j = _j;
hex->_k = _k;
- intHexInd.push_back(0);
- intHexInd[ nbIntHex++ ] = i;
+ intHexa.push_back( hex );
}
}
// add elements resulted from hexadron intersection
#ifdef WITH_TBB
- intHexInd.resize( nbIntHex );
- tbb::parallel_for ( tbb::blocked_range<size_t>( 0, nbIntHex ),
- ParallelHexahedron( intersectedHex, intHexInd ),
+ tbb::parallel_for ( tbb::blocked_range<size_t>( 0, intHexa.size() ),
+ ParallelHexahedron( intHexa ),
tbb::simple_partitioner()); // ComputeElements() is called here
- for ( size_t i = 0; i < intHexInd.size(); ++i )
- if ( Hexahedron * hex = intersectedHex[ intHexInd[ i ]] )
+ for ( size_t i = 0; i < intHexa.size(); ++i )
+ if ( Hexahedron * hex = intHexa[ i ] )
nbAdded += hex->addElements( helper );
#else
- for ( size_t i = 0; i < intHexInd.size(); ++i )
- if ( Hexahedron * hex = intersectedHex[ intHexInd[ i ]] )
+ for ( size_t i = 0; i < intHexa.size(); ++i )
+ if ( Hexahedron * hex = intHexa[ i ] )
{
hex->ComputeElements();
nbAdded += hex->addElements( helper );
}
#endif
- for ( size_t i = 0; i < intersectedHex.size(); ++i )
- if ( intersectedHex[ i ] )
- delete intersectedHex[ i ];
+ for ( size_t i = 0; i < allHexa.size(); ++i )
+ if ( allHexa[ i ] )
+ delete allHexa[ i ];
return nbAdded;
}
double u2 = discret.Parameter( iP );
double zProj2 = planes._zNorm * ( p2 - _grid->_origin );
int iZ2 = iZ1;
- if ( Abs( zProj2 - zProj1 ) <= std::numeric_limits<double>::min() )
- continue;
- locateValue( iZ2, zProj2, planes._zProjs, dIJK[ iDirZ ], tol );
-
- // treat intersections with planes between 2 end points of a segment
- int dZ = ( iZ1 <= iZ2 ) ? +1 : -1;
- int iZ = iZ1 + ( iZ1 < iZ2 );
- for ( int i = 0, nb = Abs( iZ1 - iZ2 ); i < nb; ++i, iZ += dZ )
+ if ( Abs( zProj2 - zProj1 ) > std::numeric_limits<double>::min() )
{
- ip._point = findIntPoint( u1, zProj1, u2, zProj2,
- planes._zProjs[ iZ ],
- curve, planes._zNorm, _grid->_origin );
- _grid->ComputeUVW( ip._point.XYZ(), ip._uvw );
- locateValue( ijk[iDirX], ip._uvw[iDirX], _grid->_coords[iDirX], dIJK[iDirX], tol );
- locateValue( ijk[iDirY], ip._uvw[iDirY], _grid->_coords[iDirY], dIJK[iDirY], tol );
- ijk[ iDirZ ] = iZ;
-
- // add ip to hex "above" the plane
- _grid->_edgeIntP.push_back( ip );
- dIJK[ iDirZ ] = 0;
- bool added = addIntersection(_grid->_edgeIntP.back(), hexes, ijk, dIJK);
-
- // add ip to hex "below" the plane
- ijk[ iDirZ ] = iZ-1;
- if ( !addIntersection( _grid->_edgeIntP.back(), hexes, ijk, dIJK ) &&
- !added)
- _grid->_edgeIntP.pop_back();
+ locateValue( iZ2, zProj2, planes._zProjs, dIJK[ iDirZ ], tol );
+
+ // treat intersections with planes between 2 end points of a segment
+ int dZ = ( iZ1 <= iZ2 ) ? +1 : -1;
+ int iZ = iZ1 + ( iZ1 < iZ2 );
+ for ( int i = 0, nb = Abs( iZ1 - iZ2 ); i < nb; ++i, iZ += dZ )
+ {
+ ip._point = findIntPoint( u1, zProj1, u2, zProj2,
+ planes._zProjs[ iZ ],
+ curve, planes._zNorm, _grid->_origin );
+ _grid->ComputeUVW( ip._point.XYZ(), ip._uvw );
+ locateValue( ijk[iDirX], ip._uvw[iDirX], _grid->_coords[iDirX], dIJK[iDirX], tol );
+ locateValue( ijk[iDirY], ip._uvw[iDirY], _grid->_coords[iDirY], dIJK[iDirY], tol );
+ ijk[ iDirZ ] = iZ;
+
+ // add ip to hex "above" the plane
+ _grid->_edgeIntP.push_back( ip );
+ dIJK[ iDirZ ] = 0;
+ bool added = addIntersection(_grid->_edgeIntP.back(), hexes, ijk, dIJK);
+
+ // add ip to hex "below" the plane
+ ijk[ iDirZ ] = iZ-1;
+ if ( !addIntersection( _grid->_edgeIntP.back(), hexes, ijk, dIJK ) &&
+ !added)
+ _grid->_edgeIntP.pop_back();
+ }
}
iZ1 = iZ2;
p1 = p2;
Hexahedron* h = hexes[ hexIndex[i] ];
// check if ip is really inside the hex
#ifdef _DEBUG_
- if (( _grid->_coords[0][ h->_i ] - _grid->_tol > ip._uvw[0] ) ||
- ( _grid->_coords[0][ h->_i+1 ] + _grid->_tol < ip._uvw[0] ) ||
- ( _grid->_coords[1][ h->_j ] - _grid->_tol > ip._uvw[1] ) ||
- ( _grid->_coords[1][ h->_j+1 ] + _grid->_tol < ip._uvw[1] ) ||
- ( _grid->_coords[2][ h->_k ] - _grid->_tol > ip._uvw[2] ) ||
- ( _grid->_coords[2][ h->_k+1 ] + _grid->_tol < ip._uvw[2] ))
+ if ( h->isOutParam( ip._uvw ))
throw SALOME_Exception("ip outside a hex");
#endif
h->_eIntPoints.push_back( & ip );
}
//================================================================================
/*!
- * \brief Checks transition at the 1st node of a link
+ * \brief Finds nodes on the same EDGE as the first node of avoidSplit.
+ *
+ * This function is for a case where an EDGE lies on a quad which lies on a FACE
+ * so that a part of quad in ON and another part in IN
*/
- bool Hexahedron::is1stNodeOut( _Link& link /*int iLink*/ ) const
+ bool Hexahedron::findChainOnEdge( const vector< _OrientedLink >& splits,
+ const _OrientedLink& prevSplit,
+ const _OrientedLink& avoidSplit,
+ size_t & iS,
+ _Face& quad,
+ vector<_Node*>& chn )
{
- // new version is for the case: tangent transition at the 1st node
- bool isOut = false;
- if ( link._fIntNodes.size() > 1 )
+ if ( !isImplementEdges() )
+ return false;
+
+ _Node* pn1 = prevSplit.FirstNode();
+ _Node* pn2 = prevSplit.LastNode();
+ int avoidFace = pn1->IsLinked( pn2->_intPoint ); // FACE under the quad
+ if ( avoidFace < 1 && pn1->_intPoint )
+ return false;
+
+ _Node* n, *stopNode = avoidSplit.LastNode();
+
+ chn.clear();
+ if ( !quad._eIntNodes.empty() )
{
- // check transition at the next intersection
- switch ( link._fIntPoints[1]->_transition ) {
- case Trans_OUT: return false;
- case Trans_IN : return true;
- default: ; // tangent transition
- }
+ chn.push_back( pn2 );
+ bool found;
+ do
+ {
+ found = false;
+ for ( size_t iP = 0; iP < quad._eIntNodes.size(); ++iP )
+ if (( !quad._eIntNodes[ iP ]->IsUsedInFace( &quad )) &&
+ ( chn.back()->IsLinked( quad._eIntNodes[ iP ]->_intPoint, avoidFace )) &&
+ ( !avoidFace || quad._eIntNodes[ iP ]->IsOnFace( avoidFace )))
+ {
+ chn.push_back( quad._eIntNodes[ iP ]);
+ found = quad._eIntNodes[ iP ]->_usedInFace = &quad;
+ break;
+ }
+ } while ( found );
+ pn2 = chn.back();
}
- gp_Pnt p1 = link._nodes[0]->Point();
- gp_Pnt p2 = link._nodes[1]->Point();
- gp_Pnt testPnt = 0.8 * p1.XYZ() + 0.2 * p2.XYZ();
- TGeomID faceID = link._fIntPoints[0]->_faceIDs[0];
- const TopoDS_Face& face = TopoDS::Face( _grid->_shapes( faceID ));
+ int i;
+ for ( i = splits.size()-1; i >= 0; --i )
+ {
+ if ( !splits[i] )
+ continue;
+
+ n = splits[i].LastNode();
+ if ( n == stopNode )
+ break;
+ if (( n != pn1 ) &&
+ ( n->IsLinked( pn2->_intPoint, avoidFace )) &&
+ ( !avoidFace || n->IsOnFace( avoidFace )))
+ break;
+
+ n = splits[i].FirstNode();
+ if ( n == stopNode )
+ break;
+ if (( n->IsLinked( pn2->_intPoint, avoidFace )) &&
+ ( !avoidFace || n->IsOnFace( avoidFace )))
+ break;
+ n = 0;
+ }
+ if ( n && n != stopNode)
+ {
+ if ( chn.empty() )
+ chn.push_back( pn2 );
+ chn.push_back( n );
+ iS = i-1;
+ return true;
+ }
+ return false;
+ }
+ //================================================================================
+ /*!
+ * \brief Checks transition at the ginen intersection node of a link
+ */
+ bool Hexahedron::isOutPoint( _Link& link, int iP, SMESH_MesherHelper& helper ) const
+ {
+ bool isOut = false;
+
+ const bool moreIntPoints = ( iP+1 < link._fIntPoints.size() );
+
+ // get 2 _Node's
+ _Node* n1 = link._fIntNodes[ iP ];
+ if ( !n1->Node() )
+ n1 = link._nodes[0];
+ _Node* n2 = moreIntPoints ? link._fIntNodes[ iP+1 ] : 0;
+ if ( !n2 || !n2->Node() )
+ n2 = link._nodes[1];
+ if ( !n2->Node() )
+ return true;
+
+ // get all FACEs under n1 and n2
+ set< TGeomID > faceIDs;
+ if ( moreIntPoints ) faceIDs.insert( link._fIntPoints[iP+1]->_faceIDs.begin(),
+ link._fIntPoints[iP+1]->_faceIDs.end() );
+ if ( n2->_intPoint ) faceIDs.insert( n2->_intPoint->_faceIDs.begin(),
+ n2->_intPoint->_faceIDs.end() );
+ if ( faceIDs.empty() )
+ return false; // n2 is inside
+ if ( n1->_intPoint ) faceIDs.insert( n1->_intPoint->_faceIDs.begin(),
+ n1->_intPoint->_faceIDs.end() );
+ faceIDs.insert( link._fIntPoints[iP]->_faceIDs.begin(),
+ link._fIntPoints[iP]->_faceIDs.end() );
+
+ // get a point between 2 nodes
+ gp_Pnt p1 = n1->Point();
+ gp_Pnt p2 = n2->Point();
+ gp_Pnt pOnLink = 0.8 * p1.XYZ() + 0.2 * p2.XYZ();
+
TopLoc_Location loc;
- GeomAPI_ProjectPointOnSurf& proj =
- _grid->_helper->GetProjector( face, loc, 0.1*_grid->_tol );
- testPnt.Transform( loc );
- proj.Perform( testPnt );
- if ( proj.IsDone() &&
- proj.NbPoints() > 0 &&
- proj.LowerDistance() > _grid->_tol )
- {
- Quantity_Parameter u,v;
- proj.LowerDistanceParameters( u,v );
- gp_Dir normal;
- if ( GeomLib::NormEstim( BRep_Tool::Surface( face, loc ),
- gp_Pnt2d( u,v ),
- 0.1*_grid->_tol,
- normal ) < 3 )
- {
- if ( face.Orientation() == TopAbs_REVERSED )
- normal.Reverse();
- gp_Vec v( proj.NearestPoint(), testPnt );
- return v * normal > 0;
+
+ set< TGeomID >::iterator faceID = faceIDs.begin();
+ for ( ; faceID != faceIDs.end(); ++faceID )
+ {
+ // project pOnLink on a FACE
+ if ( *faceID < 1 ) continue;
+ const TopoDS_Face& face = TopoDS::Face( _grid->_shapes( *faceID ));
+ GeomAPI_ProjectPointOnSurf& proj =
+ helper.GetProjector( face, loc, 0.1*_grid->_tol );
+ gp_Pnt testPnt = pOnLink.Transformed( loc.Transformation().Inverted() );
+ proj.Perform( testPnt );
+ if ( proj.IsDone() && proj.NbPoints() > 0 )
+ {
+ Quantity_Parameter u,v;
+ proj.LowerDistanceParameters( u,v );
+
+ if ( proj.LowerDistance() <= 0.1 * _grid->_tol )
+ {
+ isOut = false;
+ }
+ else
+ {
+ // find isOut by normals
+ gp_Dir normal;
+ if ( GeomLib::NormEstim( BRep_Tool::Surface( face, loc ),
+ gp_Pnt2d( u,v ),
+ 0.1*_grid->_tol,
+ normal ) < 3 )
+ {
+ if ( face.Orientation() == TopAbs_REVERSED )
+ normal.Reverse();
+ gp_Vec v( proj.NearestPoint(), testPnt );
+ isOut = ( v * normal > 0 );
+ }
+ }
+ if ( !isOut )
+ {
+ // classify a projection
+ if ( !n1->IsOnFace( *faceID ) || !n2->IsOnFace( *faceID ))
+ {
+ BRepTopAdaptor_FClass2d cls( face, Precision::Confusion() );
+ TopAbs_State state = cls.Perform( gp_Pnt2d( u,v ));
+ if ( state == TopAbs_OUT )
+ {
+ isOut = true;
+ continue;
+ }
+ }
+ return false;
+ }
}
}
return isOut;
}
+ //================================================================================
+ /*!
+ * \brief Sort nodes on a FACE
+ */
+ void Hexahedron::sortVertexNodes(vector<_Node*>& nodes, _Node* curNode, TGeomID faceID)
+ {
+ if ( nodes.size() > 20 ) return;
+
+ // get shapes under nodes
+ TGeomID nShapeIds[20], *nShapeIdsEnd = &nShapeIds[0] + nodes.size();
+ for ( size_t i = 0; i < nodes.size(); ++i )
+ if ( !( nShapeIds[i] = nodes[i]->ShapeID() ))
+ return;
+
+ // get shapes of the FACE
+ const TopoDS_Face& face = TopoDS::Face( _grid->_shapes( faceID ));
+ list< TopoDS_Edge > edges;
+ list< int > nbEdges;
+ int nbW = SMESH_Block::GetOrderedEdges (face, edges, nbEdges);
+ if ( nbW > 1 ) {
+ // select a WIRE - remove EDGEs of irrelevant WIREs from edges
+ list< TopoDS_Edge >::iterator e = edges.begin(), eEnd = e;
+ list< int >::iterator nE = nbEdges.begin();
+ for ( ; nbW > 0; ++nE, --nbW )
+ {
+ std::advance( eEnd, *nE );
+ for ( ; e != eEnd; ++e )
+ for ( int i = 0; i < 2; ++i )
+ {
+ TGeomID id = i==0 ?
+ _grid->_shapes.FindIndex( *e ) :
+ _grid->_shapes.FindIndex( SMESH_MesherHelper::IthVertex( 0, *e ));
+ if (( id > 0 ) &&
+ ( std::find( &nShapeIds[0], nShapeIdsEnd, id ) != nShapeIdsEnd ))
+ {
+ edges.erase( eEnd, edges.end() ); // remove rest wires
+ e = eEnd = edges.end();
+ --e;
+ nbW = 0;
+ break;
+ }
+ }
+ if ( nbW > 0 )
+ edges.erase( edges.begin(), eEnd ); // remove a current irrelevant wire
+ }
+ }
+ // rotate edges to have the first one at least partially out of the hexa
+ list< TopoDS_Edge >::iterator e = edges.begin(), eMidOut = edges.end();
+ for ( ; e != edges.end(); ++e )
+ {
+ if ( !_grid->_shapes.FindIndex( *e ))
+ continue;
+ bool isOut = false;
+ gp_Pnt p;
+ double uvw[3], f,l;
+ for ( int i = 0; i < 2 && !isOut; ++i )
+ {
+ if ( i == 0 )
+ {
+ TopoDS_Vertex v = SMESH_MesherHelper::IthVertex( 0, *e );
+ p = BRep_Tool::Pnt( v );
+ }
+ else if ( eMidOut == edges.end() )
+ {
+ TopLoc_Location loc;
+ Handle(Geom_Curve) c = BRep_Tool::Curve( *e, loc, f, l);
+ if ( c.IsNull() ) break;
+ p = c->Value( 0.5 * ( f + l )).Transformed( loc );
+ }
+ else
+ {
+ continue;
+ }
+
+ _grid->ComputeUVW( p.XYZ(), uvw );
+ if ( isOutParam( uvw ))
+ {
+ if ( i == 0 )
+ isOut = true;
+ else
+ eMidOut = e;
+ }
+ }
+ if ( isOut )
+ break;
+ }
+ if ( e != edges.end() )
+ edges.splice( edges.end(), edges, edges.begin(), e );
+ else if ( eMidOut != edges.end() )
+ edges.splice( edges.end(), edges, edges.begin(), eMidOut );
+
+ // sort nodes accoring to the order of edges
+ _Node* orderNodes [20];
+ TGeomID orderShapeIDs[20];
+ int nbN = 0;
+ TGeomID id, *pID;
+ for ( e = edges.begin(); e != edges.end(); ++e )
+ {
+ if (( id = _grid->_shapes.FindIndex( SMESH_MesherHelper::IthVertex( 0, *e ))) &&
+ (( pID = std::find( &nShapeIds[0], nShapeIdsEnd, id )) != nShapeIdsEnd ))
+ {
+ orderShapeIDs[ nbN ] = id;
+ orderNodes [ nbN++ ] = nodes[ pID - &nShapeIds[0] ];
+ *pID = -1;
+ }
+ if (( id = _grid->_shapes.FindIndex( *e )) &&
+ (( pID = std::find( &nShapeIds[0], nShapeIdsEnd, id )) != nShapeIdsEnd ))
+ {
+ orderShapeIDs[ nbN ] = id;
+ orderNodes [ nbN++ ] = nodes[ pID - &nShapeIds[0] ];
+ *pID = -1;
+ }
+ }
+ if ( nbN != nodes.size() )
+ return;
+
+ bool reverse = ( orderNodes[0 ]->Point().SquareDistance( curNode->Point() ) >
+ orderNodes[nbN-1]->Point().SquareDistance( curNode->Point() ));
+
+ for ( size_t i = 0; i < nodes.size(); ++i )
+ nodes[ i ] = orderNodes[ reverse ? nbN-1-i : i ];
+ }
+
//================================================================================
/*!
* \brief Adds computed elements to the mesh
for ( size_t iP = 0; iP < _polygons.size(); ++iP )
{
const _Face& polygon = _polygons[iP];
+ if ( polygon._links.empty() )
+ continue;
gp_XYZ area (0,0,0);
gp_XYZ p1 = polygon._links[ 0 ].FirstNode()->Point().XYZ();
for ( size_t iL = 0; iL < polygon._links.size(); ++iL )
*/
bool Hexahedron::addHexa()
{
- if ( _polygons[0]._links.size() != 4 ||
- _polygons[1]._links.size() != 4 ||
- _polygons[2]._links.size() != 4 ||
- _polygons[3]._links.size() != 4 ||
- _polygons[4]._links.size() != 4 ||
- _polygons[5]._links.size() != 4 )
+ int nbQuad = 0, iQuad = -1;
+ for ( size_t i = 0; i < _polygons.size(); ++i )
+ {
+ if ( _polygons[i]._links.empty() )
+ continue;
+ if ( _polygons[i]._links.size() != 4 )
+ return false;
+ ++nbQuad;
+ if ( iQuad < 0 )
+ iQuad = i;
+ }
+ if ( nbQuad != 6 )
return false;
+
_Node* nodes[8];
int nbN = 0;
for ( int iL = 0; iL < 4; ++iL )
{
// a base node
- nodes[iL] = _polygons[0]._links[iL].FirstNode();
+ nodes[iL] = _polygons[iQuad]._links[iL].FirstNode();
++nbN;
// find a top node above the base node
- _Link* link = _polygons[0]._links[iL]._link;
+ _Link* link = _polygons[iQuad]._links[iL]._link;
if ( !link->_faces[0] || !link->_faces[1] )
return debugDumpLink( link );
- // a quadrangle sharing <link> with _polygons[0]
- _Face* quad = link->_faces[ bool( link->_faces[0] == & _polygons[0] )];
+ // a quadrangle sharing <link> with _polygons[iQuad]
+ _Face* quad = link->_faces[ bool( link->_faces[0] == & _polygons[iQuad] )];
for ( int i = 0; i < 4; ++i )
if ( quad->_links[i]._link == link )
{
}
}
if ( nbN == 8 )
- _volumeDefs.set( vector< _Node* >( nodes, nodes+8 ));
+ _volumeDefs.set( &nodes[0], 8 );
return nbN == 8;
}
*/
bool Hexahedron::addTetra()
{
+ int iTria = -1;
+ for ( size_t i = 0; i < _polygons.size() && iTria < 0; ++i )
+ if ( _polygons[i]._links.size() == 3 )
+ iTria = i;
+ if ( iTria < 0 )
+ return false;
+
_Node* nodes[4];
- nodes[0] = _polygons[0]._links[0].FirstNode();
- nodes[1] = _polygons[0]._links[1].FirstNode();
- nodes[2] = _polygons[0]._links[2].FirstNode();
+ nodes[0] = _polygons[iTria]._links[0].FirstNode();
+ nodes[1] = _polygons[iTria]._links[1].FirstNode();
+ nodes[2] = _polygons[iTria]._links[2].FirstNode();
- _Link* link = _polygons[0]._links[0]._link;
+ _Link* link = _polygons[iTria]._links[0]._link;
if ( !link->_faces[0] || !link->_faces[1] )
return debugDumpLink( link );
// a triangle sharing <link> with _polygons[0]
- _Face* tria = link->_faces[ bool( link->_faces[0] == & _polygons[0] )];
+ _Face* tria = link->_faces[ bool( link->_faces[0] == & _polygons[iTria] )];
for ( int i = 0; i < 3; ++i )
if ( tria->_links[i]._link == link )
{
nodes[3] = tria->_links[(i+1)%3].LastNode();
- _volumeDefs.set( vector< _Node* >( nodes, nodes+4 ));
+ _volumeDefs.set( &nodes[0], 4 );
return true;
}
}
}
if ( nbN == 6 )
- _volumeDefs.set( vector< _Node* >( nodes, nodes+6 ));
+ _volumeDefs.set( &nodes[0], 6 );
return ( nbN == 6 );
}
if ( tria->_links[i]._link == link )
{
nodes[4] = tria->_links[(i+1)%3].LastNode();
- _volumeDefs.set( vector< _Node* >( nodes, nodes+5 ));
+ _volumeDefs.set( &nodes[0], 5 );
return true;
}
#endif
return false;
}
+ //================================================================================
+ /*!
+ * \brief Classify a point by grid paremeters
+ */
+ bool Hexahedron::isOutParam(const double uvw[3]) const
+ {
+ return (( _grid->_coords[0][ _i ] - _grid->_tol > uvw[0] ) ||
+ ( _grid->_coords[0][ _i+1 ] + _grid->_tol < uvw[0] ) ||
+ ( _grid->_coords[1][ _j ] - _grid->_tol > uvw[1] ) ||
+ ( _grid->_coords[1][ _j+1 ] + _grid->_tol < uvw[1] ) ||
+ ( _grid->_coords[2][ _k ] - _grid->_tol > uvw[2] ) ||
+ ( _grid->_coords[2][ _k+1 ] + _grid->_tol < uvw[2] ));
+ }
//================================================================================
/*!
