-// Copyright (C) 2007-2013 CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2016 CEA/DEN, EDF R&D, OPEN CASCADE
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
+// version 2.1 of the License, or (at your option) any later version.
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
#include "SMDS_SetIterator.hxx"
#include "SMESHDS_Group.hxx"
#include "SMESHDS_Hypothesis.hxx"
+#include "SMESHDS_Mesh.hxx"
#include "SMESH_Algo.hxx"
#include "SMESH_ComputeError.hxx"
#include "SMESH_ControlsDef.hxx"
#include <TColStd_Array1OfReal.hxx>
#include <TopExp.hxx>
#include <TopExp_Explorer.hxx>
+#include <TopTools_IndexedDataMapOfShapeListOfShape.hxx>
#include <TopTools_IndexedMapOfShape.hxx>
+#include <TopTools_ListIteratorOfListOfShape.hxx>
+#include <TopTools_ListOfShape.hxx>
#include <TopTools_MapOfShape.hxx>
#include <TopoDS.hxx>
#include <TopoDS_Edge.hxx>
//virtual int NbElements() const { return _elements.size()+1; }
virtual int NbNodes() const { return Max( 0, _uvPtStructVec.size()-2 ); }
void SetUVPtStructVec(UVPtStructVec& vec) { _uvPtStructVec.swap( vec ); }
+ UVPtStructVec& GetUVPtStructVec() { return _uvPtStructVec; }
};
_ProxyMeshOfFace(const SMESH_Mesh& mesh): SMESH_ProxyMesh(mesh) {}
_EdgeSubMesh* GetEdgeSubMesh(int ID) { return (_EdgeSubMesh*) getProxySubMesh(ID); }
bool _isBlocked;// is more inflation possible or not
- gp_XY _normal2D; // to pcurve
+ gp_XY _normal2D; // to curve
double _len2dTo3dRatio; // to pass 2D <--> 3D
gp_Ax2d _ray; // a ray starting at _uvOut
vector<gp_XY> _uvRefined; // divisions by layers
bool SetNewLength( const double length );
+
+#ifdef _DEBUG_
+ int _ID;
+#endif
};
//--------------------------------------------------------------------------------
/*!
_PolyLine* _rightLine;
int _firstPntInd; // index in vector<UVPtStruct> of _wire
int _lastPntInd;
+ int _index; // index in _ViscousBuilder2D::_polyLineVec
vector< _LayerEdge > _lEdges; /* _lEdges[0] is usually is not treated
as it is equal to the last one of the _leftLine */
}
bool IsAdjacent( const _Segment& seg, const _LayerEdge* LE=0 ) const
{
- if ( LE && seg._indexInLine < _lEdges.size() &&
- ( seg._uv[0] == & LE->_uvIn ||
- seg._uv[1] == & LE->_uvIn ))
- return true;
+ if ( LE /*&& seg._indexInLine < _lEdges.size()*/ )
+ return ( seg._uv[0] == & LE->_uvIn ||
+ seg._uv[1] == & LE->_uvIn );
return ( & seg == &_leftLine->_segments.back() ||
& seg == &_rightLine->_segments[0] );
}
+ bool IsConcave() const;
};
//--------------------------------------------------------------------------------
/*!
double _D; // _vec1.Crossed( _vec2 )
double _param1, _param2; // intersection param on _seg1 and _seg2
+ _SegmentIntersection(): _D(0), _param1(0), _param2(0) {}
+
bool Compute(const _Segment& seg1, const _Segment& seg2, bool seg2IsRay = false )
{
+ // !!! If seg2IsRay, returns true at any _param2 !!!
const double eps = 1e-10;
_vec1 = seg1.p2() - seg1.p1();
_vec2 = seg2.p2() - seg2.p1();
_param1 = _vec2.Crossed(_vec21) / _D;
if (_param1 < -eps || _param1 > 1 + eps )
return false;
- _param2 = _vec1.Crossed(_vec21) / _D;
- if (_param2 < -eps || ( !seg2IsRay && _param2 > 1 + eps ))
- return false;
- return true;
+ _param2 = _vec1.Crossed(_vec21) / _D;
+ return seg2IsRay || ( _param2 > -eps && _param2 < 1 + eps );
}
bool Compute( const _Segment& seg1, const gp_Ax2d& ray )
{
//--------------------------------------------------------------------------------
typedef map< const SMDS_MeshNode*, _LayerEdge*, TIDCompare > TNode2Edge;
+ typedef StdMeshers_ViscousLayers2D THypVL;
//--------------------------------------------------------------------------------
/*!
public:
_ViscousBuilder2D(SMESH_Mesh& theMesh,
const TopoDS_Face& theFace,
- const StdMeshers_ViscousLayers2D* theHyp);
+ vector< const THypVL* > & theHyp,
+ vector< TopoDS_Shape > & theHypShapes);
SMESH_ComputeErrorPtr GetError() const { return _error; }
// does it's job
SMESH_ProxyMesh::Ptr Compute();
private:
+ friend class ::StdMeshers_ViscousLayers2D;
+
bool findEdgesWithLayers();
bool makePolyLines();
bool inflate();
const TopoDS_Edge& E,
const TopoDS_Vertex& V);
void setLenRatio( _LayerEdge& LE, const gp_Pnt& pOut );
- void setLayerEdgeData( _LayerEdge& lEdge,
- const double u,
- Handle(Geom2d_Curve)& pcurve,
- const bool reverse);
+ void setLayerEdgeData( _LayerEdge& lEdge,
+ const double u,
+ Handle(Geom2d_Curve)& pcurve,
+ Handle(Geom_Curve)& curve,
+ const gp_Pnt pOut,
+ const bool reverse,
+ GeomAPI_ProjectPointOnSurf* faceProj);
void adjustCommonEdge( _PolyLine& LL, _PolyLine& LR );
void calcLayersHeight(const double totalThick,
- vector<double>& heights);
+ vector<double>& heights,
+ const THypVL* hyp);
bool removeMeshFaces(const TopoDS_Shape& face);
+ const THypVL* getLineHypothesis(int iPL);
+ double getLineThickness (int iPL);
+
bool error( const string& text );
SMESHDS_Mesh* getMeshDS() { return _mesh->GetMeshDS(); }
_ProxyMeshOfFace* getProxyMesh();
// input data
SMESH_Mesh* _mesh;
TopoDS_Face _face;
- const StdMeshers_ViscousLayers2D* _hyp;
+ vector< const THypVL* > _hyps;
+ vector< TopoDS_Shape > _hypShapes;
// result data
SMESH_ProxyMesh::Ptr _proxyMesh;
SMESH_MesherHelper _helper;
TSideVector _faceSideVec; // wires (StdMeshers_FaceSide) of _face
vector<_PolyLine> _polyLineVec; // fronts to advance
+ vector< const THypVL* > _hypOfEdge; // a hyp per an EDGE of _faceSideVec
+ bool _is2DIsotropic; // is same U and V resoulution of _face
+ vector<TopoDS_Face> _clearedFaces; // FACEs whose mesh was removed by shrink()
- double _fPowN; // to compute thickness of layers
- double _thickness; // required or possible layers thickness
+ //double _fPowN; // to compute thickness of layers
+ double _maxThickness; // max possible layers thickness
// sub-shapes of _face
set<TGeomID> _ignoreShapeIds; // ids of EDGEs w/o layers
// are inflated along such EDGEs but then such _LayerEdge's are turned into
// a node on VERTEX, i.e. all nodes on a _LayerEdge are melded into one node.
+ int _nbLE; // for DEBUG
};
//================================================================================
/*!
* \brief Returns StdMeshers_ViscousLayers2D for the FACE
*/
- const StdMeshers_ViscousLayers2D* findHyp(SMESH_Mesh& theMesh,
- const TopoDS_Face& theFace)
+ bool findHyps(SMESH_Mesh& theMesh,
+ const TopoDS_Face& theFace,
+ vector< const StdMeshers_ViscousLayers2D* > & theHyps,
+ vector< TopoDS_Shape > & theAssignedTo)
{
+ theHyps.clear();
+ theAssignedTo.clear();
SMESH_HypoFilter hypFilter
( SMESH_HypoFilter::HasName( StdMeshers_ViscousLayers2D::GetHypType() ));
- const SMESH_Hypothesis * hyp =
- theMesh.GetHypothesis( theFace, hypFilter, /*ancestors=*/true );
- return dynamic_cast< const StdMeshers_ViscousLayers2D* > ( hyp );
+ list< const SMESHDS_Hypothesis * > hypList;
+ list< TopoDS_Shape > hypShapes;
+ int nbHyps = theMesh.GetHypotheses
+ ( theFace, hypFilter, hypList, /*ancestors=*/true, &hypShapes );
+ if ( nbHyps )
+ {
+ theHyps.reserve( nbHyps );
+ theAssignedTo.reserve( nbHyps );
+ list< const SMESHDS_Hypothesis * >::iterator hyp = hypList.begin();
+ list< TopoDS_Shape >::iterator shape = hypShapes.begin();
+ for ( ; hyp != hypList.end(); ++hyp, ++shape )
+ {
+ theHyps.push_back( static_cast< const StdMeshers_ViscousLayers2D* > ( *hyp ));
+ theAssignedTo.push_back( *shape );
+ }
+ }
+ return nbHyps;
+ }
+
+ //================================================================================
+ /*!
+ * \brief Returns ids of EDGEs not to create Viscous Layers on
+ * \param [in] theHyp - the hypothesis, holding edges either to ignore or not to.
+ * \param [in] theFace - the FACE whose EDGEs are checked.
+ * \param [in] theMesh - the mesh.
+ * \param [in,out] theEdgeIds - container returning EDGEs to ignore.
+ * \return int - number of found EDGEs of the FACE.
+ */
+ //================================================================================
+
+ int getEdgesToIgnore( const StdMeshers_ViscousLayers2D* theHyp,
+ const TopoDS_Shape& theFace,
+ const SMESHDS_Mesh* theMesh,
+ set< int > & theEdgeIds)
+ {
+ int nbEdgesToIgnore = 0;
+ vector<TGeomID> ids = theHyp->GetBndShapes();
+ if ( theHyp->IsToIgnoreShapes() ) // EDGEs to ignore are given
+ {
+ for ( size_t i = 0; i < ids.size(); ++i )
+ {
+ const TopoDS_Shape& E = theMesh->IndexToShape( ids[i] );
+ if ( !E.IsNull() &&
+ E.ShapeType() == TopAbs_EDGE &&
+ SMESH_MesherHelper::IsSubShape( E, theFace ))
+ {
+ theEdgeIds.insert( ids[i] );
+ ++nbEdgesToIgnore;
+ }
+ }
+ }
+ else // EDGEs to make the Viscous Layers on are given
+ {
+ TopExp_Explorer E( theFace, TopAbs_EDGE );
+ for ( ; E.More(); E.Next(), ++nbEdgesToIgnore )
+ theEdgeIds.insert( theMesh->ShapeToIndex( E.Current() ));
+
+ for ( size_t i = 0; i < ids.size(); ++i )
+ nbEdgesToIgnore -= theEdgeIds.erase( ids[i] );
+ }
+ return nbEdgesToIgnore;
}
} // namespace VISCOUS_2D
StdMeshers_ViscousLayers2D::Compute(SMESH_Mesh& theMesh,
const TopoDS_Face& theFace)
{
- SMESH_ProxyMesh::Ptr pm;
+ using namespace VISCOUS_2D;
+ vector< const StdMeshers_ViscousLayers2D* > hyps;
+ vector< TopoDS_Shape > hypShapes;
- const StdMeshers_ViscousLayers2D* vlHyp = VISCOUS_2D::findHyp( theMesh, theFace );
- if ( vlHyp )
+ SMESH_ProxyMesh::Ptr pm = _ProxyMeshHolder::FindProxyMeshOfFace( theFace, theMesh );
+ if ( !pm )
{
- VISCOUS_2D::_ViscousBuilder2D builder( theMesh, theFace, vlHyp );
- pm = builder.Compute();
- SMESH_ComputeErrorPtr error = builder.GetError();
- if ( error && !error->IsOK() )
- theMesh.GetSubMesh( theFace )->GetComputeError() = error;
- else if ( !pm )
+ if ( findHyps( theMesh, theFace, hyps, hypShapes ))
+ {
+ VISCOUS_2D::_ViscousBuilder2D builder( theMesh, theFace, hyps, hypShapes );
+ pm = builder.Compute();
+ SMESH_ComputeErrorPtr error = builder.GetError();
+ if ( error && !error->IsOK() )
+ theMesh.GetSubMesh( theFace )->GetComputeError() = error;
+ else if ( !pm )
+ pm.reset( new SMESH_ProxyMesh( theMesh ));
+ if ( getenv("__ONLY__VL2D__"))
+ pm.reset();
+ }
+ else
+ {
pm.reset( new SMESH_ProxyMesh( theMesh ));
- if ( getenv("__ONLY__VL2D__"))
- pm.reset();
+ }
}
- else
+ return pm;
+}
+// --------------------------------------------------------------------------------
+void StdMeshers_ViscousLayers2D::SetProxyMeshOfEdge( const StdMeshers_FaceSide& edgeNodes )
+{
+ using namespace VISCOUS_2D;
+ SMESH_ProxyMesh::Ptr pm =
+ _ProxyMeshHolder::FindProxyMeshOfFace( edgeNodes.Face(), *edgeNodes.GetMesh() );
+ if ( !pm ) {
+ _ProxyMeshOfFace* proxyMeshOfFace = new _ProxyMeshOfFace( *edgeNodes.GetMesh() );
+ pm.reset( proxyMeshOfFace );
+ new _ProxyMeshHolder( edgeNodes.Face(), pm );
+ }
+ _ProxyMeshOfFace* proxyMeshOfFace = static_cast<_ProxyMeshOfFace*>( pm.get() );
+ _ProxyMeshOfFace::_EdgeSubMesh* sm = proxyMeshOfFace->GetEdgeSubMesh( edgeNodes.EdgeID(0) );
+ sm->GetUVPtStructVec() = edgeNodes.GetUVPtStruct();
+}
+// --------------------------------------------------------------------------------
+bool StdMeshers_ViscousLayers2D::HasProxyMesh( const TopoDS_Face& face, SMESH_Mesh& mesh )
+{
+ return VISCOUS_2D::_ProxyMeshHolder::FindProxyMeshOfFace( face, mesh ).get();
+}
+// --------------------------------------------------------------------------------
+SMESH_ComputeErrorPtr
+StdMeshers_ViscousLayers2D::CheckHypothesis(SMESH_Mesh& theMesh,
+ const TopoDS_Shape& theShape,
+ SMESH_Hypothesis::Hypothesis_Status& theStatus)
+{
+ SMESH_ComputeErrorPtr error = SMESH_ComputeError::New(COMPERR_OK);
+ theStatus = SMESH_Hypothesis::HYP_OK;
+
+ TopExp_Explorer exp( theShape, TopAbs_FACE );
+ for ( ; exp.More() && theStatus == SMESH_Hypothesis::HYP_OK; exp.Next() )
{
- pm.reset( new SMESH_ProxyMesh( theMesh ));
+ const TopoDS_Face& face = TopoDS::Face( exp.Current() );
+ vector< const StdMeshers_ViscousLayers2D* > hyps;
+ vector< TopoDS_Shape > hypShapes;
+ if ( VISCOUS_2D::findHyps( theMesh, face, hyps, hypShapes ))
+ {
+ VISCOUS_2D::_ViscousBuilder2D builder( theMesh, face, hyps, hypShapes );
+ builder._faceSideVec =
+ StdMeshers_FaceSide::GetFaceWires( face, theMesh, true, error,
+ SMESH_ProxyMesh::Ptr(),
+ /*theCheckVertexNodes=*/false);
+ if ( error->IsOK() && !builder.findEdgesWithLayers())
+ {
+ error = builder.GetError();
+ if ( error && !error->IsOK() )
+ theStatus = SMESH_Hypothesis::HYP_INCOMPAT_HYPS;
+ }
+ }
}
- return pm;
+ return error;
}
// --------------------------------------------------------------------------------
void StdMeshers_ViscousLayers2D::RestoreListeners() const
*/
//================================================================================
-_ViscousBuilder2D::_ViscousBuilder2D(SMESH_Mesh& theMesh,
- const TopoDS_Face& theFace,
- const StdMeshers_ViscousLayers2D* theHyp):
- _mesh( &theMesh ), _face( theFace ), _hyp( theHyp ), _helper( theMesh )
+_ViscousBuilder2D::_ViscousBuilder2D(SMESH_Mesh& theMesh,
+ const TopoDS_Face& theFace,
+ vector< const THypVL* > & theHyps,
+ vector< TopoDS_Shape > & theAssignedTo):
+ _mesh( &theMesh ), _face( theFace ), _helper( theMesh )
{
+ _hyps.swap( theHyps );
+ _hypShapes.swap( theAssignedTo );
+
_helper.SetSubShape( _face );
- _helper.SetElementsOnShape(true);
+ _helper.SetElementsOnShape( true );
- //_face.Orientation( TopAbs_FORWARD );
+ _face.Orientation( TopAbs_FORWARD ); // 2D logic works only in this case
_surface = BRep_Tool::Surface( _face );
- if ( _hyp )
- _fPowN = pow( _hyp->GetStretchFactor(), _hyp->GetNumberLayers() );
+ _error = SMESH_ComputeError::New(COMPERR_OK);
+
+ _nbLE = 0;
}
//================================================================================
bool _ViscousBuilder2D::error(const string& text )
{
- cout << "_ViscousBuilder2D::error " << text << endl;
_error->myName = COMPERR_ALGO_FAILED;
_error->myComment = string("Viscous layers builder 2D: ") + text;
if ( SMESH_subMesh* sm = _mesh->GetSubMesh( _face ) )
_error->myAlgo = smError->myAlgo;
smError = _error;
}
- //makeGroupOfLE(); // debug
-
+#ifdef _DEBUG_
+ cout << "_ViscousBuilder2D::error " << text << endl;
+#endif
return false;
}
SMESH_ProxyMesh::Ptr _ViscousBuilder2D::Compute()
{
- _error = SMESH_ComputeError::New(COMPERR_OK);
- _faceSideVec = StdMeshers_FaceSide::GetFaceWires( _face, *_mesh, true, _error );
+ _faceSideVec = StdMeshers_FaceSide::GetFaceWires( _face, *_mesh, true, _error);
+
if ( !_error->IsOK() )
return _proxyMesh;
bool _ViscousBuilder2D::findEdgesWithLayers()
{
- // collect all EDGEs to ignore defined by hyp
- int nbMyEdgesIgnored = 0;
- vector<TGeomID> ids = _hyp->GetBndShapesToIgnore();
- for ( size_t i = 0; i < ids.size(); ++i )
+ // collect all EDGEs to ignore defined by _hyps
+ typedef std::pair< set<TGeomID>, const THypVL* > TEdgesOfHyp;
+ vector< TEdgesOfHyp > ignoreEdgesOfHyp( _hyps.size() );
+ for ( size_t i = 0; i < _hyps.size(); ++i )
+ {
+ ignoreEdgesOfHyp[i].second = _hyps[i];
+ getEdgesToIgnore( _hyps[i], _face, getMeshDS(), ignoreEdgesOfHyp[i].first );
+ }
+
+ // get all shared EDGEs
+ TopTools_MapOfShape sharedEdges;
+ TopTools_IndexedMapOfShape hypFaces; // faces with VL hyps
+ for ( size_t i = 0; i < _hypShapes.size(); ++i )
+ TopExp::MapShapes( _hypShapes[i], TopAbs_FACE, hypFaces );
+ TopTools_IndexedDataMapOfShapeListOfShape facesOfEdgeMap;
+ for ( int iF = 1; iF <= hypFaces.Extent(); ++iF )
+ TopExp::MapShapesAndAncestors( hypFaces(iF), TopAbs_EDGE, TopAbs_FACE, facesOfEdgeMap);
+ for ( int iE = 1; iE <= facesOfEdgeMap.Extent(); ++iE )
+ if ( facesOfEdgeMap( iE ).Extent() > 1 )
+ sharedEdges.Add( facesOfEdgeMap.FindKey( iE ));
+
+ // fill _hypOfEdge
+ if ( _hyps.size() > 1 )
{
- const TopoDS_Shape& s = getMeshDS()->IndexToShape( ids[i] );
- if ( !s.IsNull() && s.ShapeType() == TopAbs_EDGE ) {
- _ignoreShapeIds.insert( ids[i] );
- nbMyEdgesIgnored += ( _helper.IsSubShape( s, _face ));
+ // check if two hypotheses define different parameters for the same EDGE
+ for ( size_t iWire = 0; iWire < _faceSideVec.size(); ++iWire )
+ {
+ StdMeshers_FaceSidePtr wire = _faceSideVec[ iWire ];
+ for ( int iE = 0; iE < wire->NbEdges(); ++iE )
+ {
+ const THypVL* hyp = 0;
+ const TGeomID edgeID = wire->EdgeID( iE );
+ if ( !sharedEdges.Contains( wire->Edge( iE )))
+ {
+ for ( size_t i = 0; i < ignoreEdgesOfHyp.size(); ++i )
+ if ( ! ignoreEdgesOfHyp[i].first.count( edgeID ))
+ {
+ if ( hyp )
+ return error(SMESH_Comment("Several hypotheses define "
+ "Viscous Layers on the edge #") << edgeID );
+ hyp = ignoreEdgesOfHyp[i].second;
+ }
+ }
+ _hypOfEdge.push_back( hyp );
+ if ( !hyp )
+ _ignoreShapeIds.insert( edgeID );
+ }
+ // check if two hypotheses define different number of viscous layers for
+ // adjacent EDGEs
+ const THypVL *hyp, *prevHyp = _hypOfEdge.back();
+ size_t iH = _hypOfEdge.size() - wire->NbEdges();
+ for ( ; iH < _hypOfEdge.size(); ++iH )
+ {
+ hyp = _hypOfEdge[ iH ];
+ if ( hyp && prevHyp &&
+ hyp->GetNumberLayers() != prevHyp->GetNumberLayers() )
+ {
+ return error("Two hypotheses define different number of "
+ "viscous layers on adjacent edges");
+ }
+ prevHyp = hyp;
+ }
}
}
+ else if ( _hyps.size() == 1 )
+ {
+ _ignoreShapeIds.swap( ignoreEdgesOfHyp[0].first );
+ }
+
+ // check all EDGEs of the _face to fill _ignoreShapeIds and _noShrinkVert
- // check all EDGEs of the _face
int totalNbEdges = 0;
for ( size_t iWire = 0; iWire < _faceSideVec.size(); ++iWire )
{
StdMeshers_FaceSidePtr wire = _faceSideVec[ iWire ];
totalNbEdges += wire->NbEdges();
for ( int iE = 0; iE < wire->NbEdges(); ++iE )
- if ( _helper.NbAncestors( wire->Edge( iE ), *_mesh, TopAbs_FACE ) > 1 )
+ {
+ if ( sharedEdges.Contains( wire->Edge( iE )))
{
// ignore internal EDGEs (shared by several FACEs)
- TGeomID edgeID = getMeshDS()->ShapeToIndex( wire->Edge( iE ));
+ const TGeomID edgeID = wire->EdgeID( iE );
_ignoreShapeIds.insert( edgeID );
// check if ends of an EDGE are to be added to _noShrinkVert
- PShapeIteratorPtr faceIt = _helper.GetAncestors( wire->Edge( iE ), *_mesh, TopAbs_FACE );
- while ( const TopoDS_Shape* neighbourFace = faceIt->next() )
+ const TopTools_ListOfShape& faceList = facesOfEdgeMap.FindFromKey( wire->Edge( iE ));
+ TopTools_ListIteratorOfListOfShape faceIt( faceList );
+ for ( ; faceIt.More(); faceIt.Next() )
{
- if ( neighbourFace->IsSame( _face )) continue;
- SMESH_Algo* algo = _mesh->GetGen()->GetAlgo( *_mesh, *neighbourFace );
+ const TopoDS_Shape& neighbourFace = faceIt.Value();
+ if ( neighbourFace.IsSame( _face )) continue;
+ SMESH_Algo* algo = _mesh->GetGen()->GetAlgo( *_mesh, neighbourFace );
if ( !algo ) continue;
const StdMeshers_ViscousLayers2D* viscHyp = 0;
const list <const SMESHDS_Hypothesis *> & allHyps =
- algo->GetUsedHypothesis(*_mesh, *neighbourFace, /*noAuxiliary=*/false);
+ algo->GetUsedHypothesis(*_mesh, neighbourFace, /*noAuxiliary=*/false);
list< const SMESHDS_Hypothesis *>::const_iterator hyp = allHyps.begin();
for ( ; hyp != allHyps.end() && !viscHyp; ++hyp )
viscHyp = dynamic_cast<const StdMeshers_ViscousLayers2D*>( *hyp );
- set<TGeomID> neighbourIgnoreEdges;
- if (viscHyp) {
- vector<TGeomID> ids = _hyp->GetBndShapesToIgnore();
- neighbourIgnoreEdges.insert( ids.begin(), ids.end() );
- }
+ // set<TGeomID> neighbourIgnoreEdges;
+ // if (viscHyp)
+ // getEdgesToIgnore( viscHyp, neighbourFace, getMeshDS(), neighbourIgnoreEdges );
+
for ( int iV = 0; iV < 2; ++iV )
{
TopoDS_Vertex vertex = iV ? wire->LastVertex(iE) : wire->FirstVertex(iE);
PShapeIteratorPtr edgeIt = _helper.GetAncestors( vertex, *_mesh, TopAbs_EDGE );
while ( const TopoDS_Shape* edge = edgeIt->next() )
if ( !edge->IsSame( wire->Edge( iE )) &&
- neighbourIgnoreEdges.count( getMeshDS()->ShapeToIndex( *edge )))
- _noShrinkVert.insert( getMeshDS()->ShapeToIndex( vertex ));
+ _helper.IsSubShape( *edge, neighbourFace ))
+ {
+ const TGeomID neighbourID = getMeshDS()->ShapeToIndex( *edge );
+ bool hasVL = !sharedEdges.Contains( *edge );
+ if ( hasVL )
+ {
+ hasVL = false;
+ for ( hyp = allHyps.begin(); hyp != allHyps.end() && !hasVL; ++hyp )
+ if (( viscHyp = dynamic_cast<const THypVL*>( *hyp )))
+ hasVL = viscHyp->IsShapeWithLayers( neighbourID );
+ }
+ if ( !hasVL )
+ {
+ _noShrinkVert.insert( getMeshDS()->ShapeToIndex( vertex ));
+ break;
+ }
+ }
}
}
}
}
+ }
}
+
+ int nbMyEdgesIgnored = _ignoreShapeIds.size();
+
+ // add VERTEXes w/o layers to _ignoreShapeIds (this is used by toShrinkForAdjacent())
+ // for ( size_t iWire = 0; iWire < _faceSideVec.size(); ++iWire )
+ // {
+ // StdMeshers_FaceSidePtr wire = _faceSideVec[ iWire ];
+ // for ( int iE = 0; iE < wire->NbEdges(); ++iE )
+ // {
+ // TGeomID edge1 = wire->EdgeID( iE );
+ // TGeomID edge2 = wire->EdgeID( iE+1 );
+ // if ( _ignoreShapeIds.count( edge1 ) && _ignoreShapeIds.count( edge2 ))
+ // _ignoreShapeIds.insert( getMeshDS()->ShapeToIndex( wire->LastVertex( iE )));
+ // }
+ // }
+
return ( nbMyEdgesIgnored < totalNbEdges );
}
//================================================================================
/*!
- * \brief Create the inner front of the viscous layers and prepare data for infation
+ * \brief Create the inner front of the viscous layers and prepare data for inflation
*/
//================================================================================
// count total nb of EDGEs to allocate _polyLineVec
int nbEdges = 0;
for ( size_t iWire = 0; iWire < _faceSideVec.size(); ++iWire )
- nbEdges += _faceSideVec[ iWire ]->NbEdges();
+ {
+ StdMeshers_FaceSidePtr wire = _faceSideVec[ iWire ];
+ nbEdges += wire->NbEdges();
+ if ( wire->GetUVPtStruct().empty() && wire->NbPoints() > 0 )
+ return error("Invalid node parameters on some EDGE");
+ }
_polyLineVec.resize( nbEdges );
+ // check if 2D normal should be computed by 3D one by means of projection
+ GeomAPI_ProjectPointOnSurf* faceProj = 0;
+ TopLoc_Location loc;
+ {
+ _LayerEdge tmpLE;
+ const UVPtStruct& uv = _faceSideVec[0]->GetUVPtStruct()[0];
+ gp_Pnt p = SMESH_TNodeXYZ( uv.node );
+ tmpLE._uvOut.SetCoord( uv.u, uv.v );
+ tmpLE._normal2D.SetCoord( 1., 0. );
+ setLenRatio( tmpLE, p );
+ const double r1 = tmpLE._len2dTo3dRatio;
+ tmpLE._normal2D.SetCoord( 0., 1. );
+ setLenRatio( tmpLE, p );
+ const double r2 = tmpLE._len2dTo3dRatio;
+ // projection is needed if two _len2dTo3dRatio's differ too much
+ const double maxR = Max( r2, r1 );
+ if ( Abs( r2-r1 )/maxR > 0.2*maxR )
+ faceProj = & _helper.GetProjector( _face, loc );
+ }
+ _is2DIsotropic = !faceProj;
+
// Assign data to _PolyLine's
// ---------------------------
{
StdMeshers_FaceSidePtr wire = _faceSideVec[ iWire ];
const vector<UVPtStruct>& points = wire->GetUVPtStruct();
- if ( points.empty() && wire->NbPoints() > 0 )
- return error("Invalid node parameters on some EDGE");
int iPnt = 0;
for ( int iE = 0; iE < wire->NbEdges(); ++iE )
{
_PolyLine& L = _polyLineVec[ iPoLine++ ];
+ L._index = iPoLine-1;
L._wire = wire.get();
L._edgeInd = iE;
L._advancable = !_ignoreShapeIds.count( wire->EdgeID( iE ));
// TODO: add more _LayerEdge's to strongly curved EDGEs
// in order not to miss collisions
+ double u; gp_Pnt p;
+ Handle(Geom_Curve) curve = BRep_Tool::Curve( L._wire->Edge( iE ), loc, u, u );
Handle(Geom2d_Curve) pcurve = L._wire->Curve2d( L._edgeInd );
const bool reverse = (( L._wire->Edge( iE ).Orientation() == TopAbs_REVERSED ) ^
(_face.Orientation() == TopAbs_REVERSED ));
for ( int i = L._firstPntInd; i <= L._lastPntInd; ++i )
{
_LayerEdge& lEdge = L._lEdges[ i - L._firstPntInd ];
- const double u = ( i == L._firstPntInd ? wire->FirstU(iE) : points[ i ].param );
- setLayerEdgeData( lEdge, u, pcurve, reverse );
- setLenRatio( lEdge, SMESH_TNodeXYZ( points[ i ].node ) );
+ u = ( i == L._firstPntInd ? wire->FirstU(iE) : points[ i ].param );
+ p = SMESH_TNodeXYZ( points[ i ].node );
+ setLayerEdgeData( lEdge, u, pcurve, curve, p, reverse, faceProj );
+ setLenRatio( lEdge, p );
}
- if ( L._lastPntInd - L._firstPntInd + 1 < 3 ) // add 3d _LayerEdge in the middle
+ if ( L._lastPntInd - L._firstPntInd + 1 < 3 ) // add 3-d _LayerEdge in the middle
{
L._lEdges[2] = L._lEdges[1];
- const double u = 0.5 * ( wire->FirstU(iE) + wire->LastU(iE) );
- setLayerEdgeData( L._lEdges[1], u, pcurve, reverse );
- gp_Pnt p = 0.5 * ( SMESH_TNodeXYZ( points[ L._firstPntInd ].node ) +
- SMESH_TNodeXYZ( points[ L._lastPntInd ].node ));
+ u = 0.5 * ( wire->FirstU(iE) + wire->LastU(iE) );
+ if ( !curve.IsNull() )
+ p = curve->Value( u );
+ else
+ p = 0.5 * ( SMESH_TNodeXYZ( points[ L._firstPntInd ].node ) +
+ SMESH_TNodeXYZ( points[ L._lastPntInd ].node ));
+ setLayerEdgeData( L._lEdges[1], u, pcurve, curve, p, reverse, faceProj );
setLenRatio( L._lEdges[1], p );
}
}
// Evaluate max possible _thickness if required layers thickness seems too high
// ----------------------------------------------------------------------------
- _thickness = _hyp->GetTotalThickness();
+ _maxThickness = _hyps[0]->GetTotalThickness();
+ for ( size_t iH = 1; iH < _hyps.size(); ++iH )
+ _maxThickness = Max( _maxThickness, _hyps[iH]->GetTotalThickness() );
+
_SegmentTree::box_type faceBndBox2D;
for ( iPoLine = 0; iPoLine < _polyLineVec.size(); ++iPoLine )
faceBndBox2D.Add( *_polyLineVec[ iPoLine]._segTree->getBox() );
- double boxTol = 1e-3 * sqrt( faceBndBox2D.SquareExtent() );
- //
- if ( _thickness * maxLen2dTo3dRatio > sqrt( faceBndBox2D.SquareExtent() ) / 10 )
+ const double boxTol = 1e-3 * sqrt( faceBndBox2D.SquareExtent() );
+
+ if ( _maxThickness * maxLen2dTo3dRatio > sqrt( faceBndBox2D.SquareExtent() ) / 10 )
{
vector< const _Segment* > foundSegs;
double maxPossibleThick = 0;
{
double distToL2 = intersection._param2 / L1._lEdges[iLE]._len2dTo3dRatio;
double psblThick = distToL2 / ( 1 + L1._advancable + L2._advancable );
- if ( maxPossibleThick < psblThick )
- maxPossibleThick = psblThick;
+ maxPossibleThick = Max( psblThick, maxPossibleThick );
}
}
}
}
- _thickness = Min( _hyp->GetTotalThickness(), maxPossibleThick );
+ if ( maxPossibleThick > 0. )
+ _maxThickness = Min( _maxThickness, maxPossibleThick );
}
// Adjust _LayerEdge's at _PolyLine's extremities
for ( iPoLine = 0; iPoLine < _polyLineVec.size(); ++iPoLine )
{
lineBoxes[ iPoLine ] = *_polyLineVec[ iPoLine ]._segTree->getBox();
- if ( _polyLineVec[ iPoLine ]._advancable )
- lineBoxes[ iPoLine ].Enlarge( maxLen2dTo3dRatio * _thickness * 2 );
+ lineBoxes[ iPoLine ].Enlarge( maxLen2dTo3dRatio * getLineThickness( iPoLine ) *
+ ( _polyLineVec[ iPoLine ]._advancable ? 2. : 1.2 ));
}
// _reachableLines
for ( iPoLine = 0; iPoLine < _polyLineVec.size(); ++iPoLine )
{
_PolyLine& L1 = _polyLineVec[ iPoLine ];
+ const double thick1 = getLineThickness( iPoLine );
for ( size_t iL2 = 0; iL2 < _polyLineVec.size(); ++iL2 )
{
_PolyLine& L2 = _polyLineVec[ iL2 ];
{
_LayerEdge& LE = L1._lEdges[iLE];
if ( !lineBoxes[ iL2 ].IsOut ( LE._uvOut,
- LE._uvOut + LE._normal2D *_thickness * LE._len2dTo3dRatio ))
+ LE._uvOut + LE._normal2D * thick1 * LE._len2dTo3dRatio ))
{
L1._reachableLines.push_back( & L2 );
break;
// Remove _LayerEdge's intersecting the normAvg to avoid collisions
// during inflate().
//
- // find max length of the VERTEX based _LayerEdge whose direction is normAvg
- double maxLen2D = _thickness * EL._len2dTo3dRatio;
- const gp_XY& pCommOut = ER._uvOut;
- gp_XY pCommIn = pCommOut + normAvg * maxLen2D;
+ // find max length of the VERTEX-based _LayerEdge whose direction is normAvg
+ double maxLen2D = _maxThickness * EL._len2dTo3dRatio;
+ const gp_XY& pCommOut = ER._uvOut;
+ gp_XY pCommIn = pCommOut + normAvg * maxLen2D;
_Segment segCommon( pCommOut, pCommIn );
_SegmentIntersection intersection;
vector< const _Segment* > foundSegs;
_SegmentIntersection lastIntersection;
for ( ; iLE < L._lEdges.size(); ++iLE, eIt += dIt )
{
- gp_XY uvIn = eIt->_uvOut + eIt->_normal2D * _thickness * eIt->_len2dTo3dRatio;
+ gp_XY uvIn = eIt->_uvOut + eIt->_normal2D * _maxThickness * eIt->_len2dTo3dRatio;
_Segment segOfEdge( eIt->_uvOut, uvIn );
if ( !intersection.Compute( segCommon, segOfEdge ))
break;
lastIntersection._param1 = intersection._param1;
lastIntersection._param2 = intersection._param2;
}
- if ( iLE >= L._lEdges.size () - 1 )
+ if ( iLE >= L._lEdges.size() - 1 )
{
// all _LayerEdge's intersect the segCommon, limit inflation
- // of remaining 2 _LayerEdge's
+ // of remaining 3 _LayerEdge's
vector< _LayerEdge > newEdgeVec( Min( 3, L._lEdges.size() ));
newEdgeVec.front() = L._lEdges.front();
newEdgeVec.back() = L._lEdges.back();
if ( newEdgeVec.size() == 3 )
- newEdgeVec[1] = L._lEdges[ L._lEdges.size() / 2 ];
+ {
+ newEdgeVec[1] = L._lEdges[ isR ? (L._lEdges.size() - 2) : 1 ];
+ newEdgeVec[1]._len2dTo3dRatio *= lastIntersection._param2;
+ }
L._lEdges.swap( newEdgeVec );
if ( !isR ) std::swap( lastIntersection._param1 , lastIntersection._param2 );
L._lEdges.front()._len2dTo3dRatio *= lastIntersection._param1; // ??
*/
//================================================================================
-void _ViscousBuilder2D::setLayerEdgeData( _LayerEdge& lEdge,
- const double u,
- Handle(Geom2d_Curve)& pcurve,
- const bool reverse)
+void _ViscousBuilder2D::setLayerEdgeData( _LayerEdge& lEdge,
+ const double u,
+ Handle(Geom2d_Curve)& pcurve,
+ Handle(Geom_Curve)& curve,
+ const gp_Pnt pOut,
+ const bool reverse,
+ GeomAPI_ProjectPointOnSurf* faceProj)
{
- gp_Pnt2d uv; gp_Vec2d tangent;
- pcurve->D1( u, uv, tangent );
- tangent.Normalize();
- if ( reverse )
- tangent.Reverse();
+ gp_Pnt2d uv;
+ if ( faceProj && !curve.IsNull() )
+ {
+ uv = pcurve->Value( u );
+ gp_Vec tangent; gp_Pnt p; gp_Vec du, dv;
+ curve->D1( u, p, tangent );
+ if ( reverse )
+ tangent.Reverse();
+ _surface->D1( uv.X(), uv.Y(), p, du, dv );
+ gp_Vec faceNorm = du ^ dv;
+ gp_Vec normal = faceNorm ^ tangent;
+ normal.Normalize();
+ p = pOut.XYZ() + normal.XYZ() * /*1e-2 * */_hyps[0]->GetTotalThickness() / _hyps[0]->GetNumberLayers();
+ faceProj->Perform( p );
+ if ( !faceProj->IsDone() || faceProj->NbPoints() < 1 )
+ return setLayerEdgeData( lEdge, u, pcurve, curve, p, reverse, NULL );
+ Quantity_Parameter U,V;
+ faceProj->LowerDistanceParameters(U,V);
+ lEdge._normal2D.SetCoord( U - uv.X(), V - uv.Y() );
+ lEdge._normal2D.Normalize();
+ }
+ else
+ {
+ gp_Vec2d tangent;
+ pcurve->D1( u, uv, tangent );
+ tangent.Normalize();
+ if ( reverse )
+ tangent.Reverse();
+ lEdge._normal2D.SetCoord( -tangent.Y(), tangent.X() );
+ }
lEdge._uvOut = lEdge._uvIn = uv.XY();
- lEdge._normal2D.SetCoord( -tangent.Y(), tangent.X() );
- lEdge._ray.SetLocation( lEdge._uvOut );
+ lEdge._ray.SetLocation ( lEdge._uvOut );
lEdge._ray.SetDirection( lEdge._normal2D );
lEdge._isBlocked = false;
lEdge._length2D = 0;
+#ifdef _DEBUG_
+ lEdge._ID = _nbLE++;
+#endif
}
//================================================================================
{
// Limit size of inflation step by geometry size found by
// itersecting _LayerEdge's with _Segment's
- double minSize = _thickness, maxSize = 0;
+ double minSize = _maxThickness, maxSize = 0;
vector< const _Segment* > foundSegs;
_SegmentIntersection intersection;
for ( size_t iL1 = 0; iL1 < _polyLineVec.size(); ++iL1 )
{
double distToL2 = intersection._param2 / L1._lEdges[iLE]._len2dTo3dRatio;
double size = distToL2 / ( 1 + L1._advancable + L2._advancable );
- if ( size < minSize )
+ if ( 1e-10 < size && size < minSize )
minSize = size;
if ( size > maxSize )
maxSize = size;
}
}
if ( minSize > maxSize ) // no collisions possible
- maxSize = _thickness;
+ maxSize = _maxThickness;
#ifdef __myDEBUG
cout << "-- minSize = " << minSize << ", maxSize = " << maxSize << endl;
#endif
double curThick = 0, stepSize = minSize;
int nbSteps = 0;
- if ( maxSize > _thickness )
- maxSize = _thickness;
+ if ( maxSize > _maxThickness )
+ maxSize = _maxThickness;
while ( curThick < maxSize )
{
curThick += stepSize * 1.25;
- if ( curThick > _thickness )
- curThick = _thickness;
+ if ( curThick > _maxThickness )
+ curThick = _maxThickness;
// Elongate _LayerEdge's
for ( size_t iL = 0; iL < _polyLineVec.size(); ++iL )
{
_PolyLine& L = _polyLineVec[ iL ];
if ( !L._advancable ) continue;
+ const double lineThick = Min( curThick, getLineThickness( iL ));
bool lenChange = false;
for ( size_t iLE = L.FirstLEdge(); iLE < L._lEdges.size(); ++iLE )
- lenChange |= L._lEdges[iLE].SetNewLength( curThick );
+ lenChange |= L._lEdges[iLE].SetNewLength( lineThick );
// for ( int k=0; k<L._segments.size(); ++k)
// cout << "( " << L._segments[k].p1().X() << ", " <<L._segments[k].p1().Y() << " ) "
// << "( " << L._segments[k].p2().X() << ", " <<L._segments[k].p2().Y() << " ) "
{
break; // no more inflating possible
}
- stepSize = Max( stepSize , _thickness / 10. );
+ stepSize = Max( stepSize , _maxThickness / 10. );
nbSteps++;
}
_PolyLine::TEdgeIterator eIt = isR ? L._lEdges.end()-1 : L._lEdges.begin();
if ( eIt->_length2D == 0 ) continue;
_Segment seg1( eIt->_uvOut, eIt->_uvIn );
- for ( eIt += deltaIt; nbRemove < L._lEdges.size()-1; eIt += deltaIt )
+ for ( eIt += deltaIt; nbRemove < (int)L._lEdges.size()-1; eIt += deltaIt )
{
_Segment seg2( eIt->_uvOut, eIt->_uvIn );
if ( !intersection.Compute( seg1, seg2 ))
++nbRemove;
}
if ( nbRemove > 0 ) {
- if ( nbRemove == L._lEdges.size()-1 ) // 1st and last _LayerEdge's intersect
+ if ( nbRemove == (int)L._lEdges.size()-1 ) // 1st and last _LayerEdge's intersect
{
--nbRemove;
_LayerEdge& L0 = L._lEdges.front();
{
// look for intersections of _Segment's by intersecting _LayerEdge's with
// _Segment's
- //double maxStep = 0, minStep = 1e+100;
vector< const _Segment* > foundSegs;
_SegmentIntersection intersection;
double newLen2D = dist2DToL2 / 2;
if ( newLen2D < 1.1 * LE1._length2D ) // collision!
{
- if ( newLen2D < LE1._length2D )
+ if ( newLen2D > 0 || !L1._advancable )
{
blockedEdgesList.push_back( &LE1 );
- if ( L1._advancable )
+ if ( L1._advancable && newLen2D > 0 )
{
edgeLenLimitList.push_back( make_pair( &LE1, newLen2D ));
blockedEdgesList.push_back( &L2._lEdges[ foundSegs[i]->_indexInLine ]);
}
else // here dist2DToL2 < 0 and LE1._length2D == 0
{
- _LayerEdge LE2[2] = { L2._lEdges[ foundSegs[i]->_indexInLine ],
- L2._lEdges[ foundSegs[i]->_indexInLine + 1 ] };
- _Segment outSeg2( LE2[0]._uvOut, LE2[1]._uvOut );
+ _LayerEdge* LE2[2] = { & L2._lEdges[ foundSegs[i]->_indexInLine ],
+ & L2._lEdges[ foundSegs[i]->_indexInLine + 1 ] };
+ _Segment outSeg2( LE2[0]->_uvOut, LE2[1]->_uvOut );
intersection.Compute( outSeg2, LE1._ray );
newLen2D = intersection._param2 / 2;
-
- edgeLenLimitList.push_back( make_pair( &LE2[0], newLen2D ));
- edgeLenLimitList.push_back( make_pair( &LE2[1], newLen2D ));
+ if ( newLen2D > 0 )
+ {
+ edgeLenLimitList.push_back( make_pair( LE2[0], newLen2D ));
+ edgeLenLimitList.push_back( make_pair( LE2[1], newLen2D ));
+ }
}
}
}
}
}
+ // limit length of _LayerEdge's that are extrema of _PolyLine's
+ // to avoid intersection of these _LayerEdge's
+ for ( size_t iL1 = 0; iL1 < _polyLineVec.size(); ++iL1 )
+ {
+ _PolyLine& L = _polyLineVec[ iL1 ];
+ if ( L._lEdges.size() < 4 ) // all intermediate _LayerEdge's intersect with extremum ones
+ {
+ _LayerEdge& LEL = L._leftLine->_lEdges.back();
+ _LayerEdge& LER = L._lEdges.back();
+ _Segment segL( LEL._uvOut, LEL._uvIn );
+ _Segment segR( LER._uvOut, LER._uvIn );
+ double newLen2DL, newLen2DR;
+ if ( intersection.Compute( segL, LER._ray ))
+ {
+ newLen2DR = intersection._param2 / 2;
+ newLen2DL = LEL._length2D * intersection._param1 / 2;
+ }
+ else if ( intersection.Compute( segR, LEL._ray ))
+ {
+ newLen2DL = intersection._param2 / 2;
+ newLen2DR = LER._length2D * intersection._param1 / 2;
+ }
+ else
+ {
+ continue;
+ }
+ if ( newLen2DL > 0 && newLen2DR > 0 )
+ {
+ if ( newLen2DL < 1.1 * LEL._length2D )
+ edgeLenLimitList.push_back( make_pair( &LEL, newLen2DL ));
+ if ( newLen2DR < 1.1 * LER._length2D )
+ edgeLenLimitList.push_back( make_pair( &LER, newLen2DR ));
+ }
+ }
+ }
+
// set limited length to _LayerEdge's
list< pair< _LayerEdge*, double > >::iterator edge2Len = edgeLenLimitList.begin();
for ( ; edge2Len != edgeLenLimitList.end(); ++edge2Len )
{
_LayerEdge* LE = edge2Len->first;
- LE->SetNewLength( edge2Len->second / LE->_len2dTo3dRatio );
+ if ( LE->_length2D > edge2Len->second )
+ {
+ LE->_isBlocked = false;
+ LE->SetNewLength( edge2Len->second / LE->_len2dTo3dRatio );
+ }
LE->_isBlocked = true;
}
if ( nbAdvancable == 0 )
continue;
- const TopoDS_Edge& E = L._wire->Edge ( L._edgeInd );
- const int edgeID = L._wire->EdgeID ( L._edgeInd );
- const double edgeLen = L._wire->EdgeLength( L._edgeInd );
- Handle(Geom2d_Curve) pcurve = L._wire->Curve2d ( L._edgeInd );
+ const TopoDS_Vertex& V1 = L._wire->FirstVertex( L._edgeInd );
+ const TopoDS_Vertex& V2 = L._wire->LastVertex ( L._edgeInd );
+ const int v1ID = getMeshDS()->ShapeToIndex( V1 );
+ const int v2ID = getMeshDS()->ShapeToIndex( V2 );
+ const bool isShrinkableL = ! _noShrinkVert.count( v1ID ) && L._leftLine->_advancable;
+ const bool isShrinkableR = ! _noShrinkVert.count( v2ID ) && L._rightLine->_advancable;
+ if ( !isShrinkableL && !isShrinkableR )
+ continue;
+
+ const TopoDS_Edge& E = L._wire->Edge ( L._edgeInd );
+ const int edgeID = L._wire->EdgeID ( L._edgeInd );
+ const double edgeLen = L._wire->EdgeLength ( L._edgeInd );
+ Handle(Geom2d_Curve) pcurve = L._wire->Curve2d ( L._edgeInd );
const bool edgeReversed = ( E.Orientation() == TopAbs_REVERSED );
SMESH_MesherHelper helper( *_mesh ); // to create nodes and edges on E
{
adjFace = TopoDS::Face( *f );
SMESH_ProxyMesh::Ptr pm = _ProxyMeshHolder::FindProxyMeshOfFace( adjFace, *_mesh );
- if ( !pm || pm->NbProxySubMeshes() == 0 )
+ if ( !pm || pm->NbProxySubMeshes() == 0 /*|| !pm->GetProxySubMesh( E )*/)
{
// There are no viscous layers on an adjacent FACE, clear it's 2D mesh
removeMeshFaces( adjFace );
+ // if ( removeMeshFaces( adjFace ))
+ // _clearedFaces.push_back( adjFace ); // to re-compute after all
}
else
{
//
const vector<UVPtStruct>& points = L._wire->GetUVPtStruct();
int iPFrom = L._firstPntInd, iPTo = L._lastPntInd;
- if ( L._leftLine->_advancable )
+ if ( isShrinkableL )
{
+ const THypVL* hyp = getLineHypothesis( L._leftLine->_index );
vector<gp_XY>& uvVec = L._lEdges.front()._uvRefined;
- for ( int i = 0; i < _hyp->GetNumberLayers(); ++i ) {
+ for ( int i = 0; i < hyp->GetNumberLayers(); ++i ) {
const UVPtStruct& uvPt = points[ iPFrom + i + 1 ];
L._leftNodes.push_back( uvPt.node );
uvVec.push_back ( pcurve->Value( uvPt.param ).XY() );
}
+ iPFrom += hyp->GetNumberLayers();
}
- if ( L._rightLine->_advancable )
+ if ( isShrinkableR )
{
+ const THypVL* hyp = getLineHypothesis( L._rightLine->_index );
vector<gp_XY>& uvVec = L._lEdges.back()._uvRefined;
- for ( int i = 0; i < _hyp->GetNumberLayers(); ++i ) {
+ for ( int i = 0; i < hyp->GetNumberLayers(); ++i ) {
const UVPtStruct& uvPt = points[ iPTo - i - 1 ];
L._rightNodes.push_back( uvPt.node );
uvVec.push_back ( pcurve->Value( uvPt.param ).XY() );
}
+ iPTo -= hyp->GetNumberLayers();
}
// make proxy sub-mesh data of present nodes
//
- if ( L._leftLine->_advancable ) iPFrom += _hyp->GetNumberLayers();
- if ( L._rightLine->_advancable ) iPTo -= _hyp->GetNumberLayers();
UVPtStructVec nodeDataVec( & points[ iPFrom ], & points[ iPTo + 1 ]);
double normSize = nodeDataVec.back().normParam - nodeDataVec.front().normParam;
myEdgeSM->SetUVPtStructVec( nodeDataVec );
existingNodesFound = true;
+ break;
}
} // loop on FACEs sharing E
+ // Check if L is an already shrinked seam
+ if ( adjFace.IsNull() && _helper.IsRealSeam( edgeID ))
+ if ( L._wire->Edge( L._edgeInd ).Orientation() == TopAbs_FORWARD )
+ continue;
+ // Commented as a case with a seam EDGE (issue 0052461) is hard to support
+ // because SMESH_ProxyMesh can't hold different sub-meshes for two
+ // 2D representations of the seam. But such a case is not a real practice one.
+ // {
+ // for ( int iL2 = iL1-1; iL2 > -1; --iL2 )
+ // {
+ // _PolyLine& L2 = _polyLineVec[ iL2 ];
+ // if ( edgeID == L2._wire->EdgeID( L2._edgeInd ))
+ // {
+ // // copy layer nodes
+ // const int seamPar = _helper.GetPeriodicIndex();
+ // vector<gp_XY>& uvVec = L._lEdges.front()._uvRefined;
+ // if ( isShrinkableL )
+ // {
+ // L._leftNodes = L2._rightNodes;
+ // uvVec = L2._lEdges.back()._uvRefined;
+ // }
+ // if ( isShrinkableR )
+ // {
+ // L._rightNodes = L2._leftNodes;
+ // uvVec = L2._lEdges.front()._uvRefined;
+ // }
+ // for ( size_t i = 0; i < uvVec.size(); ++i )
+ // {
+ // gp_XY & uv = uvVec[i];
+ // uv.SetCoord( seamPar, _helper.GetOtherParam( uv.Coord( seamPar )));
+ // }
+
+ // existingNodesFound = true;
+ // break;
+ // }
+ // }
+ // }
+
if ( existingNodesFound )
continue; // nothing more to do in this case
// x-x-x-x-----x-----x----
// | | | | e1 e2 e3
- int isRShrinkedForAdjacent;
+ int isRShrinkedForAdjacent = 0;
UVPtStructVec nodeDataForAdjacent;
for ( int isR = 0; isR < 2; ++isR )
{
if ( !L2->_advancable &&
!toShrinkForAdjacent( adjFace, E, L._wire->FirstVertex( L._edgeInd + isR )))
continue;
+ if ( isR ? !isShrinkableR : !isShrinkableL )
+ continue;
double & u = isR ? u2 : u1; // param to move
double u0 = isR ? ul : uf; // init value of the param to move
length1D = Abs( u - curveInt.Point( 1 ).ParamOnFirst() );
double maxDist2d = 2 * L2->_lEdges[ iLSeg2 ]._length2D;
isConvex = ( length1D < maxDist2d * len1dTo2dRatio );
- /* |L seg2
- * | o---o---
- * | / |
- * |/ | L2
- * x------x--- */
+ /* |L seg2
+ * | o---o---
+ * | / |
+ * |/ | L2
+ * x------x--- */
}
- if ( !isConvex ) { /* concave VERTEX */ /* o-----o---
- * \ |
+ if ( !isConvex ) { /* concave VERTEX */ /* o-----o---
+ * \ |
* \ | L2
- * x--x---
- * /
+ * x--x---
+ * /
* L / */
length2D = L2->_lEdges[ iFSeg2 ]._length2D;
//if ( L2->_advancable ) continue;
( isR ? L._leftLine->_lEdges.back() : L._rightLine->_lEdges.front() );
length2D = neighborLE._length2D;
if ( length2D == 0 )
- length2D = _thickness * nearLE._len2dTo3dRatio;
+ length2D = _maxThickness * nearLE._len2dTo3dRatio;
}
}
// move u to the internal boundary of layers
// u --> u
// x-x-x-x-----x-----x----
- double maxLen3D = Min( _thickness, edgeLen / ( 1 + nbAdvancable ));
+ double maxLen3D = Min( _maxThickness, edgeLen / ( 1 + nbAdvancable ));
double maxLen2D = maxLen3D * nearLE._len2dTo3dRatio;
if ( !length2D ) length2D = length1D / len1dTo2dRatio;
if ( Abs( length2D ) > maxLen2D )
// compute params of layers on L
vector<double> heights;
- calcLayersHeight( u - u0, heights );
+ const THypVL* hyp = getLineHypothesis( L2->_index );
+ calcLayersHeight( u - u0, heights, hyp );
//
vector< double > params( heights.size() );
for ( size_t i = 0; i < params.size(); ++i )
// x-x-x-x---
vector< const SMDS_MeshNode* >& layersNode = isR ? L._rightNodes : L._leftNodes;
vector<gp_XY>& nodeUV = ( isR ? L._lEdges.back() : L._lEdges[0] )._uvRefined;
- nodeUV.resize ( _hyp->GetNumberLayers() );
- layersNode.resize( _hyp->GetNumberLayers() );
+ nodeUV.resize ( hyp->GetNumberLayers() );
+ layersNode.resize( hyp->GetNumberLayers() );
const SMDS_MeshNode* vertexNode = nodeDataVec[ iPEnd ].node;
const SMDS_MeshNode * prevNode = vertexNode;
for ( size_t i = 0; i < params.size(); ++i )
{
- gp_Pnt p = curve.Value( params[i] );
+ const gp_Pnt p = curve.Value( params[i] );
layersNode[ i ] = helper.AddNode( p.X(), p.Y(), p.Z(), /*id=*/0, params[i] );
nodeUV [ i ] = pcurve->Value( params[i] ).XY();
helper.AddEdge( prevNode, layersNode[ i ] );
if ( !L2->_advancable )
{
isRShrinkedForAdjacent = isR;
- nodeDataForAdjacent.resize( _hyp->GetNumberLayers() );
+ nodeDataForAdjacent.resize( hyp->GetNumberLayers() );
size_t iFrw = 0, iRev = nodeDataForAdjacent.size()-1, *i = isR ? &iRev : &iFrw;
nodeDataForAdjacent[ *i ] = points[ isR ? L._lastPntInd : L._firstPntInd ];
{
const SMDS_MeshElement* segment = segIt->next();
if ( segment->getshapeId() != edgeID ) continue;
-
+
const int nbNodes = segment->NbNodes();
for ( int i = 0; i < nbNodes; ++i )
{
}
// concatenate nodeDataVec and nodeDataForAdjacent
nodeDataVec.insert(( isRShrinkedForAdjacent ? nodeDataVec.end() : nodeDataVec.begin() ),
- nodeDataForAdjacent.begin(), nodeDataForAdjacent.end() );
+ nodeDataForAdjacent.begin(), nodeDataForAdjacent.end() );
}
// Extend nodeDataVec by a node located at the end of not shared _LayerEdge
/* n - to add to nodeDataVec
- * o-----o---
- * |\ |
+ * o-----o---
+ * |\ |
* | o---o---
* | |x--x--- L2
- * | /
+ * | /
* |/ L
* x
* / */
{
// refine the not shared _LayerEdge
vector<double> layersHeight;
- calcLayersHeight( LE2._length2D, layersHeight );
+ calcLayersHeight( LE2._length2D, layersHeight, getLineHypothesis( L2._index ));
vector<gp_XY>& nodeUV2 = LE2._uvRefined;
- nodeUV2.resize ( _hyp->GetNumberLayers() );
- layerNodes2.resize( _hyp->GetNumberLayers() );
+ nodeUV2.resize ( layersHeight.size() );
+ layerNodes2.resize( layersHeight.size() );
for ( size_t i = 0; i < layersHeight.size(); ++i )
{
gp_XY uv = LE2._uvOut + LE2._normal2D * layersHeight[i];
nodeDataVec.insert(( isR ? nodeDataVec.end() : nodeDataVec.begin() ), ptOfNode );
// recompute normParam of nodes in nodeDataVec
- newLength = GCPnts_AbscissaPoint::Length( curve,
+ newLength = GCPnts_AbscissaPoint::Length( curve,
nodeDataVec.front().param,
nodeDataVec.back().param);
for ( size_t iP = 1; iP < nodeDataVec.size(); ++iP )
const TopoDS_Edge& E,
const TopoDS_Vertex& V)
{
- if ( const StdMeshers_ViscousLayers2D* vlHyp = findHyp( *_mesh, adjFace ))
+ if ( _noShrinkVert.count( getMeshDS()->ShapeToIndex( V )) || adjFace.IsNull() )
+ return false;
+
+ vector< const StdMeshers_ViscousLayers2D* > hyps;
+ vector< TopoDS_Shape > hypShapes;
+ if ( VISCOUS_2D::findHyps( *_mesh, adjFace, hyps, hypShapes ))
{
- VISCOUS_2D::_ViscousBuilder2D builder( *_mesh, adjFace, vlHyp );
+ VISCOUS_2D::_ViscousBuilder2D builder( *_mesh, adjFace, hyps, hypShapes );
builder._faceSideVec = StdMeshers_FaceSide::GetFaceWires( adjFace, *_mesh, true, _error );
builder.findEdgesWithLayers();
}
return false;
}
-
+
//================================================================================
/*!
* \brief Make faces
bool _ViscousBuilder2D::refine()
{
+ // find out orientation of faces to create
+ bool isReverse =
+ ( _helper.GetSubShapeOri( _mesh->GetShapeToMesh(), _face ) == TopAbs_REVERSED );
+
// store a proxyMesh in a sub-mesh
// make faces on each _PolyLine
vector< double > layersHeight;
- double prevLen2D = -1;
+ //double prevLen2D = -1;
for ( size_t iL = 0; iL < _polyLineVec.size(); ++iL )
{
_PolyLine& L = _polyLineVec[ iL ];
if ( !L._advancable ) continue;
// replace an inactive (1st) _LayerEdge with an active one of a neighbour _PolyLine
- size_t iLE = 0, nbLE = L._lEdges.size();
+ //size_t iLE = 0, nbLE = L._lEdges.size();
const bool leftEdgeShared = L.IsCommonEdgeShared( *L._leftLine );
const bool rightEdgeShared = L.IsCommonEdgeShared( *L._rightLine );
if ( /*!L._leftLine->_advancable &&*/ leftEdgeShared )
{
L._lEdges[0] = L._leftLine->_lEdges.back();
- iLE += int( !L._leftLine->_advancable );
+ //iLE += int( !L._leftLine->_advancable );
}
if ( !L._rightLine->_advancable && rightEdgeShared )
{
L._lEdges.back() = L._rightLine->_lEdges[0];
- --nbLE;
+ //--nbLE;
}
// limit length of neighbour _LayerEdge's to avoid sharp change of layers thickness
+
vector< double > segLen( L._lEdges.size() );
segLen[0] = 0.0;
- for ( size_t i = 1; i < segLen.size(); ++i )
- {
- // accumulate length of segments
- double sLen = (L._lEdges[i-1]._uvOut - L._lEdges[i]._uvOut ).Modulus();
- segLen[i] = segLen[i-1] + sLen;
- }
- for ( int isR = 0; isR < 2; ++isR )
+
+ // check if length modification is usefull: look for _LayerEdge's
+ // with length limited due to collisions
+ bool lenLimited = false;
+ for ( size_t iLE = 1; ( iLE < L._lEdges.size()-1 && !lenLimited ); ++iLE )
+ lenLimited = L._lEdges[ iLE ]._isBlocked;
+
+ if ( lenLimited )
{
- size_t iF = 0, iL = L._lEdges.size()-1;
- size_t *i = isR ? &iL : &iF;
- //size_t iRef = *i;
- _LayerEdge* prevLE = & L._lEdges[ *i ];
- double weight = 0;
- for ( ++iF, --iL; iF < L._lEdges.size()-1; ++iF, --iL )
+ for ( size_t i = 1; i < segLen.size(); ++i )
{
- _LayerEdge& LE = L._lEdges[*i];
- if ( prevLE->_length2D > 0 ) {
- gp_XY tangent ( LE._normal2D.Y(), -LE._normal2D.X() );
- weight += Abs( tangent * ( prevLE->_uvIn - LE._uvIn )) / segLen.back();
- gp_XY prevTang = ( LE._uvOut - prevLE->_uvOut );
- gp_XY prevNorm = gp_XY( -prevTang.Y(), prevTang.X() );
- double prevProj = prevNorm * ( prevLE->_uvIn - prevLE->_uvOut );
- if ( prevProj > 0 ) {
- prevProj /= prevTang.Modulus();
- if ( LE._length2D < prevProj )
- weight += 0.75 * ( 1 - weight ); // length decrease is more preferable
- LE._length2D = weight * LE._length2D + ( 1 - weight ) * prevProj;
- LE._uvIn = LE._uvOut + LE._normal2D * LE._length2D;
- }
- }
- prevLE = & LE;
+ // accumulate length of segments
+ double sLen = (L._lEdges[i-1]._uvOut - L._lEdges[i]._uvOut ).Modulus();
+ segLen[i] = segLen[i-1] + sLen;
}
- }
+ const double totSegLen = segLen.back();
+ // normalize the accumulated length
+ for ( size_t iS = 1; iS < segLen.size(); ++iS )
+ segLen[iS] /= totSegLen;
- // calculate intermediate UV on _LayerEdge's ( _LayerEdge::_uvRefined )
- for ( ; iLE < nbLE; ++iLE )
- {
- _LayerEdge& LE = L._lEdges[iLE];
- if ( fabs( LE._length2D - prevLen2D ) > LE._length2D / 100. )
+ for ( int isR = 0; isR < 2; ++isR )
{
- calcLayersHeight( LE._length2D, layersHeight );
- prevLen2D = LE._length2D;
+ size_t iF = 0, iL = L._lEdges.size()-1;
+ size_t *i = isR ? &iL : &iF;
+ _LayerEdge* prevLE = & L._lEdges[ *i ];
+ double weight = 0;
+ for ( ++iF, --iL; iF < L._lEdges.size()-1; ++iF, --iL )
+ {
+ _LayerEdge& LE = L._lEdges[*i];
+ if ( prevLE->_length2D > 0 )
+ {
+ gp_XY tangent ( LE._normal2D.Y(), -LE._normal2D.X() );
+ weight += Abs( tangent * ( prevLE->_uvIn - LE._uvIn )) / totSegLen;
+ // gp_XY prevTang( LE._uvOut - prevLE->_uvOut );
+ // gp_XY prevNorm( -prevTang.Y(), prevTang.X() );
+ gp_XY prevNorm = LE._normal2D;
+ double prevProj = prevNorm * ( prevLE->_uvIn - prevLE->_uvOut );
+ if ( prevProj > 0 ) {
+ prevProj /= prevNorm.Modulus();
+ if ( LE._length2D < prevProj )
+ weight += 0.75 * ( 1 - weight ); // length decrease is more preferable
+ LE._length2D = weight * LE._length2D + ( 1 - weight ) * prevProj;
+ LE._uvIn = LE._uvOut + LE._normal2D * LE._length2D;
+ }
+ }
+ prevLE = & LE;
+ }
}
- for ( size_t i = 0; i < layersHeight.size(); ++i )
- LE._uvRefined.push_back( LE._uvOut + LE._normal2D * layersHeight[i] );
}
+ // DEBUG: to see _uvRefined. cout can be redirected to hide NETGEN output
+ // cerr << "import smesh" << endl << "mesh = smesh.Mesh()"<< endl;
- // nodes to create 1 layer of faces
- vector< const SMDS_MeshNode* > outerNodes( L._lastPntInd - L._firstPntInd + 1 );
- vector< const SMDS_MeshNode* > innerNodes( L._lastPntInd - L._firstPntInd + 1 );
-
- // initialize outerNodes by node on the L._wire
const vector<UVPtStruct>& points = L._wire->GetUVPtStruct();
- for ( int i = L._firstPntInd; i <= L._lastPntInd; ++i )
- outerNodes[ i-L._firstPntInd ] = points[i].node;
- // compute normalized [0;1] node parameters of outerNodes
- vector< double > normPar( L._lastPntInd - L._firstPntInd + 1 );
+ // analyse extremities of the _PolyLine to find existing nodes
+ const TopoDS_Vertex& V1 = L._wire->FirstVertex( L._edgeInd );
+ const TopoDS_Vertex& V2 = L._wire->LastVertex ( L._edgeInd );
+ const int v1ID = getMeshDS()->ShapeToIndex( V1 );
+ const int v2ID = getMeshDS()->ShapeToIndex( V2 );
+ const bool isShrinkableL = ! _noShrinkVert.count( v1ID );
+ const bool isShrinkableR = ! _noShrinkVert.count( v2ID );
+
+ bool hasLeftNode = ( !L._leftLine->_rightNodes.empty() && leftEdgeShared );
+ bool hasRightNode = ( !L._rightLine->_leftNodes.empty() && rightEdgeShared );
+ bool hasOwnLeftNode = ( !L._leftNodes.empty() );
+ bool hasOwnRightNode = ( !L._rightNodes.empty() );
+ bool isClosedEdge = ( points[ L._firstPntInd ].node == points[ L._lastPntInd ].node );
+ const size_t
+ nbN = L._lastPntInd - L._firstPntInd + 1,
+ iN0 = ( hasLeftNode || hasOwnLeftNode || isClosedEdge || !isShrinkableL ),
+ iNE = nbN - ( hasRightNode || hasOwnRightNode || !isShrinkableR );
+
+ // update _uvIn of end _LayerEdge's by existing nodes
+ const SMDS_MeshNode *nL = 0, *nR = 0;
+ if ( hasOwnLeftNode ) nL = L._leftNodes.back();
+ else if ( hasLeftNode ) nL = L._leftLine->_rightNodes.back();
+ if ( hasOwnRightNode ) nR = L._rightNodes.back();
+ else if ( hasRightNode ) nR = L._rightLine->_leftNodes.back();
+ if ( nL )
+ L._lEdges[0]._uvIn = _helper.GetNodeUV( _face, nL, points[ L._firstPntInd + 1 ].node );
+ if ( nR )
+ L._lEdges.back()._uvIn = _helper.GetNodeUV( _face, nR, points[ L._lastPntInd - 1 ].node );
+
+ // compute normalized [0;1] node parameters of nodes on a _PolyLine
+ vector< double > normPar( nbN );
const double
normF = L._wire->FirstParameter( L._edgeInd ),
normL = L._wire->LastParameter ( L._edgeInd ),
for ( int i = L._firstPntInd; i <= L._lastPntInd; ++i )
normPar[ i - L._firstPntInd ] = ( points[i].normParam - normF ) / normDist;
- // Create layers of faces
-
- bool hasLeftNode = ( !L._leftLine->_rightNodes.empty() && leftEdgeShared );
- bool hasRightNode = ( !L._rightLine->_leftNodes.empty() && rightEdgeShared );
- bool hasOwnLeftNode = ( !L._leftNodes.empty() );
- bool hasOwnRightNode = ( !L._rightNodes.empty() );
- bool isClosedEdge = ( outerNodes.front() == outerNodes.back() );
- size_t iS,
- iN0 = ( hasLeftNode || hasOwnLeftNode || isClosedEdge ),
- nbN = innerNodes.size() - ( hasRightNode || hasOwnRightNode );
- L._leftNodes .reserve( _hyp->GetNumberLayers() );
- L._rightNodes.reserve( _hyp->GetNumberLayers() );
- for ( int iF = 0; iF < _hyp->GetNumberLayers(); ++iF ) // loop on layers of faces
+ // Calculate UV of most inner nodes
+
+ vector< gp_XY > innerUV( nbN );
+
+ // check if innerUV should be interpolated between _LayerEdge::_uvIn's
+ const size_t nbLE = L._lEdges.size();
+ bool needInterpol = ( nbN != nbLE );
+ if ( !needInterpol )
{
- // get accumulated length of intermediate segments
- for ( iS = 1; iS < segLen.size(); ++iS )
+ // more check: compare length of inner and outer end segments
+ double lenIn, lenOut;
+ for ( int isR = 0; isR < 2 && !needInterpol; ++isR )
{
- double sLen = (L._lEdges[iS-1]._uvRefined[iF] - L._lEdges[iS]._uvRefined[iF] ).Modulus();
- segLen[iS] = segLen[iS-1] + sLen;
+ const _Segment& segIn = isR ? L._segments.back() : L._segments[0];
+ const gp_XY& uvIn1 = segIn.p1();
+ const gp_XY& uvIn2 = segIn.p2();
+ const gp_XY& uvOut1 = L._lEdges[ isR ? nbLE-1 : 0 ]._uvOut;
+ const gp_XY& uvOut2 = L._lEdges[ isR ? nbLE-2 : 1 ]._uvOut;
+ if ( _is2DIsotropic )
+ {
+ lenIn = ( uvIn1 - uvIn2 ).Modulus();
+ lenOut = ( uvOut1 - uvOut2 ).Modulus();
+ }
+ else
+ {
+ lenIn = _surface->Value( uvIn1.X(), uvIn1.Y() )
+ .Distance( _surface->Value( uvIn2.X(), uvIn2.Y() ));
+ lenOut = _surface->Value( uvOut1.X(), uvOut1.Y() )
+ .Distance( _surface->Value( uvOut2.X(), uvOut2.Y() ));
+ }
+ needInterpol = ( lenIn < 0.66 * lenOut );
}
+ }
+
+ if ( needInterpol )
+ {
+ // compute normalized accumulated length of inner segments
+ size_t iS;
+ if ( _is2DIsotropic )
+ for ( iS = 1; iS < segLen.size(); ++iS )
+ {
+ double sLen = ( L._lEdges[iS-1]._uvIn - L._lEdges[iS]._uvIn ).Modulus();
+ segLen[iS] = segLen[iS-1] + sLen;
+ }
+ else
+ for ( iS = 1; iS < segLen.size(); ++iS )
+ {
+ const gp_XY& uv1 = L._lEdges[iS-1]._uvIn;
+ const gp_XY& uv2 = L._lEdges[iS ]._uvIn;
+ gp_Pnt p1 = _surface->Value( uv1.X(), uv1.Y() );
+ gp_Pnt p2 = _surface->Value( uv2.X(), uv2.Y() );
+ double sLen = p1.Distance( p2 );
+ segLen[iS] = segLen[iS-1] + sLen;
+ }
// normalize the accumulated length
for ( iS = 1; iS < segLen.size(); ++iS )
segLen[iS] /= segLen.back();
- // create innerNodes of a current layer
+ // calculate UV of most inner nodes according to the normalized node parameters
iS = 0;
- for ( size_t i = iN0; i < nbN; ++i )
+ for ( size_t i = 0; i < innerUV.size(); ++i )
{
while ( normPar[i] > segLen[iS+1] )
++iS;
double r = ( normPar[i] - segLen[iS] ) / ( segLen[iS+1] - segLen[iS] );
- gp_XY uv = r * L._lEdges[iS+1]._uvRefined[iF] + (1-r) * L._lEdges[iS]._uvRefined[iF];
- gp_Pnt p = _surface->Value( uv.X(), uv.Y() );
+ innerUV[ i ] = r * L._lEdges[iS+1]._uvIn + (1-r) * L._lEdges[iS]._uvIn;
+ }
+ }
+ else // ! needInterpol
+ {
+ for ( size_t i = 0; i < nbLE; ++i )
+ innerUV[ i ] = L._lEdges[i]._uvIn;
+ }
+
+ // normalized height of layers
+ const THypVL* hyp = getLineHypothesis( iL );
+ calcLayersHeight( 1., layersHeight, hyp);
+
+ // Create layers of faces
+
+ // nodes to create 1 layer of faces
+ vector< const SMDS_MeshNode* > outerNodes( nbN );
+ vector< const SMDS_MeshNode* > innerNodes( nbN );
+
+ // initialize outerNodes by nodes of the L._wire
+ for ( int i = L._firstPntInd; i <= L._lastPntInd; ++i )
+ outerNodes[ i-L._firstPntInd ] = points[i].node;
+
+ L._leftNodes .reserve( hyp->GetNumberLayers() );
+ L._rightNodes.reserve( hyp->GetNumberLayers() );
+ int cur = 0, prev = -1; // to take into account orientation of _face
+ if ( isReverse ) std::swap( cur, prev );
+ for ( int iF = 0; iF < hyp->GetNumberLayers(); ++iF ) // loop on layers of faces
+ {
+ // create innerNodes of a current layer
+ for ( size_t i = iN0; i < iNE; ++i )
+ {
+ gp_XY uvOut = points[ L._firstPntInd + i ].UV();
+ gp_XY& uvIn = innerUV[ i ];
+ gp_XY uv = layersHeight[ iF ] * uvIn + ( 1.-layersHeight[ iF ]) * uvOut;
+ gp_Pnt p = _surface->Value( uv.X(), uv.Y() );
innerNodes[i] = _helper.AddNode( p.X(), p.Y(), p.Z(), /*id=*/0, uv.X(), uv.Y() );
}
// use nodes created for adjacent _PolyLine's
if ( hasOwnRightNode ) innerNodes.back() = L._rightNodes[ iF ];
else if ( hasRightNode ) innerNodes.back() = L._rightLine->_leftNodes[ iF ];
if ( isClosedEdge ) innerNodes.front() = innerNodes.back(); // circle
- if ( !hasOwnLeftNode ) L._leftNodes.push_back( innerNodes.front() );
- if ( !hasOwnRightNode ) L._rightNodes.push_back( innerNodes.back() );
+ if ( !isShrinkableL ) innerNodes.front() = outerNodes.front();
+ if ( !isShrinkableR ) innerNodes.back() = outerNodes.back();
+ if ( !hasOwnLeftNode ) L._leftNodes.push_back( innerNodes.front() );
+ if ( !hasOwnRightNode ) L._rightNodes.push_back( innerNodes.back() );
// create faces
- // TODO care of orientation
for ( size_t i = 1; i < innerNodes.size(); ++i )
- if ( SMDS_MeshElement* f = _helper.AddFace( outerNodes[ i-1 ], outerNodes[ i ],
- innerNodes[ i ], innerNodes[ i-1 ]))
+ if ( SMDS_MeshElement* f = _helper.AddFace( outerNodes[ i+prev ], outerNodes[ i+cur ],
+ innerNodes[ i+cur ], innerNodes[ i+prev ]))
L._newFaces.insert( L._newFaces.end(), f );
outerNodes.swap( innerNodes );
}
+
// faces between not shared _LayerEdge's (at concave VERTEX)
for ( int isR = 0; isR < 2; ++isR )
{
continue;
for ( size_t i = 1; i < lNodes.size(); ++i )
- _helper.AddFace( lNodes[ i-1 ], rNodes[ i-1 ],
- rNodes[ i ], lNodes[ i ]);
+ _helper.AddFace( lNodes[ i+prev ], rNodes[ i+prev ],
+ rNodes[ i+cur ], lNodes[ i+cur ]);
const UVPtStruct& ptOnVertex = points[ isR ? L._lastPntInd : L._firstPntInd ];
- _helper.AddFace( ptOnVertex.node, rNodes[ 0 ], lNodes[ 0 ]);
+ if ( isReverse )
+ _helper.AddFace( ptOnVertex.node, lNodes[ 0 ], rNodes[ 0 ]);
+ else
+ _helper.AddFace( ptOnVertex.node, rNodes[ 0 ], lNodes[ 0 ]);
}
// Fill the _ProxyMeshOfFace
nodeDataVec.front().param = L._wire->FirstU( L._edgeInd );
nodeDataVec.back() .param = L._wire->LastU ( L._edgeInd );
+ if (( nodeDataVec[0].node == nodeDataVec.back().node ) &&
+ ( _helper.GetPeriodicIndex() == 1 || _helper.GetPeriodicIndex() == 2 )) // closed EDGE
+ {
+ const int iCoord = _helper.GetPeriodicIndex();
+ gp_XY uv = nodeDataVec[0].UV();
+ uv.SetCoord( iCoord, L._lEdges[0]._uvOut.Coord( iCoord ));
+ nodeDataVec[0].SetUV( uv );
+
+ uv = nodeDataVec.back().UV();
+ uv.SetCoord( iCoord, L._lEdges.back()._uvOut.Coord( iCoord ));
+ nodeDataVec.back().SetUV( uv );
+ }
+
_ProxyMeshOfFace::_EdgeSubMesh* edgeSM
= getProxyMesh()->GetEdgeSubMesh( L._wire->EdgeID( L._edgeInd ));
edgeSM->SetUVPtStructVec( nodeDataVec );
} // loop on _PolyLine's
+ // re-compute FACEs whose mesh was removed by shrink()
+ for ( size_t i = 0; i < _clearedFaces.size(); ++i )
+ {
+ SMESH_subMesh* sm = _mesh->GetSubMesh( _clearedFaces[i] );
+ if ( sm->GetComputeState() == SMESH_subMesh::READY_TO_COMPUTE )
+ sm->ComputeStateEngine( SMESH_subMesh::COMPUTE );
+ }
+
return true;
}
return thereWereElems;
}
+//================================================================================
+/*!
+ * \brief Returns a hypothesis for a _PolyLine
+ */
+//================================================================================
+
+const StdMeshers_ViscousLayers2D* _ViscousBuilder2D::getLineHypothesis(int iPL)
+{
+ return iPL < (int)_hypOfEdge.size() ? _hypOfEdge[ iPL ] : _hyps[0];
+}
+
+//================================================================================
+/*!
+ * \brief Returns a layers thickness for a _PolyLine
+ */
+//================================================================================
+
+double _ViscousBuilder2D::getLineThickness(int iPL)
+{
+ if ( const StdMeshers_ViscousLayers2D* h = getLineHypothesis( iPL ))
+ return Min( _maxThickness, h->GetTotalThickness() );
+ return _maxThickness;
+}
+
//================================================================================
/*!
* \brief Creates a _ProxyMeshOfFace and store it in a sub-mesh of FACE
//================================================================================
void _ViscousBuilder2D::calcLayersHeight(const double totalThick,
- vector<double>& heights)
+ vector<double>& heights,
+ const THypVL* hyp)
{
- heights.resize( _hyp->GetNumberLayers() );
+ const double fPowN = pow( hyp->GetStretchFactor(), hyp->GetNumberLayers() );
+ heights.resize( hyp->GetNumberLayers() );
double h0;
- if ( _fPowN - 1 <= numeric_limits<double>::min() )
- h0 = totalThick / _hyp->GetNumberLayers();
+ if ( fPowN - 1 <= numeric_limits<double>::min() )
+ h0 = totalThick / hyp->GetNumberLayers();
else
- h0 = totalThick * ( _hyp->GetStretchFactor() - 1 )/( _fPowN - 1 );
+ h0 = totalThick * ( hyp->GetStretchFactor() - 1 )/( fPowN - 1 );
double hSum = 0, hi = h0;
- for ( int i = 0; i < _hyp->GetNumberLayers(); ++i )
+ for ( int i = 0; i < hyp->GetNumberLayers(); ++i )
{
hSum += hi;
heights[ i ] = hSum;
- hi *= _hyp->GetStretchFactor();
+ hi *= hyp->GetStretchFactor();
}
}
return false;
}
+//================================================================================
+/*!
+ * \brief Return \c true if the EDGE of this _PolyLine is concave
+ */
+//================================================================================
+
+bool _PolyLine::IsConcave() const
+{
+ if ( _lEdges.size() < 2 )
+ return false;
+
+ gp_Vec2d v1( _lEdges[0]._uvOut, _lEdges[1]._uvOut );
+ gp_Vec2d v2( _lEdges[0]._uvOut, _lEdges[2]._uvOut );
+ const double size2 = v2.Magnitude();
+
+ return ( v1 ^ v2 ) / size2 < -1e-3 * size2;
+}
+
//================================================================================
/*!
* \brief Constructor of SegmentTree
void _SegmentTree::buildChildrenData()
{
- for ( int i = 0; i < _segments.size(); ++i )
+ for ( size_t i = 0; i < _segments.size(); ++i )
for (int j = 0; j < nbChildren(); j++)
if ( !myChildren[j]->getBox()->IsOut( *_segments[i]._seg->_uv[0],
*_segments[i]._seg->_uv[1] ))
for (int j = 0; j < nbChildren(); j++)
{
_SegmentTree* child = static_cast<_SegmentTree*>( myChildren[j]);
- child->myIsLeaf = ( child->_segments.size() <= maxNbSegInLeaf() );
+ child->myIsLeaf = ((int) child->_segments.size() <= maxNbSegInLeaf() );
}
}
if ( isLeaf() )
{
- for ( int i = 0; i < _segments.size(); ++i )
+ for ( size_t i = 0; i < _segments.size(); ++i )
if ( !_segments[i].IsOut( seg ))
found.push_back( _segments[i]._seg );
}
if ( isLeaf() )
{
- for ( int i = 0; i < _segments.size(); ++i )
+ for ( size_t i = 0; i < _segments.size(); ++i )
if ( !_segments[i].IsOut( ray ))
found.push_back( _segments[i]._seg );
}
