-// Copyright (C) 2007-2014 CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2015 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
#include "SMESH_subMeshEventListener.hxx"
#include "StdMeshers_FaceSide.hxx"
+#include <Adaptor3d_HSurface.hxx>
#include <BRepAdaptor_Curve2d.hxx>
#include <BRepAdaptor_Surface.hxx>
#include <BRepLProp_SLProps.hxx>
#include <TopoDS_Face.hxx>
#include <TopoDS_Vertex.hxx>
#include <gp_Ax1.hxx>
+#include <gp_Cone.hxx>
+#include <gp_Sphere.hxx>
#include <gp_Vec.hxx>
#include <gp_XY.hxx>
#include <cmath>
#include <limits>
-#define __myDEBUG
+#ifdef _DEBUG_
+//#define __myDEBUG
+//#define __NOT_INVALIDATE_BAD_SMOOTH
+#endif
using namespace std;
const double theMinSmoothCosin = 0.1;
const double theSmoothThickToElemSizeRatio = 0.3;
+ // what part of thickness is allowed till intersection
+ // (defined by SALOME_TESTS/Grids/smesh/viscous_layers_00/A5)
+ const double theThickToIntersection = 1.5;
+
bool needSmoothing( double cosin, double tgtThick, double elemSize )
{
return cosin * tgtThick > theSmoothThickToElemSizeRatio * elemSize;
struct _MeshOfSolid : public SMESH_ProxyMesh,
public SMESH_subMeshEventListenerData
{
- bool _n2nMapComputed;
+ bool _n2nMapComputed;
+ SMESH_ComputeErrorPtr _warning;
_MeshOfSolid( SMESH_Mesh* mesh)
:SMESH_subMeshEventListenerData( /*isDeletable=*/true),_n2nMapComputed(false)
SMESH_subMeshEventListenerData* data,
const SMESH_Hypothesis* hyp)
{
- if ( SMESH_subMesh::COMPUTE_EVENT == eventType )
+ if ( SMESH_subMesh::COMPUTE_EVENT == eventType &&
+ SMESH_subMesh::CHECK_COMPUTE_STATE != event)
{
// delete SMESH_ProxyMesh containing temporary faces
subMesh->DeleteEventListener( this );
sub->SetEventListener( _ShrinkShapeListener::Get(), data, /*whereToListenTo=*/mainSM );
}
}
+ struct _SolidData;
//--------------------------------------------------------------------------------
/*!
* \brief Simplex (triangle or tetrahedron) based on 1 (tria) or 2 (tet) nodes of
const SMDS_MeshNode* nNext=0,
const SMDS_MeshNode* nOpp=0)
: _nPrev(nPrev), _nNext(nNext), _nOpp(nOpp) {}
- bool IsForward(const SMDS_MeshNode* nSrc, const gp_XYZ* pntTgt) const
+ bool IsForward(const SMDS_MeshNode* nSrc, const gp_XYZ* pntTgt, double& vol) const
{
const double M[3][3] =
{{ _nNext->X() - nSrc->X(), _nNext->Y() - nSrc->Y(), _nNext->Z() - nSrc->Z() },
{ pntTgt->X() - nSrc->X(), pntTgt->Y() - nSrc->Y(), pntTgt->Z() - nSrc->Z() },
{ _nPrev->X() - nSrc->X(), _nPrev->Y() - nSrc->Y(), _nPrev->Z() - nSrc->Z() }};
- double determinant = ( + M[0][0]*M[1][1]*M[2][2]
- + M[0][1]*M[1][2]*M[2][0]
- + M[0][2]*M[1][0]*M[2][1]
- - M[0][0]*M[1][2]*M[2][1]
- - M[0][1]*M[1][0]*M[2][2]
- - M[0][2]*M[1][1]*M[2][0]);
- return determinant > 1e-100;
+ vol = ( + M[0][0]*M[1][1]*M[2][2]
+ + M[0][1]*M[1][2]*M[2][0]
+ + M[0][2]*M[1][0]*M[2][1]
+ - M[0][0]*M[1][2]*M[2][1]
+ - M[0][1]*M[1][0]*M[2][2]
+ - M[0][2]*M[1][1]*M[2][0]);
+ return vol > 1e-100;
}
bool IsForward(const gp_XY& tgtUV,
const SMDS_MeshNode* smoothedNode,
{
return _nPrev == other._nNext || _nNext == other._nPrev;
}
+ static void GetSimplices( const SMDS_MeshNode* node,
+ vector<_Simplex>& simplices,
+ const set<TGeomID>& ingnoreShapes,
+ const _SolidData* dataToCheckOri = 0,
+ const bool toSort = false);
+ static void SortSimplices(vector<_Simplex>& simplices);
};
//--------------------------------------------------------------------------------
/*!
double lenDelta(double len) const { return _k * ( _r + len ); }
double lenDeltaByDist(double dist) const { return dist * _h2lenRatio; }
};
+ //--------------------------------------------------------------------------------
+
struct _2NearEdges;
+ struct _LayerEdge;
+ struct _EdgesOnShape;
+ typedef map< const SMDS_MeshNode*, _LayerEdge*, TIDCompare > TNode2Edge;
+
//--------------------------------------------------------------------------------
/*!
* \brief Edge normal to surface, connecting a node on solid surface (_nodes[0])
*/
struct _LayerEdge
{
+ typedef gp_XYZ (_LayerEdge::*PSmooFun)();
+
vector< const SMDS_MeshNode*> _nodes;
gp_XYZ _normal; // to solid surface
double _lenFactor; // to compute _len taking _cosin into account
// face or edge w/o layer along or near which _LayerEdge is inflated
- TopoDS_Shape _sWOL;
+ //TopoDS_Shape* _sWOL;
// simplices connected to the source node (_nodes[0]);
// used for smoothing and quality check of _LayerEdge's based on the FACE
vector<_Simplex> _simplices;
+ PSmooFun _smooFunction; // smoothing function
// data for smoothing of _LayerEdge's based on the EDGE
_2NearEdges* _2neibors;
_Curvature* _curvature;
// TODO:: detele _Curvature, _plnNorm
- void SetNewLength( double len, SMESH_MesherHelper& helper );
+ void SetNewLength( double len, _EdgesOnShape& eos, SMESH_MesherHelper& helper );
bool SetNewLength2d( Handle(Geom_Surface)& surface,
const TopoDS_Face& F,
+ _EdgesOnShape& eos,
SMESH_MesherHelper& helper );
void SetDataByNeighbors( const SMDS_MeshNode* n1,
const SMDS_MeshNode* n2,
+ const _EdgesOnShape& eos,
SMESH_MesherHelper& helper);
- void InvalidateStep( int curStep, bool restoreLength=false );
- bool Smooth(int& badNb);
+ void InvalidateStep( int curStep, const _EdgesOnShape& eos, bool restoreLength=false );
+ void ChooseSmooFunction(const set< TGeomID >& concaveVertices,
+ const TNode2Edge& n2eMap);
+ int Smooth(const int step, const bool isConcaveFace, const bool findBest);
bool SmoothOnEdge(Handle(Geom_Surface)& surface,
const TopoDS_Face& F,
SMESH_MesherHelper& helper);
bool FindIntersection( SMESH_ElementSearcher& searcher,
double & distance,
const double& epsilon,
+ _EdgesOnShape& eos,
const SMDS_MeshElement** face = 0);
bool SegTriaInter( const gp_Ax1& lastSegment,
const SMDS_MeshNode* n0,
const SMDS_MeshNode* n2,
double& dist,
const double& epsilon) const;
- gp_Ax1 LastSegment(double& segLen) const;
- gp_XY LastUV( const TopoDS_Face& F ) const;
+ gp_Ax1 LastSegment(double& segLen, _EdgesOnShape& eos) const;
+ gp_XY LastUV( const TopoDS_Face& F, _EdgesOnShape& eos ) const;
bool IsOnEdge() const { return _2neibors; }
- gp_XYZ Copy( _LayerEdge& other, SMESH_MesherHelper& helper );
+ gp_XYZ Copy( _LayerEdge& other, _EdgesOnShape& eos, SMESH_MesherHelper& helper );
void SetCosin( double cosin );
int NbSteps() const { return _pos.size() - 1; } // nb inlation steps
+
+ gp_XYZ smoothLaplacian();
+ gp_XYZ smoothAngular();
+ gp_XYZ smoothLengthWeighted();
+ gp_XYZ smoothCentroidal();
+ gp_XYZ smoothNefPolygon();
+
+ enum { FUN_LAPLACIAN, FUN_LENWEIGHTED, FUN_CENTROIDAL, FUN_NEFPOLY, FUN_ANGULAR, FUN_NB };
+ static const int theNbSmooFuns = FUN_NB;
+ static PSmooFun _funs[theNbSmooFuns];
+ static const char* _funNames[theNbSmooFuns+1];
+ int smooFunID( PSmooFun fun=0) const;
};
+ _LayerEdge::PSmooFun _LayerEdge::_funs[theNbSmooFuns] = { &_LayerEdge::smoothLaplacian,
+ &_LayerEdge::smoothLengthWeighted,
+ &_LayerEdge::smoothCentroidal,
+ &_LayerEdge::smoothNefPolygon,
+ &_LayerEdge::smoothAngular };
+ const char* _LayerEdge::_funNames[theNbSmooFuns+1] = { "Laplacian",
+ "LengthWeighted",
+ "Centroidal",
+ "NefPolygon",
+ "Angular",
+ "None"};
struct _LayerEdgeCmp
{
bool operator () (const _LayerEdge* e1, const _LayerEdge* e2) const
return cmpNodes ? ( e1->_nodes[0]->GetID() < e2->_nodes[0]->GetID()) : ( e1 < e2 );
}
};
- struct _LayerEdge;
+ //--------------------------------------------------------------------------------
+ /*!
+ * A 2D half plane used by _LayerEdge::smoothNefPolygon()
+ */
+ struct _halfPlane
+ {
+ gp_XY _pos, _dir, _inNorm;
+ bool IsOut( const gp_XY p, const double tol ) const
+ {
+ return _inNorm * ( p - _pos ) < -tol;
+ }
+ bool FindInterestion( const _halfPlane& hp, gp_XY & intPnt )
+ {
+ const double eps = 1e-10;
+ double D = _dir.Crossed( hp._dir );
+ if ( fabs(D) < std::numeric_limits<double>::min())
+ return false;
+ gp_XY vec21 = _pos - hp._pos;
+ double u = hp._dir.Crossed( vec21 ) / D;
+ intPnt = _pos + _dir * u;
+ return true;
+ }
+ };
//--------------------------------------------------------------------------------
/*!
* Structure used to smooth a _LayerEdge based on an EDGE.
std::swap( _edges[0], _edges[1] );
}
};
- //--------------------------------------------------------------------------------
- /*!
- * \brief Convex FACE whose radius of curvature is less than the thickness of
- * layers. It is used to detect distortion of prisms based on a convex
- * FACE and to update normals to enable further increasing the thickness
- */
- struct _ConvexFace
- {
- TopoDS_Face _face;
-
- // edges whose _simplices are used to detect prism destorsion
- vector< _LayerEdge* > _simplexTestEdges;
-
- // map a sub-shape to it's index in _SolidData::_endEdgeOnShape vector
- map< TGeomID, int > _subIdToEdgeEnd;
-
- bool _normalsFixed;
- bool GetCenterOfCurvature( _LayerEdge* ledge,
- BRepLProp_SLProps& surfProp,
- SMESH_MesherHelper& helper,
- gp_Pnt & center ) const;
- bool CheckPrisms() const;
- };
//--------------------------------------------------------------------------------
/*!
struct AverageHyp
{
AverageHyp( const StdMeshers_ViscousLayers* hyp = 0 )
- :_nbLayers(0), _nbHyps(0), _thickness(0), _stretchFactor(0)
+ :_nbLayers(0), _nbHyps(0), _thickness(0), _stretchFactor(0), _method(0)
{
Add( hyp );
}
_nbHyps++;
_nbLayers = hyp->GetNumberLayers();
//_thickness += hyp->GetTotalThickness();
- _thickness = Max( _thickness, hyp->GetTotalThickness() );
+ _thickness = Max( _thickness, hyp->GetTotalThickness() );
_stretchFactor += hyp->GetStretchFactor();
+ _method = hyp->GetMethod();
}
}
double GetTotalThickness() const { return _thickness; /*_nbHyps ? _thickness / _nbHyps : 0;*/ }
double GetStretchFactor() const { return _nbHyps ? _stretchFactor / _nbHyps : 0; }
int GetNumberLayers() const { return _nbLayers; }
+ int GetMethod() const { return _method; }
+
+ bool UseSurfaceNormal() const
+ { return _method == StdMeshers_ViscousLayers::SURF_OFFSET_SMOOTH; }
+ bool ToSmooth() const
+ { return _method == StdMeshers_ViscousLayers::SURF_OFFSET_SMOOTH; }
+ bool IsOffsetMethod() const
+ { return _method == StdMeshers_ViscousLayers::FACE_OFFSET; }
+
private:
- int _nbLayers, _nbHyps;
+ int _nbLayers, _nbHyps, _method;
double _thickness, _stretchFactor;
};
//--------------------------------------------------------------------------------
+ /*!
+ * \brief _LayerEdge's on a shape and other shape data
+ */
+ struct _EdgesOnShape
+ {
+ vector< _LayerEdge* > _edges;
+
+ TopoDS_Shape _shape;
+ TGeomID _shapeID;
+ SMESH_subMesh * _subMesh;
+ // face or edge w/o layer along or near which _edges are inflated
+ TopoDS_Shape _sWOL;
+ // averaged StdMeshers_ViscousLayers parameters
+ AverageHyp _hyp;
+ bool _toSmooth;
+
+ vector< gp_XYZ > _faceNormals; // if _shape is FACE
+ vector< _EdgesOnShape* > _faceEOS; // to get _faceNormals of adjacent FACEs
+
+ TopAbs_ShapeEnum ShapeType() const
+ { return _shape.IsNull() ? TopAbs_SHAPE : _shape.ShapeType(); }
+ TopAbs_ShapeEnum SWOLType() const
+ { return _sWOL.IsNull() ? TopAbs_SHAPE : _sWOL.ShapeType(); }
+ bool GetNormal( const SMDS_MeshElement* face, gp_Vec& norm );
+ };
+
+ //--------------------------------------------------------------------------------
+ /*!
+ * \brief Convex FACE whose radius of curvature is less than the thickness of
+ * layers. It is used to detect distortion of prisms based on a convex
+ * FACE and to update normals to enable further increasing the thickness
+ */
+ struct _ConvexFace
+ {
+ TopoDS_Face _face;
+
+ // edges whose _simplices are used to detect prism destorsion
+ vector< _LayerEdge* > _simplexTestEdges;
+
+ // map a sub-shape to _SolidData::_edgesOnShape
+ map< TGeomID, _EdgesOnShape* > _subIdToEOS;
+
+ bool _normalsFixed;
+
+ bool GetCenterOfCurvature( _LayerEdge* ledge,
+ BRepLProp_SLProps& surfProp,
+ SMESH_MesherHelper& helper,
+ gp_Pnt & center ) const;
+ bool CheckPrisms() const;
+ };
- typedef map< const SMDS_MeshNode*, _LayerEdge*, TIDCompare > TNode2Edge;
-
//--------------------------------------------------------------------------------
/*!
* \brief Data of a SOLID
// map to find _n2eMap of another _SolidData by a shrink shape shared by two _SolidData's
map< TGeomID, TNode2Edge* > _s2neMap;
- // edges of _n2eMap. We keep same data in two containers because
- // iteration over the map is 5 times longer than over the vector
- vector< _LayerEdge* > _edges;
+ // _LayerEdge's with underlying shapes
+ vector< _EdgesOnShape > _edgesOnShape;
// key: an id of shape (EDGE or VERTEX) shared by a FACE with
// layers and a FACE w/o layers
// Convex FACEs whose radius of curvature is less than the thickness of layers
map< TGeomID, _ConvexFace > _convexFaces;
- // shapes (EDGEs and VERTEXes) srink from which is forbiden due to collisions with
+ // shapes (EDGEs and VERTEXes) srink from which is forbidden due to collisions with
// the adjacent SOLID
set< TGeomID > _noShrinkShapes;
+ int _nbShapesToSmooth;
+
// <EDGE to smooth on> to <it's curve> -- for analytic smooth
map< TGeomID,Handle(Geom_Curve)> _edge2curve;
- // end indices in _edges of _LayerEdge on each shape, first go shapes to smooth
- vector< int > _endEdgeOnShape;
- int _nbShapesToSmooth;
+ set< TGeomID > _concaveFaces;
- // data of averaged StdMeshers_ViscousLayers parameters for each shape with _LayerEdge's
- vector< AverageHyp > _hypOnShape;
double _maxThickness; // of all _hyps
double _minThickness; // of all _hyps
~_SolidData();
Handle(Geom_Curve) CurveForSmooth( const TopoDS_Edge& E,
- const int iFrom,
- const int iTo,
- Handle(Geom_Surface)& surface,
- const TopoDS_Face& F,
+ _EdgesOnShape& eos,
SMESH_MesherHelper& helper);
- void SortOnEdge( const TopoDS_Edge& E,
- const int iFrom,
- const int iTo,
- SMESH_MesherHelper& helper);
+ void SortOnEdge( const TopoDS_Edge& E,
+ vector< _LayerEdge* >& edges,
+ SMESH_MesherHelper& helper);
+
+ void Sort2NeiborsOnEdge( vector< _LayerEdge* >& edges );
_ConvexFace* GetConvexFace( const TGeomID faceID )
{
map< TGeomID, _ConvexFace >::iterator id2face = _convexFaces.find( faceID );
return id2face == _convexFaces.end() ? 0 : & id2face->second;
}
- void GetEdgesOnShape( size_t end, int & iBeg, int & iEnd )
- {
- iBeg = end > 0 ? _endEdgeOnShape[ end-1 ] : 0;
- iEnd = _endEdgeOnShape[ end ];
- }
+ _EdgesOnShape* GetShapeEdges(const TGeomID shapeID );
+ _EdgesOnShape* GetShapeEdges(const TopoDS_Shape& shape );
+ _EdgesOnShape* GetShapeEdges(const _LayerEdge* edge )
+ { return GetShapeEdges( edge->_nodes[0]->getshapeId() ); }
- bool GetShapeEdges(const TGeomID shapeID, size_t& iEdgeEnd, int* iBeg=0, int* iEnd=0 ) const;
+ void AddShapesToSmooth( const set< _EdgesOnShape* >& shape );
- void AddShapesToSmooth( const set< TGeomID >& shapeIDs );
+ void PrepareEdgesToSmoothOnFace( _EdgesOnShape* eof, bool substituteSrcNodes );
};
//--------------------------------------------------------------------------------
/*!
bool FindNewNormal( const gp_Pnt& center, gp_XYZ& newNormal );
void SetShapes( const TopoDS_Edge& edge,
const _ConvexFace& convFace,
- const _SolidData& data,
+ _SolidData& data,
SMESH_MesherHelper& helper);
};
//--------------------------------------------------------------------------------
const TopoDS_Shape& hypShape,
set<TGeomID>& ignoreFaces);
bool makeLayer(_SolidData& data);
- bool setEdgeData(_LayerEdge& edge, const set<TGeomID>& subIds,
+ void setShapeData( _EdgesOnShape& eos, SMESH_subMesh* sm, _SolidData& data );
+ bool setEdgeData(_LayerEdge& edge, _EdgesOnShape& eos, const set<TGeomID>& subIds,
SMESH_MesherHelper& helper, _SolidData& data);
gp_XYZ getFaceNormal(const SMDS_MeshNode* n,
const TopoDS_Face& face,
SMESH_MesherHelper& helper,
bool& isOK,
bool shiftInside=false);
- gp_XYZ getWeigthedNormal( const SMDS_MeshNode* n,
- std::pair< TGeomID, gp_XYZ > fId2Normal[],
- const int nbFaces );
+ bool getFaceNormalAtSingularity(const gp_XY& uv,
+ const TopoDS_Face& face,
+ SMESH_MesherHelper& helper,
+ gp_Dir& normal );
+ gp_XYZ getWeigthedNormal( const SMDS_MeshNode* n,
+ std::pair< TopoDS_Face, gp_XYZ > fId2Normal[],
+ int nbFaces );
bool findNeiborsOnEdge(const _LayerEdge* edge,
const SMDS_MeshNode*& n1,
const SMDS_MeshNode*& n2,
+ _EdgesOnShape& eos,
_SolidData& data);
- void getSimplices( const SMDS_MeshNode* node, vector<_Simplex>& simplices,
- const set<TGeomID>& ingnoreShapes,
- const _SolidData* dataToCheckOri = 0,
- const bool toSort = false);
void findSimplexTestEdges( _SolidData& data,
vector< vector<_LayerEdge*> >& edgesByGeom);
void computeGeomSize( _SolidData& data );
- bool sortEdges( _SolidData& data,
- vector< vector<_LayerEdge*> >& edgesByGeom);
+ bool findShapesToSmooth( _SolidData& data);
void limitStepSizeByCurvature( _SolidData& data );
void limitStepSize( _SolidData& data,
const SMDS_MeshElement* face,
bool inflate(_SolidData& data);
bool smoothAndCheck(_SolidData& data, const int nbSteps, double & distToIntersection);
bool smoothAnalyticEdge( _SolidData& data,
- const int iFrom,
- const int iTo,
+ _EdgesOnShape& eos,
Handle(Geom_Surface)& surface,
const TopoDS_Face& F,
SMESH_MesherHelper& helper);
int stepNb );
bool refine(_SolidData& data);
bool shrink();
- bool prepareEdgeToShrink( _LayerEdge& edge, const TopoDS_Face& F,
+ bool prepareEdgeToShrink( _LayerEdge& edge, _EdgesOnShape& eos,
SMESH_MesherHelper& helper,
const SMESHDS_SubMesh* faceSubMesh );
void restoreNoShrink( _LayerEdge& edge ) const;
*/
class _Shrinker1D
{
+ TopoDS_Edge _geomEdge;
vector<double> _initU;
vector<double> _normPar;
vector<const SMDS_MeshNode*> _nodes;
const _LayerEdge* _edges[2];
bool _done;
public:
- void AddEdge( const _LayerEdge* e, SMESH_MesherHelper& helper );
+ void AddEdge( const _LayerEdge* e, _EdgesOnShape& eos, SMESH_MesherHelper& helper );
void Compute(bool set3D, SMESH_MesherHelper& helper);
void RestoreParams();
void SwapSrcTgtNodes(SMESHDS_Mesh* mesh);
};
//--------------------------------------------------------------------------------
/*!
- * \brief Retriever of node coordinates either directly of from a surface by node UV.
+ * \brief Retriever of node coordinates either directly or from a surface by node UV.
* \warning Location of a surface is ignored
*/
struct _NodeCoordHelper
//
StdMeshers_ViscousLayers::StdMeshers_ViscousLayers(int hypId, int studyId, SMESH_Gen* gen)
:SMESH_Hypothesis(hypId, studyId, gen),
- _isToIgnoreShapes(1), _nbLayers(1), _thickness(1), _stretchFactor(1)
+ _isToIgnoreShapes(1), _nbLayers(1), _thickness(1), _stretchFactor(1),
+ _method( SURF_OFFSET_SMOOTH )
{
_name = StdMeshers_ViscousLayers::GetHypType();
_param_algo_dim = -3; // auxiliary hyp used by 3D algos
if ( _stretchFactor != factor )
_stretchFactor = factor, NotifySubMeshesHypothesisModification();
} // --------------------------------------------------------------------------------
+void StdMeshers_ViscousLayers::SetMethod( ExtrusionMethod method )
+{
+ if ( _method != method )
+ _method = method, NotifySubMeshesHypothesisModification();
+} // --------------------------------------------------------------------------------
SMESH_ProxyMesh::Ptr
StdMeshers_ViscousLayers::Compute(SMESH_Mesh& theMesh,
const TopoDS_Shape& theShape,
return SMESH_ProxyMesh::Ptr();
components.push_back( SMESH_ProxyMesh::Ptr( pm ));
pm->myIsDeletable = false; // it will de deleted by boost::shared_ptr
+
+ if ( pm->_warning && !pm->_warning->IsOK() )
+ {
+ SMESH_subMesh* sm = theMesh.GetSubMesh( exp.Current() );
+ SMESH_ComputeErrorPtr& smError = sm->GetComputeError();
+ if ( !smError || smError->IsOK() )
+ smError = pm->_warning;
+ }
}
_ViscousListener::RemoveSolidMesh ( &theMesh, exp.Current() );
}
for ( size_t i = 0; i < _shapeIds.size(); ++i )
save << " " << _shapeIds[i];
save << " " << !_isToIgnoreShapes; // negate to keep the behavior in old studies.
+ save << " " << _method;
return save;
} // --------------------------------------------------------------------------------
std::istream & StdMeshers_ViscousLayers::LoadFrom(std::istream & load)
{
- int nbFaces, faceID, shapeToTreat;
+ int nbFaces, faceID, shapeToTreat, method;
load >> _nbLayers >> _thickness >> _stretchFactor >> nbFaces;
while ( _shapeIds.size() < nbFaces && load >> faceID )
_shapeIds.push_back( faceID );
- if ( load >> shapeToTreat )
+ if ( load >> shapeToTreat ) {
_isToIgnoreShapes = !shapeToTreat;
- else
+ if ( load >> method )
+ _method = (ExtrusionMethod) method;
+ }
+ else {
_isToIgnoreShapes = true; // old behavior
+ }
return load;
} // --------------------------------------------------------------------------------
bool StdMeshers_ViscousLayers::SetParametersByMesh(const SMESH_Mesh* theMesh,
// END StdMeshers_ViscousLayers hypothesis
//================================================================================
-namespace
+namespace VISCOUS_3D
{
gp_XYZ getEdgeDir( const TopoDS_Edge& E, const TopoDS_Vertex& fromV )
{
return dir;
}
+
+ //================================================================================
+ /*!
+ * \brief Finds concave VERTEXes of a FACE
+ */
+ //================================================================================
+
+ bool getConcaveVertices( const TopoDS_Face& F,
+ SMESH_MesherHelper& helper,
+ set< TGeomID >* vertices = 0)
+ {
+ // check angles at VERTEXes
+ TError error;
+ TSideVector wires = StdMeshers_FaceSide::GetFaceWires( F, *helper.GetMesh(), 0, error );
+ for ( size_t iW = 0; iW < wires.size(); ++iW )
+ {
+ const int nbEdges = wires[iW]->NbEdges();
+ if ( nbEdges < 2 && SMESH_Algo::isDegenerated( wires[iW]->Edge(0)))
+ continue;
+ for ( int iE1 = 0; iE1 < nbEdges; ++iE1 )
+ {
+ if ( SMESH_Algo::isDegenerated( wires[iW]->Edge( iE1 ))) continue;
+ int iE2 = ( iE1 + 1 ) % nbEdges;
+ while ( SMESH_Algo::isDegenerated( wires[iW]->Edge( iE2 )))
+ iE2 = ( iE2 + 1 ) % nbEdges;
+ TopoDS_Vertex V = wires[iW]->FirstVertex( iE2 );
+ double angle = helper.GetAngle( wires[iW]->Edge( iE1 ),
+ wires[iW]->Edge( iE2 ), F, V );
+ if ( angle < -5. * M_PI / 180. )
+ {
+ if ( !vertices )
+ return true;
+ vertices->insert( helper.GetMeshDS()->ShapeToIndex( V ));
+ }
+ }
+ }
+ return vertices ? !vertices->empty() : false;
+ }
+
//================================================================================
/*!
* \brief Returns true if a FACE is bound by a concave EDGE
*/
//================================================================================
- bool isConcave( const TopoDS_Face& F, SMESH_MesherHelper& helper )
+ bool isConcave( const TopoDS_Face& F,
+ SMESH_MesherHelper& helper,
+ set< TGeomID >* vertices = 0 )
{
+ bool isConcv = false;
// if ( helper.Count( F, TopAbs_WIRE, /*useMap=*/false) > 1 )
// return true;
gp_Vec2d drv1, drv2;
if ( !isConvex )
{
//cout << "Concave FACE " << helper.GetMeshDS()->ShapeToIndex( F ) << endl;
- return true;
- }
- }
- // check angles at VERTEXes
- TError error;
- TSideVector wires = StdMeshers_FaceSide::GetFaceWires( F, *helper.GetMesh(), 0, error );
- for ( size_t iW = 0; iW < wires.size(); ++iW )
- {
- const int nbEdges = wires[iW]->NbEdges();
- if ( nbEdges < 2 && SMESH_Algo::isDegenerated( wires[iW]->Edge(0)))
- continue;
- for ( int iE1 = 0; iE1 < nbEdges; ++iE1 )
- {
- if ( SMESH_Algo::isDegenerated( wires[iW]->Edge( iE1 ))) continue;
- int iE2 = ( iE1 + 1 ) % nbEdges;
- while ( SMESH_Algo::isDegenerated( wires[iW]->Edge( iE2 )))
- iE2 = ( iE2 + 1 ) % nbEdges;
- double angle = helper.GetAngle( wires[iW]->Edge( iE1 ),
- wires[iW]->Edge( iE2 ), F,
- wires[iW]->FirstVertex( iE2 ));
- if ( angle < -5. * M_PI / 180. )
+ isConcv = true;
+ if ( vertices )
+ break;
+ else
return true;
}
}
- return false;
+
+ // check angles at VERTEXes
+ if ( getConcaveVertices( F, helper, vertices ))
+ isConcv = true;
+
+ return isConcv;
}
+
//================================================================================
/*!
* \brief Computes mimimal distance of face in-FACE nodes from an EDGE
}
return done;
}
+ //================================================================================
+ /*!
+ * \brief Return direction of axis or revolution of a surface
+ */
+ //================================================================================
+
+ bool getRovolutionAxis( const Adaptor3d_Surface& surface,
+ gp_Dir & axis )
+ {
+ switch ( surface.GetType() ) {
+ case GeomAbs_Cone:
+ {
+ gp_Cone cone = surface.Cone();
+ axis = cone.Axis().Direction();
+ break;
+ }
+ case GeomAbs_Sphere:
+ {
+ gp_Sphere sphere = surface.Sphere();
+ axis = sphere.Position().Direction();
+ break;
+ }
+ case GeomAbs_SurfaceOfRevolution:
+ {
+ axis = surface.AxeOfRevolution().Direction();
+ break;
+ }
+ //case GeomAbs_SurfaceOfExtrusion:
+ case GeomAbs_OffsetSurface:
+ {
+ Handle(Adaptor3d_HSurface) base = surface.BasisSurface();
+ return getRovolutionAxis( base->Surface(), axis );
+ }
+ default: return false;
+ }
+ return true;
+ }
//--------------------------------------------------------------------------------
// DEBUG. Dump intermediate node positions into a python script
// construction steps of viscous layers
#ifdef __myDEBUG
ofstream* py;
- int theNbFunc;
+ int theNbPyFunc;
struct PyDump {
- PyDump() {
+ PyDump(SMESH_Mesh& m) {
+ int tag = 3 + m.GetId();
const char* fname = "/tmp/viscous.py";
cout << "execfile('"<<fname<<"')"<<endl;
py = new ofstream(fname);
*py << "import SMESH" << endl
<< "from salome.smesh import smeshBuilder" << endl
<< "smesh = smeshBuilder.New(salome.myStudy)" << endl
- << "meshSO = smesh.GetCurrentStudy().FindObjectID('0:1:2:3')" << endl
+ << "meshSO = smesh.GetCurrentStudy().FindObjectID('0:1:2:" << tag <<"')" << endl
<< "mesh = smesh.Mesh( meshSO.GetObject() )"<<endl;
- theNbFunc = 0;
+ theNbPyFunc = 0;
}
void Finish() {
if (py) {
}
delete py; py=0;
}
- ~PyDump() { Finish(); cout << "NB FUNCTIONS: " << theNbFunc << endl; }
+ ~PyDump() { Finish(); cout << "NB FUNCTIONS: " << theNbPyFunc << endl; }
};
#define dumpFunction(f) { _dumpFunction(f, __LINE__);}
#define dumpMove(n) { _dumpMove(n, __LINE__);}
+#define dumpMoveComm(n,txt) { _dumpMove(n, __LINE__, txt);}
#define dumpCmd(txt) { _dumpCmd(txt, __LINE__);}
void _dumpFunction(const string& fun, int ln)
- { if (py) *py<< "def "<<fun<<"(): # "<< ln <<endl; cout<<fun<<"()"<<endl; ++theNbFunc; }
- void _dumpMove(const SMDS_MeshNode* n, int ln)
+ { if (py) *py<< "def "<<fun<<"(): # "<< ln <<endl; cout<<fun<<"()"<<endl; ++theNbPyFunc; }
+ void _dumpMove(const SMDS_MeshNode* n, int ln, const char* txt="")
{ if (py) *py<< " mesh.MoveNode( "<<n->GetID()<< ", "<< n->X()
- << ", "<<n->Y()<<", "<< n->Z()<< ")\t\t # "<< ln <<endl; }
+ << ", "<<n->Y()<<", "<< n->Z()<< ")\t\t # "<< ln <<" "<< txt << endl; }
void _dumpCmd(const string& txt, int ln)
{ if (py) *py<< " "<<txt<<" # "<< ln <<endl; }
void dumpFunctionEnd()
*py << f->GetNode( f->NbNodes()-1 )->GetID() << " ])"<< endl; }}
#define debugMsg( txt ) { cout << txt << " (line: " << __LINE__ << ")" << endl; }
#else
- struct PyDump { void Finish() {} };
+ struct PyDump { PyDump(SMESH_Mesh&) {} void Finish() {} };
#define dumpFunction(f) f
#define dumpMove(n)
+#define dumpMoveComm(n,txt)
#define dumpCmd(txt)
#define dumpFunctionEnd()
#define dumpChangeNodes(f)
if ( _ViscousListener::GetSolidMesh( _mesh, exp.Current(), /*toCreate=*/false))
return SMESH_ComputeErrorPtr(); // everything already computed
- PyDump debugDump;
+ PyDump debugDump( theMesh );
// TODO: ignore already computed SOLIDs
if ( !findSolidsWithLayers())
if ( ! makeLayer(_sdVec[i]) )
return _error;
- if ( _sdVec[i]._edges.size() == 0 )
+ if ( _sdVec[i]._n2eMap.size() == 0 )
continue;
if ( ! inflate(_sdVec[i]) )
findSolidsWithLayers();
- bool ok = findFacesWithLayers();
+ bool ok = findFacesWithLayers( true );
// remove _MeshOfSolid's of _SolidData's
for ( size_t i = 0; i < _sdVec.size(); ++i )
TopExp_Explorer exp;
TopTools_IndexedMapOfShape solids;
- // collect all faces to ignore defined by hyp
+ // collect all faces-to-ignore defined by hyp
for ( size_t i = 0; i < _sdVec.size(); ++i )
{
solids.Add( _sdVec[i]._solid );
- // get faces to ignore defined by each hyp
+ // get faces-to-ignore defined by each hyp
typedef const StdMeshers_ViscousLayers* THyp;
typedef std::pair< set<TGeomID>, THyp > TFacesOfHyp;
list< TFacesOfHyp > ignoreFacesOfHyps;
{
_sdVec[i]._ignoreFaceIds.swap( ignoreFacesOfHyps.back().first );
}
+ } // loop on _sdVec
+
+ if ( onlyWith ) // is called to check hypotheses compatibility only
+ return true;
- // fill _SolidData::_reversedFaceIds
+ // fill _SolidData::_reversedFaceIds
+ for ( size_t i = 0; i < _sdVec.size(); ++i )
+ {
+ exp.Init( _sdVec[i]._solid.Oriented( TopAbs_FORWARD ), TopAbs_FACE );
+ for ( ; exp.More(); exp.Next() )
{
- exp.Init( _sdVec[i]._solid.Oriented( TopAbs_FORWARD ), TopAbs_FACE );
- for ( ; exp.More(); exp.Next() )
+ const TopoDS_Face& face = TopoDS::Face( exp.Current() );
+ const TGeomID faceID = getMeshDS()->ShapeToIndex( face );
+ if ( //!sdVec[i]._ignoreFaceIds.count( faceID ) &&
+ helper.NbAncestors( face, *_mesh, TopAbs_SOLID ) > 1 &&
+ helper.IsReversedSubMesh( face ))
{
- const TopoDS_Face& face = TopoDS::Face( exp.Current() );
- const TGeomID faceID = getMeshDS()->ShapeToIndex( face );
- if ( //!sdVec[i]._ignoreFaceIds.count( faceID ) && ???????
- helper.NbAncestors( face, *_mesh, TopAbs_SOLID ) > 1 &&
- helper.IsReversedSubMesh( face ))
- {
- _sdVec[i]._reversedFaceIds.insert( faceID );
- }
+ _sdVec[i]._reversedFaceIds.insert( faceID );
}
}
- } // loop on _sdVec
-
- if ( onlyWith ) // is called to check hypotheses compatibility only
- return true;
+ }
// Find faces to shrink mesh on (solution 2 in issue 0020832);
TopTools_IndexedMapOfShape shapes;
subIds = data._noShrinkShapes;
TopExp_Explorer exp( data._solid, TopAbs_FACE );
for ( ; exp.More(); exp.Next() )
+ {
+ SMESH_subMesh* fSubM = _mesh->GetSubMesh( exp.Current() );
+ if ( ! data._ignoreFaceIds.count( fSubM->GetId() ))
{
- SMESH_subMesh* fSubM = _mesh->GetSubMesh( exp.Current() );
- if ( ! data._ignoreFaceIds.count( fSubM->GetId() ))
- faceIds.insert( fSubM->GetId() );
+ faceIds.insert( fSubM->GetId() );
SMESH_subMeshIteratorPtr subIt = fSubM->getDependsOnIterator(/*includeSelf=*/true);
while ( subIt->more() )
subIds.insert( subIt->next()->GetId() );
}
+ }
// make a map to find new nodes on sub-shapes shared with other SOLID
map< TGeomID, TNode2Edge* >::iterator s2ne;
// Create temporary faces and _LayerEdge's
- dumpFunction(SMESH_Comment("makeLayers_")<<data._index);
+ dumpFunction(SMESH_Comment("makeLayers_")<<data._index);
data._stepSize = Precision::Infinite();
data._stepSizeNodes[0] = 0;
TNode2Edge::iterator n2e2;
// collect _LayerEdge's of shapes they are based on
+ vector< _EdgesOnShape >& edgesByGeom = data._edgesOnShape;
const int nbShapes = getMeshDS()->MaxShapeIndex();
- vector< vector<_LayerEdge*> > edgesByGeom( nbShapes+1 );
+ edgesByGeom.resize( nbShapes+1 );
+ // set data of _EdgesOnShape's
+ if ( SMESH_subMesh* sm = _mesh->GetSubMesh( data._solid ))
+ {
+ SMESH_subMeshIteratorPtr smIt = sm->getDependsOnIterator(/*includeSelf=*/false);
+ while ( smIt->more() )
+ {
+ sm = smIt->next();
+ if ( sm->GetSubShape().ShapeType() == TopAbs_FACE &&
+ !faceIds.count( sm->GetId() ))
+ continue;
+ setShapeData( edgesByGeom[ sm->GetId() ], sm, data );
+ }
+ }
+ // make _LayerEdge's
for ( set<TGeomID>::iterator id = faceIds.begin(); id != faceIds.end(); ++id )
{
- SMESHDS_SubMesh* smDS = getMeshDS()->MeshElements( *id );
- if ( !smDS ) return error(SMESH_Comment("Not meshed face ") << *id, data._index );
-
const TopoDS_Face& F = TopoDS::Face( getMeshDS()->IndexToShape( *id ));
+ SMESH_subMesh* sm = _mesh->GetSubMesh( F );
SMESH_ProxyMesh::SubMesh* proxySub =
data._proxyMesh->getFaceSubM( F, /*create=*/true);
+ SMESHDS_SubMesh* smDS = sm->GetSubMeshDS();
+ if ( !smDS ) return error(SMESH_Comment("Not meshed face ") << *id, data._index );
+
SMDS_ElemIteratorPtr eIt = smDS->GetElements();
while ( eIt->more() )
{
_LayerEdge* edge = new _LayerEdge();
edge->_nodes.push_back( n );
n2e->second = edge;
- edgesByGeom[ shapeID ].push_back( edge );
+ edgesByGeom[ shapeID ]._edges.push_back( edge );
const bool noShrink = data._noShrinkShapes.count( shapeID );
SMESH_TNodeXYZ xyz( n );
(( n2e2 = (*s2ne).second->find( n )) != s2ne->second->end() ))
{
_LayerEdge* foundEdge = (*n2e2).second;
- gp_XYZ lastPos = edge->Copy( *foundEdge, helper );
+ gp_XYZ lastPos = edge->Copy( *foundEdge, edgesByGeom[ shapeID ], helper );
foundEdge->_pos.push_back( lastPos );
// location of the last node is modified and we restore it by foundEdge->_pos.back()
const_cast< SMDS_MeshNode* >
{
edge->_nodes.push_back( helper.AddNode( xyz.X(), xyz.Y(), xyz.Z() ));
}
- if ( !setEdgeData( *edge, subIds, helper, data ))
+ if ( !setEdgeData( *edge, edgesByGeom[ shapeID ], subIds, helper, data ))
return false;
}
dumpMove(edge->_nodes.back());
if ( data._stepSize < 1. )
data._epsilon *= data._stepSize;
- // Put _LayerEdge's into the vector data._edges
- if ( !sortEdges( data, edgesByGeom ))
+ if ( !findShapesToSmooth( data ))
return false;
// limit data._stepSize depending on surface curvature and fill data._convexFaces
// Set target nodes into _Simplex and _LayerEdge's to _2NearEdges
TNode2Edge::iterator n2e;
const SMDS_MeshNode* nn[2];
- for ( size_t i = 0; i < data._edges.size(); ++i )
+ for ( size_t iS = 0; iS < data._edgesOnShape.size(); ++iS )
{
- _LayerEdge* edge = data._edges[i];
- if ( edge->IsOnEdge() )
+ _EdgesOnShape& eos = data._edgesOnShape[iS];
+ vector< _LayerEdge* >& localEdges = eos._edges;
+ for ( size_t i = 0; i < localEdges.size(); ++i )
{
- // get neighbor nodes
- bool hasData = ( edge->_2neibors->_edges[0] );
- if ( hasData ) // _LayerEdge is a copy of another one
+ _LayerEdge* edge = localEdges[i];
+ if ( edge->IsOnEdge() )
{
- nn[0] = edge->_2neibors->srcNode(0);
- nn[1] = edge->_2neibors->srcNode(1);
+ // get neighbor nodes
+ bool hasData = ( edge->_2neibors->_edges[0] );
+ if ( hasData ) // _LayerEdge is a copy of another one
+ {
+ nn[0] = edge->_2neibors->srcNode(0);
+ nn[1] = edge->_2neibors->srcNode(1);
+ }
+ else if ( !findNeiborsOnEdge( edge, nn[0],nn[1], eos, data ))
+ {
+ return false;
+ }
+ // set neighbor _LayerEdge's
+ for ( int j = 0; j < 2; ++j )
+ {
+ if (( n2e = data._n2eMap.find( nn[j] )) == data._n2eMap.end() )
+ return error("_LayerEdge not found by src node", data._index);
+ edge->_2neibors->_edges[j] = n2e->second;
+ }
+ if ( !hasData )
+ edge->SetDataByNeighbors( nn[0], nn[1], eos, helper );
}
- else if ( !findNeiborsOnEdge( edge, nn[0],nn[1], data ))
+
+ for ( size_t j = 0; j < edge->_simplices.size(); ++j )
{
- return false;
+ _Simplex& s = edge->_simplices[j];
+ s._nNext = data._n2eMap[ s._nNext ]->_nodes.back();
+ s._nPrev = data._n2eMap[ s._nPrev ]->_nodes.back();
}
- // set neighbor _LayerEdge's
- for ( int j = 0; j < 2; ++j )
+
+ // For an _LayerEdge on a degenerated EDGE, copy some data from
+ // a corresponding _LayerEdge on a VERTEX
+ // (issue 52453, pb on a downloaded SampleCase2-Tet-netgen-mephisto.hdf)
+ if ( helper.IsDegenShape( edge->_nodes[0]->getshapeId() ))
{
- if (( n2e = data._n2eMap.find( nn[j] )) == data._n2eMap.end() )
- return error("_LayerEdge not found by src node", data._index);
- edge->_2neibors->_edges[j] = n2e->second;
+ // Generally we should not get here
+ if ( eos.ShapeType() != TopAbs_EDGE )
+ continue;
+ TopoDS_Vertex V = helper.IthVertex( 0, TopoDS::Edge( eos._shape ));
+ const SMDS_MeshNode* vN = SMESH_Algo::VertexNode( V, getMeshDS() );
+ if (( n2e = data._n2eMap.find( vN )) == data._n2eMap.end() )
+ continue;
+ const _LayerEdge* vEdge = n2e->second;
+ edge->_normal = vEdge->_normal;
+ edge->_lenFactor = vEdge->_lenFactor;
+ edge->_cosin = vEdge->_cosin;
}
- if ( !hasData )
- edge->SetDataByNeighbors( nn[0], nn[1], helper);
- }
-
- for ( size_t j = 0; j < edge->_simplices.size(); ++j )
- {
- _Simplex& s = edge->_simplices[j];
- s._nNext = data._n2eMap[ s._nNext ]->_nodes.back();
- s._nPrev = data._n2eMap[ s._nPrev ]->_nodes.back();
}
+ }
- // For an _LayerEdge on a degenerated EDGE, copy some data from
- // a corresponding _LayerEdge on a VERTEX
- // (issue 52453, pb on a downloaded SampleCase2-Tet-netgen-mephisto.hdf)
- if ( helper.IsDegenShape( edge->_nodes[0]->getshapeId() ))
+ // fix _LayerEdge::_2neibors on EDGEs to smooth
+ map< TGeomID,Handle(Geom_Curve)>::iterator e2c = data._edge2curve.begin();
+ for ( ; e2c != data._edge2curve.end(); ++e2c )
+ if ( !e2c->second.IsNull() )
{
- // Generally we should not get here
- const TopoDS_Shape& E = getMeshDS()->IndexToShape( edge->_nodes[0]->getshapeId() );
- if ( E.ShapeType() != TopAbs_EDGE )
- continue;
- TopoDS_Vertex V = helper.IthVertex( 0, TopoDS::Edge( E ));
- const SMDS_MeshNode* vN = SMESH_Algo::VertexNode( V, getMeshDS() );
- if (( n2e = data._n2eMap.find( vN )) == data._n2eMap.end() )
- continue;
- const _LayerEdge* vEdge = n2e->second;
- edge->_normal = vEdge->_normal;
- edge->_lenFactor = vEdge->_lenFactor;
- edge->_cosin = vEdge->_cosin;
+ if ( _EdgesOnShape* eos = data.GetShapeEdges( e2c->first ))
+ data.Sort2NeiborsOnEdge( eos->_edges );
}
- }
dumpFunctionEnd();
return true;
data._convexFaces.clear();
- TopExp_Explorer face( data._solid, TopAbs_FACE );
- for ( ; face.More(); face.Next() )
+ for ( size_t iS = 0; iS < data._edgesOnShape.size(); ++iS )
{
- const TopoDS_Face& F = TopoDS::Face( face.Current() );
- SMESH_subMesh * sm = _mesh->GetSubMesh( F );
- const TGeomID faceID = sm->GetId();
- if ( data._ignoreFaceIds.count( faceID )) continue;
+ _EdgesOnShape& eof = data._edgesOnShape[iS];
+ if ( eof.ShapeType() != TopAbs_FACE ||
+ data._ignoreFaceIds.count( eof._shapeID ))
+ continue;
+
+ TopoDS_Face F = TopoDS::Face( eof._shape );
+ SMESH_subMesh * sm = eof._subMesh;
+ const TGeomID faceID = eof._shapeID;
BRepAdaptor_Surface surface( F, false );
surfProp.SetSurface( surface );
bool isTooCurved = false;
- int iBeg, iEnd;
_ConvexFace cnvFace;
const double oriFactor = ( F.Orientation() == TopAbs_REVERSED ? +1. : -1. );
sm = smIt->next();
const TGeomID subID = sm->GetId();
// find _LayerEdge's of a sub-shape
- size_t edgesEnd;
- if ( data.GetShapeEdges( subID, edgesEnd, &iBeg, &iEnd ))
- cnvFace._subIdToEdgeEnd.insert( make_pair( subID, edgesEnd ));
+ _EdgesOnShape* eos;
+ if (( eos = data.GetShapeEdges( subID )))
+ cnvFace._subIdToEOS.insert( make_pair( subID, eos ));
else
continue;
// check concavity and curvature and limit data._stepSize
- const double minCurvature = 0.9 / data._hypOnShape[ edgesEnd ].GetTotalThickness();
- int nbLEdges = iEnd - iBeg;
- int iStep = Max( 1, nbLEdges / nbTestPnt );
- for ( ; iBeg < iEnd; iBeg += iStep )
+ const double minCurvature =
+ 1. / ( eos->_hyp.GetTotalThickness() * ( 1+theThickToIntersection ));
+ size_t iStep = Max( 1, eos->_edges.size() / nbTestPnt );
+ for ( size_t i = 0; i < eos->_edges.size(); i += iStep )
{
- gp_XY uv = helper.GetNodeUV( F, data._edges[ iBeg ]->_nodes[0] );
+ gp_XY uv = helper.GetNodeUV( F, eos->_edges[ i ]->_nodes[0] );
surfProp.SetParameters( uv.X(), uv.Y() );
if ( !surfProp.IsCurvatureDefined() )
continue;
// Fill _ConvexFace::_simplexTestEdges. These _LayerEdge's are used to detect
// prism distortion.
- map< TGeomID, int >::iterator id2end = convFace._subIdToEdgeEnd.find( faceID );
- if ( id2end != convFace._subIdToEdgeEnd.end() )
+ map< TGeomID, _EdgesOnShape* >::iterator id2eos = convFace._subIdToEOS.find( faceID );
+ if ( id2eos != convFace._subIdToEOS.end() && !id2eos->second->_edges.empty() )
{
// there are _LayerEdge's on the FACE it-self;
// select _LayerEdge's near EDGEs
- data.GetEdgesOnShape( id2end->second, iBeg, iEnd );
- for ( ; iBeg < iEnd; ++iBeg )
+ _EdgesOnShape& eos = * id2eos->second;
+ for ( size_t i = 0; i < eos._edges.size(); ++i )
{
- _LayerEdge* ledge = data._edges[ iBeg ];
+ _LayerEdge* ledge = eos._edges[ i ];
for ( size_t j = 0; j < ledge->_simplices.size(); ++j )
if ( ledge->_simplices[j]._nNext->GetPosition()->GetDim() < 2 )
{
set< const SMDS_MeshNode* > usedNodes;
// look for _LayerEdge's with null _sWOL
- map< TGeomID, int >::iterator id2end = convFace._subIdToEdgeEnd.begin();
- for ( ; id2end != convFace._subIdToEdgeEnd.end(); ++id2end )
+ id2eos = convFace._subIdToEOS.begin();
+ for ( ; id2eos != convFace._subIdToEOS.end(); ++id2eos )
{
- data.GetEdgesOnShape( id2end->second, iBeg, iEnd );
- if ( iBeg >= iEnd || !data._edges[ iBeg ]->_sWOL.IsNull() )
+ _EdgesOnShape& eos = * id2eos->second;
+ if ( !eos._sWOL.IsNull() )
continue;
- for ( ; iBeg < iEnd; ++iBeg )
+ for ( size_t i = 0; i < eos._edges.size(); ++i )
{
- _LayerEdge* ledge = data._edges[ iBeg ];
+ _LayerEdge* ledge = eos._edges[ i ];
const SMDS_MeshNode* srcNode = ledge->_nodes[0];
if ( !usedNodes.insert( srcNode ).second ) continue;
- getSimplices( srcNode, ledge->_simplices, data._ignoreFaceIds, &data );
+ _Simplex::GetSimplices( srcNode, ledge->_simplices, data._ignoreFaceIds, &data );
for ( size_t i = 0; i < ledge->_simplices.size(); ++i )
{
usedNodes.insert( ledge->_simplices[i]._nPrev );
//================================================================================
/*!
- * \brief Separate shapes (and _LayerEdge's on them) to smooth from the rest ones
+ * \brief Detect shapes (and _LayerEdge's on them) to smooth
*/
//================================================================================
-bool _ViscousBuilder::sortEdges( _SolidData& data,
- vector< vector<_LayerEdge*> >& edgesByGeom)
+bool _ViscousBuilder::findShapesToSmooth( _SolidData& data )
{
// define allowed thickness
computeGeomSize( data ); // compute data._geomSize
// Find shapes needing smoothing; such a shape has _LayerEdge._normal on it's
// boundry inclined to the shape at a sharp angle
- list< TGeomID > shapesToSmooth;
-
+ //list< TGeomID > shapesToSmooth;
+ TopTools_MapOfShape edgesOfSmooFaces;
+
SMESH_MesherHelper helper( *_mesh );
bool ok = true;
- for ( size_t iS = 0; iS < edgesByGeom.size(); ++iS )
+ vector< _EdgesOnShape >& edgesByGeom = data._edgesOnShape;
+ data._nbShapesToSmooth = 0;
+
+ for ( size_t iS = 0; iS < edgesByGeom.size(); ++iS ) // check FACEs
{
- vector<_LayerEdge*>& eS = edgesByGeom[iS];
- if ( eS.empty() ) continue;
- const TopoDS_Shape& S = getMeshDS()->IndexToShape( iS );
- bool needSmooth = false;
- switch ( S.ShapeType() )
- {
- case TopAbs_EDGE: {
+ _EdgesOnShape& eos = edgesByGeom[iS];
+ eos._toSmooth = false;
+ if ( eos._edges.empty() || eos.ShapeType() != TopAbs_FACE )
+ continue;
- if ( SMESH_Algo::isDegenerated( TopoDS::Edge( S )))
- break;
- //bool isShrinkEdge = !eS[0]->_sWOL.IsNull();
- for ( TopoDS_Iterator vIt( S ); vIt.More() && !needSmooth; vIt.Next() )
- {
- TGeomID iV = getMeshDS()->ShapeToIndex( vIt.Value() );
- vector<_LayerEdge*>& eV = edgesByGeom[ iV ];
- if ( eV.empty() ) continue;
- gp_Vec eDir = getEdgeDir( TopoDS::Edge( S ), TopoDS::Vertex( vIt.Value() ));
- double angle = eDir.Angle( eV[0]->_normal );
- double cosin = Cos( angle );
- if ( cosin > theMinSmoothCosin )
- {
- // compare tgtThick with the length of an end segment
- SMDS_ElemIteratorPtr eIt = eV[0]->_nodes[0]->GetInverseElementIterator(SMDSAbs_Edge);
- while ( eIt->more() )
+ TopExp_Explorer eExp( edgesByGeom[iS]._shape, TopAbs_EDGE );
+ for ( ; eExp.More() && !eos._toSmooth; eExp.Next() )
+ {
+ TGeomID iE = getMeshDS()->ShapeToIndex( eExp.Current() );
+ vector<_LayerEdge*>& eE = edgesByGeom[ iE ]._edges;
+ if ( eE.empty() ) continue;
+ // TopLoc_Location loc;
+ // Handle(Geom_Surface) surface = BRep_Tool::Surface( TopoDS::Face( S ), loc );
+ // bool isPlane = GeomLib_IsPlanarSurface( surface ).IsPlanar();
+ //if ( eE[0]->_sWOL.IsNull() )
+ {
+ double faceSize;
+ for ( size_t i = 0; i < eE.size() && !eos._toSmooth; ++i )
+ if ( eE[i]->_cosin > theMinSmoothCosin )
{
- const SMDS_MeshElement* endSeg = eIt->next();
- if ( endSeg->getshapeId() == iS )
+ SMDS_ElemIteratorPtr fIt = eE[i]->_nodes[0]->GetInverseElementIterator(SMDSAbs_Face);
+ while ( fIt->more() && !eos._toSmooth )
{
- double segLen =
- SMESH_TNodeXYZ( endSeg->GetNode(0) ).Distance( endSeg->GetNode(1 ));
- needSmooth = needSmoothing( cosin, tgtThick, segLen );
- break;
+ const SMDS_MeshElement* face = fIt->next();
+ if ( getDistFromEdge( face, eE[i]->_nodes[0], faceSize ))
+ eos._toSmooth = needSmoothing( eE[i]->_cosin, tgtThick, faceSize );
}
}
- }
}
- break;
+ // else
+ // {
+ // const TopoDS_Face& F1 = TopoDS::Face( S );
+ // const TopoDS_Face& F2 = TopoDS::Face( eE[0]->_sWOL );
+ // const TopoDS_Edge& E = TopoDS::Edge( eExp.Current() );
+ // for ( size_t i = 0; i < eE.size() && !eos._toSmooth; ++i )
+ // {
+ // gp_Vec dir1 = getFaceDir( F1, E, eE[i]->_nodes[0], helper, ok );
+ // gp_Vec dir2 = getFaceDir( F2, E, eE[i]->_nodes[0], helper, ok );
+ // double angle = dir1.Angle( );
+ // double cosin = cos( angle );
+ // eos._toSmooth = ( cosin > theMinSmoothCosin );
+ // }
+ // }
}
- case TopAbs_FACE: {
+ if ( eos._toSmooth )
+ {
+ for ( eExp.ReInit(); eExp.More(); eExp.Next() )
+ edgesOfSmooFaces.Add( eExp.Current() );
+
+ data.PrepareEdgesToSmoothOnFace( &edgesByGeom[iS], /*substituteSrcNodes=*/false );
+ }
+ data._nbShapesToSmooth += eos._toSmooth;
+
+ } // check FACEs
+
+ for ( size_t iS = 0; iS < edgesByGeom.size(); ++iS ) // check EDGEs
+ {
+ _EdgesOnShape& eos = edgesByGeom[iS];
+ if ( eos._edges.empty() || eos.ShapeType() != TopAbs_EDGE ) continue;
+ if ( !eos._hyp.ToSmooth() ) continue;
- for ( TopExp_Explorer eExp( S, TopAbs_EDGE ); eExp.More() && !needSmooth; eExp.Next() )
+ const TopoDS_Edge& E = TopoDS::Edge( edgesByGeom[iS]._shape );
+ if ( SMESH_Algo::isDegenerated( E ) || !edgesOfSmooFaces.Contains( E ))
+ continue;
+
+ for ( TopoDS_Iterator vIt( E ); vIt.More() && !eos._toSmooth; vIt.Next() )
+ {
+ TGeomID iV = getMeshDS()->ShapeToIndex( vIt.Value() );
+ vector<_LayerEdge*>& eV = edgesByGeom[ iV ]._edges;
+ if ( eV.empty() ) continue;
+ gp_Vec eDir = getEdgeDir( E, TopoDS::Vertex( vIt.Value() ));
+ double angle = eDir.Angle( eV[0]->_normal );
+ double cosin = Cos( angle );
+ double cosinAbs = Abs( cosin );
+ if ( cosinAbs > theMinSmoothCosin )
{
- TGeomID iE = getMeshDS()->ShapeToIndex( eExp.Current() );
- vector<_LayerEdge*>& eE = edgesByGeom[ iE ];
- if ( eE.empty() ) continue;
- // TopLoc_Location loc;
- // Handle(Geom_Surface) surface = BRep_Tool::Surface( TopoDS::Face( S ), loc );
- // bool isPlane = GeomLib_IsPlanarSurface( surface ).IsPlanar();
- //if ( eE[0]->_sWOL.IsNull() )
+ // always smooth analytic EDGEs
+ eos._toSmooth = ! data.CurveForSmooth( E, eos, helper ).IsNull();
+
+ // compare tgtThick with the length of an end segment
+ SMDS_ElemIteratorPtr eIt = eV[0]->_nodes[0]->GetInverseElementIterator(SMDSAbs_Edge);
+ while ( eIt->more() && !eos._toSmooth )
{
- double faceSize;
- for ( size_t i = 0; i < eE.size() && !needSmooth; ++i )
- if ( eE[i]->_cosin > theMinSmoothCosin )
- {
- SMDS_ElemIteratorPtr fIt = eE[i]->_nodes[0]->GetInverseElementIterator(SMDSAbs_Face);
- while ( fIt->more() && !needSmooth )
- {
- const SMDS_MeshElement* face = fIt->next();
- if ( getDistFromEdge( face, eE[i]->_nodes[0], faceSize ))
- needSmooth = needSmoothing( eE[i]->_cosin, tgtThick, faceSize );
- }
- }
+ const SMDS_MeshElement* endSeg = eIt->next();
+ if ( endSeg->getshapeId() == iS )
+ {
+ double segLen =
+ SMESH_TNodeXYZ( endSeg->GetNode(0) ).Distance( endSeg->GetNode(1 ));
+ eos._toSmooth = needSmoothing( cosinAbs, tgtThick, segLen );
+ }
}
- // else
- // {
- // const TopoDS_Face& F1 = TopoDS::Face( S );
- // const TopoDS_Face& F2 = TopoDS::Face( eE[0]->_sWOL );
- // const TopoDS_Edge& E = TopoDS::Edge( eExp.Current() );
- // for ( size_t i = 0; i < eE.size() && !needSmooth; ++i )
- // {
- // gp_Vec dir1 = getFaceDir( F1, E, eE[i]->_nodes[0], helper, ok );
- // gp_Vec dir2 = getFaceDir( F2, E, eE[i]->_nodes[0], helper, ok );
- // double angle = dir1.Angle( );
- // double cosin = cos( angle );
- // needSmooth = ( cosin > theMinSmoothCosin );
- // }
- // }
}
- break;
- }
- case TopAbs_VERTEX:
- continue;
- default:;
}
+ data._nbShapesToSmooth += eos._toSmooth;
- if ( needSmooth )
- {
- if ( S.ShapeType() == TopAbs_EDGE ) shapesToSmooth.push_front( iS );
- else shapesToSmooth.push_back ( iS );
- }
-
- } // loop on edgesByGeom
-
- data._edges.reserve( data._n2eMap.size() );
- data._endEdgeOnShape.clear();
-
- // first we put _LayerEdge's on shapes to smooth
- data._nbShapesToSmooth = 0;
- list< TGeomID >::iterator gIt = shapesToSmooth.begin();
- for ( ; gIt != shapesToSmooth.end(); ++gIt )
- {
- vector<_LayerEdge*>& eVec = edgesByGeom[ *gIt ];
- if ( eVec.empty() ) continue;
- data._edges.insert( data._edges.end(), eVec.begin(), eVec.end() );
- data._endEdgeOnShape.push_back( data._edges.size() );
- data._nbShapesToSmooth++;
- eVec.clear();
- }
+ } // check EDGEs
- // then the rest _LayerEdge's
+ // Reset _cosin if no smooth is allowed by the user
for ( size_t iS = 0; iS < edgesByGeom.size(); ++iS )
{
- vector<_LayerEdge*>& eVec = edgesByGeom[iS];
- if ( eVec.empty() ) continue;
- data._edges.insert( data._edges.end(), eVec.begin(), eVec.end() );
- data._endEdgeOnShape.push_back( data._edges.size() );
- //eVec.clear();
+ _EdgesOnShape& eos = edgesByGeom[iS];
+ if ( eos._edges.empty() ) continue;
+
+ if ( !eos._hyp.ToSmooth() )
+ for ( size_t i = 0; i < eos._edges.size(); ++i )
+ eos._edges[i]->SetCosin( 0 );
}
- // compute average StdMeshers_ViscousLayers parameters for each shape
- data._hypOnShape.clear();
+ // int nbShapes = 0;
+ // for ( size_t iS = 0; iS < edgesByGeom.size(); ++iS )
+ // {
+ // nbShapes += ( edgesByGeom[iS]._edges.size() > 0 );
+ // }
+ // data._edgesOnShape.reserve( nbShapes );
+
+ // // first we put _LayerEdge's on shapes to smooth (EGDEs go first)
+ // vector< _LayerEdge* > edges;
+ // list< TGeomID >::iterator gIt = shapesToSmooth.begin();
+ // for ( ; gIt != shapesToSmooth.end(); ++gIt )
+ // {
+ // _EdgesOnShape& eos = edgesByGeom[ *gIt ];
+ // if ( eos._edges.empty() ) continue;
+ // eos._edges.swap( edges ); // avoid copying array
+ // eos._toSmooth = true;
+ // data._edgesOnShape.push_back( eos );
+ // data._edgesOnShape.back()._edges.swap( edges );
+ // }
+
+ // // then the rest _LayerEdge's
+ // for ( size_t iS = 0; iS < edgesByGeom.size(); ++iS )
+ // {
+ // _EdgesOnShape& eos = edgesByGeom[ *gIt ];
+ // if ( eos._edges.empty() ) continue;
+ // eos._edges.swap( edges ); // avoid copying array
+ // eos._toSmooth = false;
+ // data._edgesOnShape.push_back( eos );
+ // data._edgesOnShape.back()._edges.swap( edges );
+ // }
+
+ return ok;
+}
+
+//================================================================================
+/*!
+ * \brief initialize data of _EdgesOnShape
+ */
+//================================================================================
+
+void _ViscousBuilder::setShapeData( _EdgesOnShape& eos,
+ SMESH_subMesh* sm,
+ _SolidData& data )
+{
+ if ( !eos._shape.IsNull() ||
+ sm->GetSubShape().ShapeType() == TopAbs_WIRE )
+ return;
+
+ SMESH_MesherHelper helper( *_mesh );
+
+ eos._subMesh = sm;
+ eos._shapeID = sm->GetId();
+ eos._shape = sm->GetSubShape();
+ if ( eos.ShapeType() == TopAbs_FACE )
+ eos._shape.Orientation( helper.GetSubShapeOri( data._solid, eos._shape ));
+ eos._toSmooth = false;
+
+ // set _SWOL
+ map< TGeomID, TopoDS_Shape >::const_iterator s2s =
+ data._shrinkShape2Shape.find( eos._shapeID );
+ if ( s2s != data._shrinkShape2Shape.end() )
+ eos._sWOL = s2s->second;
+
+ // set _hyp
if ( data._hyps.size() == 1 )
{
- data._hypOnShape.resize( data._endEdgeOnShape.size(), AverageHyp( data._hyps.back() ));
+ eos._hyp = data._hyps.back();
}
else
{
- data._hypOnShape.resize( data._endEdgeOnShape.size() );
+ // compute average StdMeshers_ViscousLayers parameters
map< TGeomID, const StdMeshers_ViscousLayers* >::iterator f2hyp;
- for ( size_t i = 0; i < data._endEdgeOnShape.size(); ++i )
+ if ( eos.ShapeType() == TopAbs_FACE )
{
- int iEnd = data._endEdgeOnShape[i];
- _LayerEdge* LE = data._edges[ iEnd-1 ];
- TGeomID iShape = LE->_nodes[0]->getshapeId();
- const TopoDS_Shape& S = getMeshDS()->IndexToShape( iShape );
- if ( S.ShapeType() == TopAbs_FACE )
+ if (( f2hyp = data._face2hyp.find( eos._shapeID )) != data._face2hyp.end() )
+ eos._hyp = f2hyp->second;
+ }
+ else
+ {
+ PShapeIteratorPtr fIt = helper.GetAncestors( eos._shape, *_mesh, TopAbs_FACE );
+ while ( const TopoDS_Shape* face = fIt->next() )
{
- if (( f2hyp = data._face2hyp.find( iShape )) != data._face2hyp.end() )
- {
- data._hypOnShape[ i ].Add( f2hyp->second );
- }
+ TGeomID faceID = getMeshDS()->ShapeToIndex( *face );
+ if (( f2hyp = data._face2hyp.find( faceID )) != data._face2hyp.end() )
+ eos._hyp.Add( f2hyp->second );
}
- else
+ }
+ }
+
+ // set _faceNormals
+ if ( ! eos._hyp.UseSurfaceNormal() )
+ {
+ if ( eos.ShapeType() == TopAbs_FACE ) // get normals to elements on a FACE
+ {
+ SMESHDS_SubMesh* smDS = sm->GetSubMeshDS();
+ eos._faceNormals.resize( smDS->NbElements() );
+
+ SMDS_ElemIteratorPtr eIt = smDS->GetElements();
+ for ( int iF = 0; eIt->more(); ++iF )
{
- PShapeIteratorPtr fIt = SMESH_MesherHelper::GetAncestors( S, *_mesh, TopAbs_FACE );
- while ( const TopoDS_Shape* face = fIt->next() )
- {
- TGeomID faceID = getMeshDS()->ShapeToIndex( *face );
- if (( f2hyp = data._face2hyp.find( faceID )) != data._face2hyp.end() )
- {
- data._hypOnShape[ i ].Add( f2hyp->second );
- }
- }
+ const SMDS_MeshElement* face = eIt->next();
+ if ( !SMESH_MeshAlgos::FaceNormal( face, eos._faceNormals[iF], /*normalized=*/true ))
+ eos._faceNormals[iF].SetCoord( 0,0,0 );
+ }
+
+ if ( !helper.IsReversedSubMesh( TopoDS::Face( eos._shape )))
+ for ( size_t iF = 0; iF < eos._faceNormals.size(); ++iF )
+ eos._faceNormals[iF].Reverse();
+ }
+ else // find EOS of adjacent FACEs
+ {
+ PShapeIteratorPtr fIt = helper.GetAncestors( eos._shape, *_mesh, TopAbs_FACE );
+ while ( const TopoDS_Shape* face = fIt->next() )
+ {
+ TGeomID faceID = getMeshDS()->ShapeToIndex( *face );
+ eos._faceEOS.push_back( & data._edgesOnShape[ faceID ]);
+ if ( eos._faceEOS.back()->_shape.IsNull() )
+ // avoid using uninitialised _shapeID in GetNormal()
+ eos._faceEOS.back()->_shapeID = faceID;
}
}
}
+}
+
+//================================================================================
+/*!
+ * \brief Returns normal of a face
+ */
+//================================================================================
+
+bool _EdgesOnShape::GetNormal( const SMDS_MeshElement* face, gp_Vec& norm )
+{
+ bool ok = false;
+ const _EdgesOnShape* eos = 0;
+
+ if ( face->getshapeId() == _shapeID )
+ {
+ eos = this;
+ }
+ else
+ {
+ for ( size_t iF = 0; iF < _faceEOS.size() && !eos; ++iF )
+ if ( face->getshapeId() == _faceEOS[ iF ]->_shapeID )
+ eos = _faceEOS[ iF ];
+ }
+ if (( eos ) &&
+ ( ok = ( face->getIdInShape() < eos->_faceNormals.size() )))
+ {
+ norm = eos->_faceNormals[ face->getIdInShape() ];
+ }
+ else if ( !eos )
+ {
+ debugMsg( "_EdgesOnShape::Normal() failed for face "<<face->GetID()
+ << " on _shape #" << _shapeID );
+ }
return ok;
}
+
//================================================================================
/*!
* \brief Set data of _LayerEdge needed for smoothing
//================================================================================
bool _ViscousBuilder::setEdgeData(_LayerEdge& edge,
+ _EdgesOnShape& eos,
const set<TGeomID>& subIds,
SMESH_MesherHelper& helper,
_SolidData& data)
{
- SMESH_MeshEditor editor(_mesh);
-
const SMDS_MeshNode* node = edge._nodes[0]; // source node
- SMDS_TypeOfPosition posType = node->GetPosition()->GetTypeOfPosition();
edge._len = 0;
edge._2neibors = 0;
edge._normal.SetCoord(0,0,0);
int totalNbFaces = 0;
+ TopoDS_Face F;
+ std::pair< TopoDS_Face, gp_XYZ > face2Norm[20];
gp_Vec geomNorm;
bool normOK = true;
- const TGeomID shapeInd = node->getshapeId();
- map< TGeomID, TopoDS_Shape >::const_iterator s2s = data._shrinkShape2Shape.find( shapeInd );
- const bool onShrinkShape ( s2s != data._shrinkShape2Shape.end() );
+ const bool onShrinkShape = !eos._sWOL.IsNull();
+ const bool useGeometry = (( eos._hyp.UseSurfaceNormal() ) ||
+ ( eos.ShapeType() != TopAbs_FACE && !onShrinkShape ));
- if ( onShrinkShape ) // one of faces the node is on has no layers
- {
- TopoDS_Shape vertEdge = getMeshDS()->IndexToShape( s2s->first ); // vertex or edge
- if ( s2s->second.ShapeType() == TopAbs_EDGE )
- {
- // inflate from VERTEX along EDGE
- edge._normal = getEdgeDir( TopoDS::Edge( s2s->second ), TopoDS::Vertex( vertEdge ));
- }
- else if ( vertEdge.ShapeType() == TopAbs_VERTEX )
- {
- // inflate from VERTEX along FACE
- edge._normal = getFaceDir( TopoDS::Face( s2s->second ), TopoDS::Vertex( vertEdge ),
- node, helper, normOK, &edge._cosin);
- }
- else
- {
- // inflate from EDGE along FACE
- edge._normal = getFaceDir( TopoDS::Face( s2s->second ), TopoDS::Edge( vertEdge ),
- node, helper, normOK);
- }
- }
- else // layers are on all faces of SOLID the node is on
+ // get geom FACEs the node lies on
+ //if ( useGeometry )
{
- // find indices of geom faces the node lies on
set<TGeomID> faceIds;
- if ( posType == SMDS_TOP_FACE )
+ if ( eos.ShapeType() == TopAbs_FACE )
{
- faceIds.insert( node->getshapeId() );
+ faceIds.insert( eos._shapeID );
}
else
{
SMDS_ElemIteratorPtr fIt = node->GetInverseElementIterator(SMDSAbs_Face);
while ( fIt->more() )
- faceIds.insert( editor.FindShape(fIt->next()));
+ faceIds.insert( fIt->next()->getshapeId() );
}
-
set<TGeomID>::iterator id = faceIds.begin();
- TopoDS_Face F;
- std::pair< TGeomID, gp_XYZ > id2Norm[20];
for ( ; id != faceIds.end(); ++id )
{
const TopoDS_Shape& s = getMeshDS()->IndexToShape( *id );
if ( s.IsNull() || s.ShapeType() != TopAbs_FACE || !subIds.count( *id ))
continue;
F = TopoDS::Face( s );
- geomNorm = getFaceNormal( node, F, helper, normOK );
- if ( !normOK ) continue;
-
- if ( helper.GetSubShapeOri( data._solid, F ) != TopAbs_REVERSED )
- geomNorm.Reverse();
- id2Norm[ totalNbFaces ].first = *id;
- id2Norm[ totalNbFaces ].second = geomNorm.XYZ();
+ face2Norm[ totalNbFaces ].first = F;
totalNbFaces++;
- edge._normal += geomNorm.XYZ();
}
- if ( totalNbFaces == 0 )
- return error(SMESH_Comment("Can't get normal to node ") << node->GetID(), data._index);
+ }
- if ( normOK && edge._normal.Modulus() < 1e-3 && totalNbFaces > 1 )
+ // find _normal
+ if ( useGeometry )
+ {
+ if ( onShrinkShape ) // one of faces the node is on has no layers
{
- // opposite normals, re-get normals at shifted positions (IPAL 52426)
- edge._normal.SetCoord( 0,0,0 );
- for ( int i = 0; i < totalNbFaces; ++i )
+ if ( eos.SWOLType() == TopAbs_EDGE )
{
- const TopoDS_Face& F = TopoDS::Face( getMeshDS()->IndexToShape( id2Norm[i].first ));
- geomNorm = getFaceNormal( node, F, helper, normOK, /*shiftInside=*/true );
- if ( helper.GetSubShapeOri( data._solid, F ) != TopAbs_REVERSED )
- geomNorm.Reverse();
- if ( normOK )
- id2Norm[ i ].second = geomNorm.XYZ();
- edge._normal += id2Norm[ i ].second;
+ // inflate from VERTEX along EDGE
+ edge._normal = getEdgeDir( TopoDS::Edge( eos._sWOL ), TopoDS::Vertex( eos._shape ));
+ }
+ else if ( eos.ShapeType() == TopAbs_VERTEX )
+ {
+ // inflate from VERTEX along FACE
+ edge._normal = getFaceDir( TopoDS::Face( eos._sWOL ), TopoDS::Vertex( eos._shape ),
+ node, helper, normOK, &edge._cosin);
+ }
+ else
+ {
+ // inflate from EDGE along FACE
+ edge._normal = getFaceDir( TopoDS::Face( eos._sWOL ), TopoDS::Edge( eos._shape ),
+ node, helper, normOK);
}
}
- if ( totalNbFaces < 3 )
- {
- //edge._normal /= totalNbFaces;
- }
+ // layers are on all faces of SOLID the node is on
else
{
- edge._normal = getWeigthedNormal( node, id2Norm, totalNbFaces );
+ int nbOkNorms = 0;
+ for ( int iF = 0; iF < totalNbFaces; ++iF )
+ {
+ F = TopoDS::Face( face2Norm[ iF ].first );
+ geomNorm = getFaceNormal( node, F, helper, normOK );
+ if ( !normOK ) continue;
+ nbOkNorms++;
+
+ if ( helper.GetSubShapeOri( data._solid, F ) != TopAbs_REVERSED )
+ geomNorm.Reverse();
+ face2Norm[ iF ].second = geomNorm.XYZ();
+ edge._normal += geomNorm.XYZ();
+ }
+ if ( nbOkNorms == 0 )
+ return error(SMESH_Comment("Can't get normal to node ") << node->GetID(), data._index);
+
+ if ( edge._normal.Modulus() < 1e-3 && nbOkNorms > 1 )
+ {
+ // opposite normals, re-get normals at shifted positions (IPAL 52426)
+ edge._normal.SetCoord( 0,0,0 );
+ for ( int iF = 0; iF < totalNbFaces; ++iF )
+ {
+ const TopoDS_Face& F = face2Norm[iF].first;
+ geomNorm = getFaceNormal( node, F, helper, normOK, /*shiftInside=*/true );
+ if ( helper.GetSubShapeOri( data._solid, F ) != TopAbs_REVERSED )
+ geomNorm.Reverse();
+ if ( normOK )
+ face2Norm[ iF ].second = geomNorm.XYZ();
+ edge._normal += face2Norm[ iF ].second;
+ }
+ }
+
+ if ( totalNbFaces < 3 )
+ {
+ //edge._normal /= totalNbFaces;
+ }
+ else
+ {
+ edge._normal = getWeigthedNormal( node, face2Norm, totalNbFaces );
+ }
}
+ }
+ else // !useGeometry - get _normal using surrounding mesh faces
+ {
+ set<TGeomID> faceIds;
- switch ( posType )
+ SMDS_ElemIteratorPtr fIt = node->GetInverseElementIterator(SMDSAbs_Face);
+ while ( fIt->more() )
{
- case SMDS_TOP_FACE:
- edge._cosin = 0; break;
+ const SMDS_MeshElement* face = fIt->next();
+ if ( eos.GetNormal( face, geomNorm ))
+ {
+ if ( onShrinkShape && !faceIds.insert( face->getshapeId() ).second )
+ continue; // use only one mesh face on FACE
+ edge._normal += geomNorm.XYZ();
+ totalNbFaces++;
+ }
+ }
+ }
- case SMDS_TOP_EDGE: {
- TopoDS_Edge E = TopoDS::Edge( helper.GetSubShapeByNode( node, getMeshDS()));
+ // compute _cosin
+ //if ( eos._hyp.UseSurfaceNormal() )
+ {
+ switch ( eos.ShapeType() )
+ {
+ case TopAbs_FACE: {
+ edge._cosin = 0;
+ break;
+ }
+ case TopAbs_EDGE: {
+ TopoDS_Edge E = TopoDS::Edge( eos._shape );
gp_Vec inFaceDir = getFaceDir( F, E, node, helper, normOK );
- double angle = inFaceDir.Angle( edge._normal ); // [0,PI]
- edge._cosin = cos( angle );
+ double angle = inFaceDir.Angle( edge._normal ); // [0,PI]
+ edge._cosin = Cos( angle );
//cout << "Cosin on EDGE " << edge._cosin << " node " << node->GetID() << endl;
break;
}
- case SMDS_TOP_VERTEX: {
- TopoDS_Vertex V = TopoDS::Vertex( helper.GetSubShapeByNode( node, getMeshDS()));
- gp_Vec inFaceDir = getFaceDir( F, V, node, helper, normOK );
- double angle = inFaceDir.Angle( edge._normal ); // [0,PI]
- edge._cosin = cos( angle );
+ case TopAbs_VERTEX: {
+ if ( eos.SWOLType() != TopAbs_FACE ) { // else _cosin is set by getFaceDir()
+ TopoDS_Vertex V = TopoDS::Vertex( eos._shape );
+ gp_Vec inFaceDir = getFaceDir( F, V, node, helper, normOK );
+ double angle = inFaceDir.Angle( edge._normal ); // [0,PI]
+ edge._cosin = Cos( angle );
+ if ( totalNbFaces > 2 || helper.IsSeamShape( node->getshapeId() ))
+ for ( int iF = totalNbFaces-2; iF >=0; --iF )
+ {
+ F = face2Norm[ iF ].first;
+ inFaceDir = getFaceDir( F, V, node, helper, normOK=true );
+ if ( normOK ) {
+ double angle = inFaceDir.Angle( edge._normal );
+ edge._cosin = Max( edge._cosin, Cos( angle ));
+ }
+ }
+ }
//cout << "Cosin on VERTEX " << edge._cosin << " node " << node->GetID() << endl;
break;
}
default:
return error(SMESH_Comment("Invalid shape position of node ")<<node, data._index);
}
- } // case _sWOL.IsNull()
+ }
double normSize = edge._normal.SquareModulus();
if ( normSize < numeric_limits<double>::min() )
// --------------------
if ( onShrinkShape )
{
- edge._sWOL = (*s2s).second;
-
SMDS_MeshNode* tgtNode = const_cast<SMDS_MeshNode*>( edge._nodes.back() );
if ( SMESHDS_SubMesh* sm = getMeshDS()->MeshElements( data._solid ))
sm->RemoveNode( tgtNode , /*isNodeDeleted=*/false );
// set initial position which is parameters on _sWOL in this case
- if ( edge._sWOL.ShapeType() == TopAbs_EDGE )
+ if ( eos.SWOLType() == TopAbs_EDGE )
{
- double u = helper.GetNodeU( TopoDS::Edge( edge._sWOL ), node, 0, &normOK );
+ double u = helper.GetNodeU( TopoDS::Edge( eos._sWOL ), node, 0, &normOK );
edge._pos.push_back( gp_XYZ( u, 0, 0 ));
if ( edge._nodes.size() > 1 )
- getMeshDS()->SetNodeOnEdge( tgtNode, TopoDS::Edge( edge._sWOL ), u );
+ getMeshDS()->SetNodeOnEdge( tgtNode, TopoDS::Edge( eos._sWOL ), u );
}
else // TopAbs_FACE
{
- gp_XY uv = helper.GetNodeUV( TopoDS::Face( edge._sWOL ), node, 0, &normOK );
+ gp_XY uv = helper.GetNodeUV( TopoDS::Face( eos._sWOL ), node, 0, &normOK );
edge._pos.push_back( gp_XYZ( uv.X(), uv.Y(), 0));
if ( edge._nodes.size() > 1 )
- getMeshDS()->SetNodeOnFace( tgtNode, TopoDS::Face( edge._sWOL ), uv.X(), uv.Y() );
+ getMeshDS()->SetNodeOnFace( tgtNode, TopoDS::Face( eos._sWOL ), uv.X(), uv.Y() );
}
}
else
{
edge._pos.push_back( SMESH_TNodeXYZ( node ));
- if ( posType == SMDS_TOP_FACE )
+ if ( eos.ShapeType() == TopAbs_FACE )
{
- getSimplices( node, edge._simplices, data._ignoreFaceIds, &data );
- double avgNormProj = 0, avgLen = 0;
- for ( size_t i = 0; i < edge._simplices.size(); ++i )
- {
- gp_XYZ vec = edge._pos.back() - SMESH_TNodeXYZ( edge._simplices[i]._nPrev );
- avgNormProj += edge._normal * vec;
- avgLen += vec.Modulus();
- }
- avgNormProj /= edge._simplices.size();
- avgLen /= edge._simplices.size();
- edge._curvature = _Curvature::New( avgNormProj, avgLen );
+ _Simplex::GetSimplices( node, edge._simplices, data._ignoreFaceIds, &data );
}
}
// Set neighbour nodes for a _LayerEdge based on EDGE
- if ( posType == SMDS_TOP_EDGE /*||
+ if ( eos.ShapeType() == TopAbs_EDGE /*||
( onShrinkShape && posType == SMDS_TOP_VERTEX && fabs( edge._cosin ) < 1e-10 )*/)
{
edge._2neibors = new _2NearEdges;
// target node instead of source ones will be set later
// if ( ! findNeiborsOnEdge( &edge,
// edge._2neibors->_nodes[0],
- // edge._2neibors->_nodes[1],
+ // edge._2neibors->_nodes[1], eos,
// data))
// return false;
// edge.SetDataByNeighbors( edge._2neibors->_nodes[0],
isOK = false;
Handle(Geom_Surface) surface = BRep_Tool::Surface( face );
+
+ if ( !shiftInside &&
+ helper.IsDegenShape( node->getshapeId() ) &&
+ getFaceNormalAtSingularity( uv, face, helper, normal ))
+ {
+ isOK = true;
+ return normal.XYZ();
+ }
+
int pointKind = GeomLib::NormEstim( surface, uv, 1e-5, normal );
enum { REGULAR = 0, QUASYSINGULAR, CONICAL, IMPOSSIBLE };
return normal.XYZ();
}
+//================================================================================
+/*!
+ * \brief Try to get normal at a singularity of a surface basing on it's nature
+ */
+//================================================================================
+
+bool _ViscousBuilder::getFaceNormalAtSingularity( const gp_XY& uv,
+ const TopoDS_Face& face,
+ SMESH_MesherHelper& helper,
+ gp_Dir& normal )
+{
+ BRepAdaptor_Surface surface( face );
+ gp_Dir axis;
+ if ( !getRovolutionAxis( surface, axis ))
+ return false;
+
+ double f,l, d, du, dv;
+ f = surface.FirstUParameter();
+ l = surface.LastUParameter();
+ d = ( uv.X() - f ) / ( l - f );
+ du = ( d < 0.5 ? +1. : -1 ) * 1e-5 * ( l - f );
+ f = surface.FirstVParameter();
+ l = surface.LastVParameter();
+ d = ( uv.Y() - f ) / ( l - f );
+ dv = ( d < 0.5 ? +1. : -1 ) * 1e-5 * ( l - f );
+
+ gp_Dir refDir;
+ gp_Pnt2d testUV = uv;
+ enum { REGULAR = 0, QUASYSINGULAR, CONICAL, IMPOSSIBLE };
+ double tol = 1e-5;
+ Handle(Geom_Surface) geomsurf = surface.Surface().Surface();
+ for ( int iLoop = 0; true ; ++iLoop )
+ {
+ testUV.SetCoord( testUV.X() + du, testUV.Y() + dv );
+ if ( GeomLib::NormEstim( geomsurf, testUV, tol, refDir ) == REGULAR )
+ break;
+ if ( iLoop > 20 )
+ return false;
+ tol /= 10.;
+ }
+
+ if ( axis * refDir < 0. )
+ axis.Reverse();
+
+ normal = axis;
+
+ return true;
+}
+
//================================================================================
/*!
* \brief Return a normal at a node weighted with angles taken by FACEs
*/
//================================================================================
-gp_XYZ _ViscousBuilder::getWeigthedNormal( const SMDS_MeshNode* n,
- std::pair< TGeomID, gp_XYZ > fId2Normal[],
- const int nbFaces )
+gp_XYZ _ViscousBuilder::getWeigthedNormal( const SMDS_MeshNode* n,
+ std::pair< TopoDS_Face, gp_XYZ > fId2Normal[],
+ int nbFaces )
{
gp_XYZ resNorm(0,0,0);
TopoDS_Shape V = SMESH_MesherHelper::GetSubShapeByNode( n, getMeshDS() );
if ( V.ShapeType() != TopAbs_VERTEX )
{
for ( int i = 0; i < nbFaces; ++i )
- resNorm += fId2Normal[i].second / nbFaces ;
+ resNorm += fId2Normal[i].second;
return resNorm;
}
- double angles[30];
- for ( int i = 0; i < nbFaces; ++i )
- {
- const TopoDS_Face& F = TopoDS::Face( getMeshDS()->IndexToShape( fId2Normal[i].first ));
-
- // look for two EDGEs shared by F and other FACEs within fId2Normal
- TopoDS_Edge ee[2];
- int nbE = 0;
- PShapeIteratorPtr eIt = SMESH_MesherHelper::GetAncestors( V, *_mesh, TopAbs_EDGE );
- while ( const TopoDS_Shape* E = eIt->next() )
- {
- if ( !SMESH_MesherHelper::IsSubShape( *E, F ))
- continue;
- bool isSharedEdge = false;
- for ( int j = 0; j < nbFaces && !isSharedEdge; ++j )
+ // exclude equal normals
+ int nbUniqNorms = nbFaces;
+ for ( int i = 0; i < nbFaces; ++i ) {
+ for ( int j = i+1; j < nbFaces; ++j )
+ if ( fId2Normal[i].second.IsEqual( fId2Normal[j].second, 0.1 ))
{
- if ( i == j ) continue;
- const TopoDS_Shape& otherF = getMeshDS()->IndexToShape( fId2Normal[j].first );
- isSharedEdge = SMESH_MesherHelper::IsSubShape( *E, otherF );
- }
- if ( !isSharedEdge )
- continue;
- ee[ nbE ] = TopoDS::Edge( *E );
- ee[ nbE ].Orientation( SMESH_MesherHelper::GetSubShapeOri( F, *E ));
- if ( ++nbE == 2 )
+ fId2Normal[i].second.SetCoord( 0,0,0 );
+ --nbUniqNorms;
break;
- }
+ }
+ }
+ for ( int i = 0; i < nbFaces; ++i )
+ resNorm += fId2Normal[i].second;
- // get an angle between the two EDGEs
- angles[i] = 0;
- if ( nbE < 1 ) continue;
- if ( nbE == 1 )
- {
- ee[ 1 ] == ee[ 0 ];
- }
- else
+ // assure that resNorm is visible by every FACE (IPAL0052675)
+ if ( nbUniqNorms > 3 )
+ {
+ bool change = false;
+ for ( int nbAttempts = 0; nbAttempts < nbFaces; ++nbAttempts)
{
- if ( !V.IsSame( SMESH_MesherHelper::IthVertex( 0, ee[ 1 ] )))
- std::swap( ee[0], ee[1] );
+ for ( int i = 0; i < nbFaces; ++i )
+ if ( resNorm * fId2Normal[i].second < 0.5 )
+ {
+ resNorm += fId2Normal[i].second;
+ change = true;
+ }
+ if ( !change ) break;
}
- angles[i] = SMESH_MesherHelper::GetAngle( ee[0], ee[1], F, TopoDS::Vertex( V ));
}
- // compute a weighted normal
- double sumAngle = 0;
- for ( int i = 0; i < nbFaces; ++i )
- {
- angles[i] = ( angles[i] > 2*M_PI ) ? 0 : M_PI - angles[i];
- sumAngle += angles[i];
- }
- for ( int i = 0; i < nbFaces; ++i )
- resNorm += angles[i] / sumAngle * fId2Normal[i].second;
+ // double angles[30];
+ // for ( int i = 0; i < nbFaces; ++i )
+ // {
+ // const TopoDS_Face& F = fId2Normal[i].first;
+
+ // // look for two EDGEs shared by F and other FACEs within fId2Normal
+ // TopoDS_Edge ee[2];
+ // int nbE = 0;
+ // PShapeIteratorPtr eIt = SMESH_MesherHelper::GetAncestors( V, *_mesh, TopAbs_EDGE );
+ // while ( const TopoDS_Shape* E = eIt->next() )
+ // {
+ // if ( !SMESH_MesherHelper::IsSubShape( *E, F ))
+ // continue;
+ // bool isSharedEdge = false;
+ // for ( int j = 0; j < nbFaces && !isSharedEdge; ++j )
+ // {
+ // if ( i == j ) continue;
+ // const TopoDS_Shape& otherF = fId2Normal[j].first;
+ // isSharedEdge = SMESH_MesherHelper::IsSubShape( *E, otherF );
+ // }
+ // if ( !isSharedEdge )
+ // continue;
+ // ee[ nbE ] = TopoDS::Edge( *E );
+ // ee[ nbE ].Orientation( SMESH_MesherHelper::GetSubShapeOri( F, *E ));
+ // if ( ++nbE == 2 )
+ // break;
+ // }
+
+ // // get an angle between the two EDGEs
+ // angles[i] = 0;
+ // if ( nbE < 1 ) continue;
+ // if ( nbE == 1 )
+ // {
+ // ee[ 1 ] == ee[ 0 ];
+ // }
+ // else
+ // {
+ // if ( !V.IsSame( SMESH_MesherHelper::IthVertex( 0, ee[ 1 ] )))
+ // std::swap( ee[0], ee[1] );
+ // }
+ // angles[i] = SMESH_MesherHelper::GetAngle( ee[0], ee[1], F, TopoDS::Vertex( V ));
+ // }
+
+ // // compute a weighted normal
+ // double sumAngle = 0;
+ // for ( int i = 0; i < nbFaces; ++i )
+ // {
+ // angles[i] = ( angles[i] > 2*M_PI ) ? 0 : M_PI - angles[i];
+ // sumAngle += angles[i];
+ // }
+ // for ( int i = 0; i < nbFaces; ++i )
+ // resNorm += angles[i] / sumAngle * fId2Normal[i].second;
return resNorm;
}
bool _ViscousBuilder::findNeiborsOnEdge(const _LayerEdge* edge,
const SMDS_MeshNode*& n1,
const SMDS_MeshNode*& n2,
+ _EdgesOnShape& eos,
_SolidData& data)
{
const SMDS_MeshNode* node = edge->_nodes[0];
- const int shapeInd = node->getshapeId();
+ const int shapeInd = eos._shapeID;
SMESHDS_SubMesh* edgeSM = 0;
- if ( node->GetPosition()->GetTypeOfPosition() == SMDS_TOP_EDGE )
+ if ( eos.ShapeType() == TopAbs_EDGE )
{
- edgeSM = getMeshDS()->MeshElements( shapeInd );
+ edgeSM = eos._subMesh->GetSubMeshDS();
if ( !edgeSM || edgeSM->NbElements() == 0 )
return error(SMESH_Comment("Not meshed EDGE ") << shapeInd, data._index);
}
}
else
{
- TopoDS_Shape s = SMESH_MesherHelper::GetSubShapeByNode(nNeibor, getMeshDS() );
- if ( !SMESH_MesherHelper::IsSubShape( s, edge->_sWOL )) continue;
+ TopoDS_Shape s = SMESH_MesherHelper::GetSubShapeByNode( nNeibor, getMeshDS() );
+ if ( !SMESH_MesherHelper::IsSubShape( s, eos._sWOL )) continue;
}
( iN++ ? n2 : n1 ) = nNeibor;
}
void _LayerEdge::SetDataByNeighbors( const SMDS_MeshNode* n1,
const SMDS_MeshNode* n2,
+ const _EdgesOnShape& eos,
SMESH_MesherHelper& helper)
{
- if ( _nodes[0]->GetPosition()->GetTypeOfPosition() != SMDS_TOP_EDGE )
+ if ( eos.ShapeType() != TopAbs_EDGE )
return;
gp_XYZ pos = SMESH_TNodeXYZ( _nodes[0] );
// Set _plnNorm
- if ( _sWOL.IsNull() )
+ if ( eos._sWOL.IsNull() )
{
- TopoDS_Shape S = helper.GetSubShapeByNode( _nodes[0], helper.GetMeshDS() );
- TopoDS_Edge E = TopoDS::Edge( S );
+ TopoDS_Edge E = TopoDS::Edge( eos._shape );
// if ( SMESH_Algo::isDegenerated( E ))
// return;
gp_XYZ dirE = getEdgeDir( E, _nodes[0], helper );
*/
//================================================================================
-gp_XYZ _LayerEdge::Copy( _LayerEdge& other, SMESH_MesherHelper& helper )
+gp_XYZ _LayerEdge::Copy( _LayerEdge& other,
+ _EdgesOnShape& eos,
+ SMESH_MesherHelper& helper )
{
_nodes = other._nodes;
_normal = other._normal;
_len = 0;
_lenFactor = other._lenFactor;
_cosin = other._cosin;
- _sWOL = other._sWOL;
_2neibors = other._2neibors;
_curvature = 0; std::swap( _curvature, other._curvature );
_2neibors = 0; std::swap( _2neibors, other._2neibors );
gp_XYZ lastPos( 0,0,0 );
- if ( _sWOL.ShapeType() == TopAbs_EDGE )
+ if ( eos.SWOLType() == TopAbs_EDGE )
{
- double u = helper.GetNodeU( TopoDS::Edge( _sWOL ), _nodes[0] );
+ double u = helper.GetNodeU( TopoDS::Edge( eos._sWOL ), _nodes[0] );
_pos.push_back( gp_XYZ( u, 0, 0));
- u = helper.GetNodeU( TopoDS::Edge( _sWOL ), _nodes.back() );
+ u = helper.GetNodeU( TopoDS::Edge( eos._sWOL ), _nodes.back() );
lastPos.SetX( u );
}
else // TopAbs_FACE
{
- gp_XY uv = helper.GetNodeUV( TopoDS::Face( _sWOL ), _nodes[0]);
+ gp_XY uv = helper.GetNodeUV( TopoDS::Face( eos._sWOL ), _nodes[0]);
_pos.push_back( gp_XYZ( uv.X(), uv.Y(), 0));
- uv = helper.GetNodeUV( TopoDS::Face( _sWOL ), _nodes.back() );
+ uv = helper.GetNodeUV( TopoDS::Face( eos._sWOL ), _nodes.back() );
lastPos.SetX( uv.X() );
lastPos.SetY( uv.Y() );
}
*/
//================================================================================
-void _ViscousBuilder::getSimplices( const SMDS_MeshNode* node,
- vector<_Simplex>& simplices,
- const set<TGeomID>& ingnoreShapes,
- const _SolidData* dataToCheckOri,
- const bool toSort)
+void _Simplex::GetSimplices( const SMDS_MeshNode* node,
+ vector<_Simplex>& simplices,
+ const set<TGeomID>& ingnoreShapes,
+ const _SolidData* dataToCheckOri,
+ const bool toSort)
{
simplices.clear();
SMDS_ElemIteratorPtr fIt = node->GetInverseElementIterator(SMDSAbs_Face);
}
if ( toSort )
+ SortSimplices( simplices );
+}
+
+//================================================================================
+/*!
+ * \brief Set neighbor simplices side by side
+ */
+//================================================================================
+
+void _Simplex::SortSimplices(vector<_Simplex>& simplices)
+{
+ vector<_Simplex> sortedSimplices( simplices.size() );
+ sortedSimplices[0] = simplices[0];
+ int nbFound = 0;
+ for ( size_t i = 1; i < simplices.size(); ++i )
{
- vector<_Simplex> sortedSimplices( simplices.size() );
- sortedSimplices[0] = simplices[0];
- int nbFound = 0;
- for ( size_t i = 1; i < simplices.size(); ++i )
- {
- for ( size_t j = 1; j < simplices.size(); ++j )
- if ( sortedSimplices[i-1]._nNext == simplices[j]._nPrev )
- {
- sortedSimplices[i] = simplices[j];
- nbFound++;
- break;
- }
- }
- if ( nbFound == simplices.size() - 1 )
- simplices.swap( sortedSimplices );
+ for ( size_t j = 1; j < simplices.size(); ++j )
+ if ( sortedSimplices[i-1]._nNext == simplices[j]._nPrev )
+ {
+ sortedSimplices[i] = simplices[j];
+ nbFound++;
+ break;
+ }
}
+ if ( nbFound == simplices.size() - 1 )
+ simplices.swap( sortedSimplices );
}
//================================================================================
#ifdef _DEBUG_
for ( size_t i = 0 ; i < _sdVec.size(); ++i )
{
- if ( _sdVec[i]._edges.empty() ) continue;
+ if ( _sdVec[i]._n2eMap.empty() ) continue;
dumpFunction( SMESH_Comment("make_LayerEdge_") << i );
- for ( size_t j = 0 ; j < _sdVec[i]._edges.size(); ++j )
+ TNode2Edge::iterator n2e;
+ for ( n2e = _sdVec[i]._n2eMap.begin(); n2e != _sdVec[i]._n2eMap.end(); ++n2e )
{
- _LayerEdge* le = _sdVec[i]._edges[j];
+ _LayerEdge* le = n2e->second;
for ( size_t iN = 1; iN < le->_nodes.size(); ++iN )
dumpCmd(SMESH_Comment("mesh.AddEdge([ ") <<le->_nodes[iN-1]->GetID()
<< ", " << le->_nodes[iN]->GetID() <<"])");
dumpFunctionEnd();
dumpFunction( SMESH_Comment("makeNormals") << i );
- for ( size_t j = 0 ; j < _sdVec[i]._edges.size(); ++j )
+ for ( n2e = _sdVec[i]._n2eMap.begin(); n2e != _sdVec[i]._n2eMap.end(); ++n2e )
{
- _LayerEdge& edge = *_sdVec[i]._edges[j];
- SMESH_TNodeXYZ nXYZ( edge._nodes[0] );
- nXYZ += edge._normal * _sdVec[i]._stepSize;
- dumpCmd(SMESH_Comment("mesh.AddEdge([ ") <<edge._nodes[0]->GetID()
+ _LayerEdge* edge = n2e->second;
+ SMESH_TNodeXYZ nXYZ( edge->_nodes[0] );
+ nXYZ += edge->_normal * _sdVec[i]._stepSize;
+ dumpCmd(SMESH_Comment("mesh.AddEdge([ ") << edge->_nodes[0]->GetID()
<< ", mesh.AddNode( " << nXYZ.X()<<","<< nXYZ.Y()<<","<< nXYZ.Z()<<")])");
}
dumpFunctionEnd();
dumpFunction( SMESH_Comment("makeTmpFaces_") << i );
+ dumpCmd( "faceId1 = mesh.NbElements()" );
TopExp_Explorer fExp( _sdVec[i]._solid, TopAbs_FACE );
for ( ; fExp.More(); fExp.Next() )
{
if (const SMESHDS_SubMesh* sm = _sdVec[i]._proxyMesh->GetProxySubMesh( fExp.Current()))
{
+ if ( sm->NbElements() == 0 ) continue;
SMDS_ElemIteratorPtr fIt = sm->GetElements();
while ( fIt->more())
{
}
}
}
+ dumpCmd( "faceId2 = mesh.NbElements()" );
+ dumpCmd( SMESH_Comment( "mesh.MakeGroup( 'tmpFaces_" ) << i << "',"
+ << "SMESH.FACE, SMESH.FT_RangeOfIds,'=',"
+ << "'%s-%s' % (faceId1+1, faceId2))");
dumpFunctionEnd();
}
#endif
( SMESH_MeshAlgos::GetElementSearcher( *getMeshDS(),
data._proxyMesh->GetFaces( data._solid )) );
- TNode2Edge::iterator n2e = data._n2eMap.begin(), n2eEnd = data._n2eMap.end();
- for ( ; n2e != n2eEnd; ++n2e )
+ for ( size_t iS = 0; iS < data._edgesOnShape.size(); ++iS )
{
- _LayerEdge* edge = n2e->second;
- if ( edge->IsOnEdge() ) continue;
- edge->FindIntersection( *searcher, intersecDist, data._epsilon );
- if ( data._geomSize > intersecDist && intersecDist > 0 )
- data._geomSize = intersecDist;
+ _EdgesOnShape& eos = data._edgesOnShape[ iS ];
+ if ( eos._edges.empty() || eos.ShapeType() == TopAbs_EDGE )
+ continue;
+ for ( size_t i = 0; i < eos._edges.size(); ++i )
+ {
+ eos._edges[i]->FindIntersection( *searcher, intersecDist, data._epsilon, eos );
+ if ( data._geomSize > intersecDist && intersecDist > 0 )
+ data._geomSize = intersecDist;
+ }
}
}
debugMsg( "-- geomSize = " << data._geomSize << ", stepSize = " << data._stepSize );
+ const double safeFactor = ( 2*data._maxThickness < data._geomSize ) ? 1 : theThickToIntersection;
+
double avgThick = 0, curThick = 0, distToIntersection = Precision::Infinite();
int nbSteps = 0, nbRepeats = 0;
- int iBeg, iEnd, iS;
while ( avgThick < 0.99 )
{
// new target length
// Elongate _LayerEdge's
dumpFunction(SMESH_Comment("inflate")<<data._index<<"_step"<<nbSteps); // debug
- for ( iBeg = 0, iS = 0; iS < data._endEdgeOnShape.size(); ++iS )
+ for ( size_t iS = 0; iS < data._edgesOnShape.size(); ++iS )
{
- const double shapeCurThick = Min( curThick, data._hypOnShape[ iS ].GetTotalThickness() );
- for ( iEnd = data._endEdgeOnShape[ iS ]; iBeg < iEnd; ++iBeg )
+ _EdgesOnShape& eos = data._edgesOnShape[iS];
+ if ( eos._edges.empty() ) continue;
+
+ const double shapeCurThick = Min( curThick, eos._hyp.GetTotalThickness() );
+ for ( size_t i = 0; i < eos._edges.size(); ++i )
{
- data._edges[iBeg]->SetNewLength( shapeCurThick, helper );
+ eos._edges[i]->SetNewLength( shapeCurThick, eos, helper );
}
}
dumpFunctionEnd();
{
if ( nbSteps > 0 )
{
+#ifdef __NOT_INVALIDATE_BAD_SMOOTH
+ debugMsg("NOT INVALIDATED STEP!");
+ return error("Smoothing failed", data._index);
+#endif
dumpFunction(SMESH_Comment("invalidate")<<data._index<<"_step"<<nbSteps); // debug
- for ( size_t i = 0; i < data._edges.size(); ++i )
+ for ( size_t iS = 0; iS < data._edgesOnShape.size(); ++iS )
{
- data._edges[i]->InvalidateStep( nbSteps+1 );
+ _EdgesOnShape& eos = data._edgesOnShape[iS];
+ for ( size_t i = 0; i < eos._edges.size(); ++i )
+ eos._edges[i]->InvalidateStep( nbSteps+1, eos );
}
dumpFunctionEnd();
}
// Evaluate achieved thickness
avgThick = 0;
- for ( iBeg = 0, iS = 0; iS < data._endEdgeOnShape.size(); ++iS )
+ for ( size_t iS = 0; iS < data._edgesOnShape.size(); ++iS )
{
- const double shapeTgtThick = data._hypOnShape[ iS ].GetTotalThickness();
- for ( iEnd = data._endEdgeOnShape[ iS ]; iBeg < iEnd; ++iBeg )
+ _EdgesOnShape& eos = data._edgesOnShape[iS];
+ if ( eos._edges.empty() ) continue;
+
+ const double shapeTgtThick = eos._hyp.GetTotalThickness();
+ for ( size_t i = 0; i < eos._edges.size(); ++i )
{
- avgThick += Min( 1., data._edges[iBeg]->_len / shapeTgtThick );
+ avgThick += Min( 1., eos._edges[i]->_len / shapeTgtThick );
}
}
- avgThick /= data._edges.size();
+ avgThick /= data._n2eMap.size();
debugMsg( "-- Thickness " << curThick << " ("<< avgThick*100 << "%) reached" );
- if ( distToIntersection < tgtThick*avgThick*1.5 )
+ if ( distToIntersection < tgtThick * avgThick * safeFactor && avgThick < 0.9 )
{
debugMsg( "-- Stop inflation since "
<< " distToIntersection( "<<distToIntersection<<" ) < avgThick( "
- << tgtThick*avgThick << " ) * 1.5" );
+ << tgtThick * avgThick << " ) * " << safeFactor );
break;
}
// new step size
return error("failed at the very first inflation step", data._index);
if ( avgThick < 0.99 )
- if ( SMESH_subMesh* sm = _mesh->GetSubMeshContaining( data._index ))
+ {
+ if ( !data._proxyMesh->_warning || data._proxyMesh->_warning->IsOK() )
{
- SMESH_ComputeErrorPtr& smError = sm->GetComputeError();
- if ( !smError || smError->IsOK() )
- smError.reset
- ( new SMESH_ComputeError (COMPERR_WARNING,
- SMESH_Comment("Thickness ") << tgtThick <<
- " of viscous layers not reached,"
- " average reached thickness is " << avgThick*tgtThick));
+ data._proxyMesh->_warning.reset
+ ( new SMESH_ComputeError (COMPERR_WARNING,
+ SMESH_Comment("Thickness ") << tgtThick <<
+ " of viscous layers not reached,"
+ " average reached thickness is " << avgThick*tgtThick));
}
-
+ }
// Restore position of src nodes moved by infaltion on _noShrinkShapes
dumpFunction(SMESH_Comment("restoNoShrink_So")<<data._index); // debug
- for ( iEnd = iS = 0; iS < data._endEdgeOnShape.size(); ++iS )
+ for ( size_t iS = 0; iS < data._edgesOnShape.size(); ++iS )
{
- iBeg = iEnd;
- iEnd = data._endEdgeOnShape[ iS ];
- if ( data._edges[ iBeg ]->_nodes.size() == 1 )
- for ( ; iBeg < iEnd; ++iBeg )
+ _EdgesOnShape& eos = data._edgesOnShape[iS];
+ if ( !eos._edges.empty() && eos._edges[0]->_nodes.size() == 1 )
+ for ( size_t i = 0; i < eos._edges.size(); ++i )
{
- restoreNoShrink( *data._edges[ iBeg ] );
+ restoreNoShrink( *eos._edges[ i ] );
}
}
dumpFunctionEnd();
return true; // no shapes needing smoothing
bool moved, improved;
+ vector< _LayerEdge* > badSmooEdges;
SMESH_MesherHelper helper(*_mesh);
Handle(Geom_Surface) surface;
TopoDS_Face F;
- int iBeg, iEnd = 0;
- for ( int iS = 0; iS < data._nbShapesToSmooth; ++iS )
+ for ( int isFace = 0; isFace < 2; ++isFace ) // smooth on [ EDGEs, FACEs ]
{
- iBeg = iEnd;
- iEnd = data._endEdgeOnShape[ iS ];
-
- // bool toSmooth = false;
- // for ( int i = iBeg; i < iEnd; ++i )
- // toSmooth = data._edges[ iBeg ]->NbSteps() >= nbSteps+1;
- // if ( !toSmooth )
- // {
- // if ( iS+1 == data._nbShapesToSmooth )
- // data._nbShapesToSmooth--;
- // continue; // target length reached some steps before
- // }
+ const TopAbs_ShapeEnum shapeType = isFace ? TopAbs_FACE : TopAbs_EDGE;
- if ( !data._edges[ iBeg ]->_sWOL.IsNull() &&
- data._edges[ iBeg ]->_sWOL.ShapeType() == TopAbs_FACE )
+ for ( int iS = 0; iS < data._edgesOnShape.size(); ++iS )
{
- if ( !F.IsSame( data._edges[ iBeg ]->_sWOL )) {
- F = TopoDS::Face( data._edges[ iBeg ]->_sWOL );
- helper.SetSubShape( F );
- surface = BRep_Tool::Surface( F );
- }
- }
- else
- {
- F.Nullify(); surface.Nullify();
- }
- TGeomID sInd = data._edges[ iBeg ]->_nodes[0]->getshapeId();
+ _EdgesOnShape& eos = data._edgesOnShape[ iS ];
+ if ( !eos._toSmooth ||
+ eos.ShapeType() != shapeType ||
+ eos._edges.empty() )
+ continue;
- if ( data._edges[ iBeg ]->IsOnEdge() )
- {
- dumpFunction(SMESH_Comment("smooth")<<data._index << "_Ed"<<sInd <<"_InfStep"<<nbSteps);
+ // already smoothed?
+ bool toSmooth = ( eos._edges[ 0 ]->NbSteps() >= nbSteps+1 );
+ if ( !toSmooth ) continue;
- // try a simple solution on an analytic EDGE
- if ( !smoothAnalyticEdge( data, iBeg, iEnd, surface, F, helper ))
+ if ( !eos._hyp.ToSmooth() )
{
- // smooth on EDGE's
- int step = 0;
- do {
- moved = false;
- for ( int i = iBeg; i < iEnd; ++i )
- {
- moved |= data._edges[i]->SmoothOnEdge(surface, F, helper);
- }
- dumpCmd( SMESH_Comment("# end step ")<<step);
+ // smooth disabled by the user; check validy only
+ if ( !isFace ) continue;
+ double vol;
+ for ( size_t i = 0; i < eos._edges.size(); ++i )
+ {
+ _LayerEdge* edge = eos._edges[i];
+ const gp_XYZ& curPos ( );
+ for ( size_t iF = 0; iF < edge->_simplices.size(); ++iF )
+ if ( !edge->_simplices[iF].IsForward( edge->_nodes[0],
+ &edge->_pos.back(), vol ))
+ return false;
}
- while ( moved && step++ < 5 );
+ continue; // goto to the next EDGE or FACE
}
- dumpFunctionEnd();
- }
- else
- {
- // smooth on FACE's
- int step = 0, stepLimit = 5, badNb = 0; moved = true;
- while (( ++step <= stepLimit && moved ) || improved )
+
+ // prepare data
+ if ( eos.SWOLType() == TopAbs_FACE )
{
- dumpFunction(SMESH_Comment("smooth")<<data._index<<"_Fa"<<sInd
- <<"_InfStep"<<nbSteps<<"_"<<step); // debug
- int oldBadNb = badNb;
- badNb = 0;
- moved = false;
- if ( step % 2 )
- for ( int i = iBeg; i < iEnd; ++i ) // iterate forward
- moved |= data._edges[i]->Smooth(badNb);
- else
- for ( int i = iEnd-1; i >= iBeg; --i ) // iterate backward
- moved |= data._edges[i]->Smooth(badNb);
- improved = ( badNb < oldBadNb );
+ if ( !F.IsSame( eos._sWOL )) {
+ F = TopoDS::Face( eos._sWOL );
+ helper.SetSubShape( F );
+ surface = BRep_Tool::Surface( F );
+ }
+ }
+ else
+ {
+ F.Nullify(); surface.Nullify();
+ }
+ const TGeomID sInd = eos._shapeID;
- // issue 22576 -- no bad faces but still there are intersections to fix
- if ( improved && badNb == 0 )
- stepLimit = step + 3;
+ // perform smoothing
+ if ( eos.ShapeType() == TopAbs_EDGE )
+ {
+ dumpFunction(SMESH_Comment("smooth")<<data._index << "_Ed"<<sInd <<"_InfStep"<<nbSteps);
+
+ // try a simple solution on an analytic EDGE
+ if ( !smoothAnalyticEdge( data, eos, surface, F, helper ))
+ {
+ // smooth on EDGE's
+ int step = 0;
+ do {
+ moved = false;
+ for ( size_t i = 0; i < eos._edges.size(); ++i )
+ {
+ moved |= eos._edges[i]->SmoothOnEdge( surface, F, helper );
+ }
+ dumpCmd( SMESH_Comment("# end step ")<<step);
+ }
+ while ( moved && step++ < 5 );
+ }
dumpFunctionEnd();
}
- if ( badNb > 0 )
+ else
{
-#ifdef __myDEBUG
- for ( int i = iBeg; i < iEnd; ++i )
+ // smooth on FACE's
+
+ const bool isConcaveFace = data._concaveFaces.count( sInd );
+
+ int step = 0, stepLimit = 5, badNb = 0;
+ while (( ++step <= stepLimit ) || improved )
{
- _LayerEdge* edge = data._edges[i];
- SMESH_TNodeXYZ tgtXYZ( edge->_nodes.back() );
- for ( size_t j = 0; j < edge->_simplices.size(); ++j )
- if ( !edge->_simplices[j].IsForward( edge->_nodes[0], &tgtXYZ ))
+ dumpFunction(SMESH_Comment("smooth")<<data._index<<"_Fa"<<sInd
+ <<"_InfStep"<<nbSteps<<"_"<<step); // debug
+ int oldBadNb = badNb;
+ badSmooEdges.clear();
+
+ if ( step % 2 ) {
+ for ( size_t i = 0; i < eos._edges.size(); ++i ) // iterate forward
+ if ( eos._edges[i]->Smooth( step, isConcaveFace, false ))
+ badSmooEdges.push_back( eos._edges[i] );
+ }
+
+ else {
+ for ( int i = eos._edges.size()-1; i >= 0; --i ) // iterate backward
+ if ( eos._edges[i]->Smooth( step, isConcaveFace, false ))
+ badSmooEdges.push_back( eos._edges[i] );
+ }
+ badNb = badSmooEdges.size();
+ improved = ( badNb < oldBadNb );
+
+ if ( !badSmooEdges.empty() && step >= stepLimit / 2 )
+ {
+ // look for the best smooth of _LayerEdge's neighboring badSmooEdges
+ vector<_Simplex> simplices;
+ for ( size_t i = 0; i < badSmooEdges.size(); ++i )
{
- cout << "Bad simplex ( " << edge->_nodes[0]->GetID()<< " "<< tgtXYZ._node->GetID()
- << " "<< edge->_simplices[j]._nPrev->GetID()
- << " "<< edge->_simplices[j]._nNext->GetID() << " )" << endl;
- return false;
+ _LayerEdge* ledge = badSmooEdges[i];
+ _Simplex::GetSimplices( ledge->_nodes[0], simplices, data._ignoreFaceIds );
+ for ( size_t iS = 0; iS < simplices.size(); ++iS )
+ {
+ TNode2Edge::iterator n2e = data._n2eMap.find( simplices[iS]._nNext );
+ if ( n2e != data._n2eMap.end()) {
+ _LayerEdge* ledge2 = n2e->second;
+ if ( ledge2->_nodes[0]->getshapeId() == sInd )
+ ledge2->Smooth( step, isConcaveFace, /*findBest=*/true );
+ }
+ }
}
+ }
+ // issue 22576 -- no bad faces but still there are intersections to fix
+ // if ( improved && badNb == 0 )
+ // stepLimit = step + 3;
+
+ dumpFunctionEnd();
}
+ if ( badNb > 0 )
+ {
+#ifdef __myDEBUG
+ double vol = 0;
+ for ( int i = 0; i < eos._edges.size(); ++i )
+ {
+ _LayerEdge* edge = eos._edges[i];
+ SMESH_TNodeXYZ tgtXYZ( edge->_nodes.back() );
+ for ( size_t j = 0; j < edge->_simplices.size(); ++j )
+ if ( !edge->_simplices[j].IsForward( edge->_nodes[0], &tgtXYZ, vol ))
+ {
+ cout << "Bad simplex ( " << edge->_nodes[0]->GetID()<< " "<< tgtXYZ._node->GetID()
+ << " "<< edge->_simplices[j]._nPrev->GetID()
+ << " "<< edge->_simplices[j]._nNext->GetID() << " )" << endl;
+ return false;
+ }
+ }
#endif
- return false;
- }
- }
- } // loop on shapes to smooth
+ return false;
+ }
+ } // // smooth on FACE's
+ } // loop on shapes
+ } // smooth on [ EDGEs, FACEs ]
// Check orientation of simplices of _ConvexFace::_simplexTestEdges
map< TGeomID, _ConvexFace >::iterator id2face = data._convexFaces.begin();
double dist;
const SMDS_MeshElement* intFace = 0;
const SMDS_MeshElement* closestFace = 0;
- int iLE = 0;
- for ( size_t i = 0; i < data._edges.size(); ++i )
+ _LayerEdge* le = 0;
+ for ( int iS = 0; iS < data._edgesOnShape.size(); ++iS )
{
- if ( !data._edges[i]->_sWOL.IsNull() )
+ _EdgesOnShape& eos = data._edgesOnShape[ iS ];
+ if ( eos._edges.empty() || !eos._sWOL.IsNull() )
continue;
- if ( data._edges[i]->FindIntersection( *searcher, dist, data._epsilon, &intFace ))
- return false;
- if ( distToIntersection > dist )
+ for ( size_t i = 0; i < eos._edges.size(); ++i )
{
- // ignore intersection of a _LayerEdge based on a _ConvexFace with a face
- // lying on this _ConvexFace
- if ( _ConvexFace* convFace = data.GetConvexFace( intFace->getshapeId() ))
- if ( convFace->_subIdToEdgeEnd.count ( data._edges[i]->_nodes[0]->getshapeId() ))
+ if ( eos._edges[i]->FindIntersection( *searcher, dist, data._epsilon, eos, &intFace ))
+ return false;
+ if ( distToIntersection > dist )
+ {
+ // ignore intersection of a _LayerEdge based on a _ConvexFace with a face
+ // lying on this _ConvexFace
+ if ( _ConvexFace* convFace = data.GetConvexFace( intFace->getshapeId() ))
+ if ( convFace->_subIdToEOS.count ( eos._shapeID ))
+ continue;
+
+ // ignore intersection of a _LayerEdge based on a FACE with an element on this FACE
+ // ( avoid limiting the thickness on the case of issue 22576)
+ if ( intFace->getshapeId() == eos._shapeID )
continue;
- distToIntersection = dist;
- iLE = i;
- closestFace = intFace;
+ distToIntersection = dist;
+ le = eos._edges[i];
+ closestFace = intFace;
+ }
}
}
#ifdef __myDEBUG
if ( closestFace )
{
SMDS_MeshElement::iterator nIt = closestFace->begin_nodes();
- cout << "Shortest distance: _LayerEdge nodes: tgt " << data._edges[iLE]->_nodes.back()->GetID()
- << " src " << data._edges[iLE]->_nodes[0]->GetID()<< ", intersection with face ("
+ cout << "Shortest distance: _LayerEdge nodes: tgt " << le->_nodes.back()->GetID()
+ << " src " << le->_nodes[0]->GetID()<< ", intersection with face ("
<< (*nIt++)->GetID()<<" "<< (*nIt++)->GetID()<<" "<< (*nIt++)->GetID()
<< ") distance = " << distToIntersection<< endl;
}
//================================================================================
Handle(Geom_Curve) _SolidData::CurveForSmooth( const TopoDS_Edge& E,
- const int iFrom,
- const int iTo,
- Handle(Geom_Surface)& surface,
- const TopoDS_Face& F,
+ _EdgesOnShape& eos,
SMESH_MesherHelper& helper)
{
- TGeomID eIndex = helper.GetMeshDS()->ShapeToIndex( E );
+ const TGeomID eIndex = eos._shapeID;
map< TGeomID, Handle(Geom_Curve)>::iterator i2curve = _edge2curve.find( eIndex );
if ( i2curve == _edge2curve.end() )
{
// sort _LayerEdge's by position on the EDGE
- SortOnEdge( E, iFrom, iTo, helper );
+ SortOnEdge( E, eos._edges, helper );
- SMESHDS_SubMesh* smDS = helper.GetMeshDS()->MeshElements( eIndex );
+ SMESHDS_SubMesh* smDS = eos._subMesh->GetSubMeshDS();
TopLoc_Location loc; double f,l;
Handle(Geom_Line) line;
Handle(Geom_Circle) circle;
bool isLine, isCirc;
- if ( F.IsNull() ) // 3D case
+ if ( eos._sWOL.IsNull() ) /////////////////////////////////////////// 3D case
{
// check if the EDGE is a line
Handle(Geom_Curve) curve = BRep_Tool::Curve( E, loc, f, l);
if ( !isLine && !isCirc ) // Check if the EDGE is close to a line
{
- Bnd_B3d bndBox;
- SMDS_NodeIteratorPtr nIt = smDS->GetNodes();
- while ( nIt->more() )
- bndBox.Add( SMESH_TNodeXYZ( nIt->next() ));
- gp_XYZ size = bndBox.CornerMax() - bndBox.CornerMin();
+ // Bnd_B3d bndBox;
+ // SMDS_NodeIteratorPtr nIt = smDS->GetNodes();
+ // while ( nIt->more() )
+ // bndBox.Add( SMESH_TNodeXYZ( nIt->next() ));
+ // gp_XYZ size = bndBox.CornerMax() - bndBox.CornerMin();
+
+ // gp_Pnt p0, p1;
+ // if ( eos._edges.size() > 1 ) {
+ // p0 = SMESH_TNodeXYZ( eos._edges[0]->_nodes[0] );
+ // p1 = SMESH_TNodeXYZ( eos._edges[1]->_nodes[0] );
+ // }
+ // else {
+ // p0 = curve->Value( f );
+ // p1 = curve->Value( l );
+ // }
+ // const double lineTol = 1e-2 * p0.Distance( p1 );
+ // for ( int i = 0; i < 3 && !isLine; ++i )
+ // isLine = ( size.Coord( i+1 ) <= lineTol ); ////////// <--- WRONG
- SMESH_TNodeXYZ p0( _edges[iFrom]->_2neibors->tgtNode(0) );
- SMESH_TNodeXYZ p1( _edges[iFrom]->_2neibors->tgtNode(1) );
- const double lineTol = 1e-2 * ( p0 - p1 ).Modulus();
- for ( int i = 0; i < 3 && !isLine; ++i )
- isLine = ( size.Coord( i+1 ) <= lineTol );
+ isLine = SMESH_Algo::IsStraight( E );
+
+ if ( isLine )
+ line = new Geom_Line( gp::OX() ); // only type does matter
}
- if ( !isLine && !isCirc && iTo-iFrom > 2) // Check if the EDGE is close to a circle
+ if ( !isLine && !isCirc && eos._edges.size() > 2) // Check if the EDGE is close to a circle
{
// TODO
}
}
- else // 2D case
+ else //////////////////////////////////////////////////////////////////////// 2D case
{
+ const TopoDS_Face& F = TopoDS::Face( eos._sWOL );
+
// check if the EDGE is a line
Handle(Geom2d_Curve) curve = BRep_Tool::CurveOnSurface( E, F, f, l);
if ( curve->IsKind( STANDARD_TYPE( Geom2d_TrimmedCurve )))
for ( int i = 0; i < 2 && !isLine; ++i )
isLine = ( size.Coord( i+1 ) <= lineTol );
}
- if ( !isLine && !isCirc && iTo-iFrom > 2) // Check if the EDGE is close to a circle
+ if ( !isLine && !isCirc && eos._edges.size() > 2) // Check if the EDGE is close to a circle
{
// TODO
}
*/
//================================================================================
-void _SolidData::SortOnEdge( const TopoDS_Edge& E,
- const int iFrom,
- const int iTo,
- SMESH_MesherHelper& helper)
+void _SolidData::SortOnEdge( const TopoDS_Edge& E,
+ vector< _LayerEdge* >& edges,
+ SMESH_MesherHelper& helper)
{
map< double, _LayerEdge* > u2edge;
- for ( int i = iFrom; i < iTo; ++i )
- u2edge.insert( make_pair( helper.GetNodeU( E, _edges[i]->_nodes[0] ), _edges[i] ));
+ for ( size_t i = 0; i < edges.size(); ++i )
+ u2edge.insert( make_pair( helper.GetNodeU( E, edges[i]->_nodes[0] ), edges[i] ));
- ASSERT( u2edge.size() == iTo - iFrom );
+ ASSERT( u2edge.size() == edges.size() );
map< double, _LayerEdge* >::iterator u2e = u2edge.begin();
- for ( int i = iFrom; i < iTo; ++i, ++u2e )
- _edges[i] = u2e->second;
-
- // set _2neibors according to the new order
- for ( int i = iFrom; i < iTo-1; ++i )
- if ( _edges[i]->_2neibors->tgtNode(1) != _edges[i+1]->_nodes.back() )
- _edges[i]->_2neibors->reverse();
- if ( u2edge.size() > 1 &&
- _edges[iTo-1]->_2neibors->tgtNode(0) != _edges[iTo-2]->_nodes.back() )
- _edges[iTo-1]->_2neibors->reverse();
+ for ( int i = 0; i < edges.size(); ++i, ++u2e )
+ edges[i] = u2e->second;
+
+ Sort2NeiborsOnEdge( edges );
}
//================================================================================
/*!
- * \brief Return index corresponding to the shape in _endEdgeOnShape
+ * \brief Set _2neibors according to the order of _LayerEdge on EDGE
*/
//================================================================================
-bool _SolidData::GetShapeEdges(const TGeomID shapeID,
- size_t & iEdgesEnd,
- int* iBeg,
- int* iEnd ) const
+void _SolidData::Sort2NeiborsOnEdge( vector< _LayerEdge* >& edges )
{
- int beg = 0, end = 0;
- for ( iEdgesEnd = 0; iEdgesEnd < _endEdgeOnShape.size(); ++iEdgesEnd )
- {
- end = _endEdgeOnShape[ iEdgesEnd ];
- TGeomID sID = _edges[ beg ]->_nodes[0]->getshapeId();
- if ( sID == shapeID )
- {
- if ( iBeg ) *iBeg = beg;
- if ( iEnd ) *iEnd = end;
- return true;
- }
- beg = end;
- }
- return false;
+ for ( size_t i = 0; i < edges.size()-1; ++i )
+ if ( edges[i]->_2neibors->tgtNode(1) != edges[i+1]->_nodes.back() )
+ edges[i]->_2neibors->reverse();
+
+ const size_t iLast = edges.size() - 1;
+ if ( edges.size() > 1 &&
+ edges[iLast]->_2neibors->tgtNode(0) != edges[iLast-1]->_nodes.back() )
+ edges[iLast]->_2neibors->reverse();
}
//================================================================================
/*!
- * \brief Add faces for smoothing
+ * \brief Return _EdgesOnShape* corresponding to the shape
*/
//================================================================================
-void _SolidData::AddShapesToSmooth( const set< TGeomID >& faceIDs )
+_EdgesOnShape* _SolidData::GetShapeEdges(const TGeomID shapeID )
{
- // convert faceIDs to indices in _endEdgeOnShape
- set< size_t > iEnds;
- size_t end;
- set< TGeomID >::const_iterator fId = faceIDs.begin();
- for ( ; fId != faceIDs.end(); ++fId )
- if ( GetShapeEdges( *fId, end ) && end >= _nbShapesToSmooth )
- iEnds.insert( end );
+ if ( shapeID < _edgesOnShape.size() &&
+ _edgesOnShape[ shapeID ]._shapeID == shapeID )
+ return & _edgesOnShape[ shapeID ];
- set< size_t >::iterator endsIt = iEnds.begin();
+ for ( size_t i = 0; i < _edgesOnShape.size(); ++i )
+ if ( _edgesOnShape[i]._shapeID == shapeID )
+ return & _edgesOnShape[i];
- // "add" by move of _nbShapesToSmooth
- int nbFacesToAdd = iEnds.size();
- while ( endsIt != iEnds.end() && *endsIt == _nbShapesToSmooth )
- {
- ++endsIt;
- ++_nbShapesToSmooth;
- --nbFacesToAdd;
- }
- if ( endsIt == iEnds.end() )
- return;
+ return 0;
+}
+
+//================================================================================
+/*!
+ * \brief Return _EdgesOnShape* corresponding to the shape
+ */
+//================================================================================
+
+_EdgesOnShape* _SolidData::GetShapeEdges(const TopoDS_Shape& shape )
+{
+ SMESHDS_Mesh* meshDS = _proxyMesh->GetMesh()->GetMeshDS();
+ return GetShapeEdges( meshDS->ShapeToIndex( shape ));
+}
+
+//================================================================================
+/*!
+ * \brief Prepare data of the _LayerEdge for smoothing on FACE
+ */
+//================================================================================
+
+void _SolidData::PrepareEdgesToSmoothOnFace( _EdgesOnShape* eof, bool substituteSrcNodes )
+{
+ set< TGeomID > vertices;
+ SMESH_MesherHelper helper( *_proxyMesh->GetMesh() );
+ if ( isConcave( TopoDS::Face( eof->_shape ), helper, &vertices ))
+ _concaveFaces.insert( eof->_shapeID );
- // Move _LayerEdge's on FACEs just after _nbShapesToSmooth
+ for ( size_t i = 0; i < eof->_edges.size(); ++i )
+ eof->_edges[i]->_smooFunction = 0;
- vector< _LayerEdge* > nonSmoothLE, smoothLE;
- size_t lastSmooth = *iEnds.rbegin();
- int iBeg, iEnd;
- for ( size_t i = _nbShapesToSmooth; i <= lastSmooth; ++i )
+ for ( size_t i = 0; i < eof->_edges.size(); ++i )
{
- vector< _LayerEdge* > & edgesVec = iEnds.count(i) ? smoothLE : nonSmoothLE;
- iBeg = i ? _endEdgeOnShape[ i-1 ] : 0;
- iEnd = _endEdgeOnShape[ i ];
- edgesVec.insert( edgesVec.end(), _edges.begin() + iBeg, _edges.begin() + iEnd );
+ _LayerEdge* edge = eof->_edges[i];
+ _Simplex::GetSimplices
+ ( edge->_nodes[0], edge->_simplices, _ignoreFaceIds, this, /*sort=*/true );
+
+ edge->ChooseSmooFunction( vertices, _n2eMap );
+
+ double avgNormProj = 0, avgLen = 0;
+ for ( size_t i = 0; i < edge->_simplices.size(); ++i )
+ {
+ _Simplex& s = edge->_simplices[i];
+
+ gp_XYZ vec = edge->_pos.back() - SMESH_TNodeXYZ( s._nPrev );
+ avgNormProj += edge->_normal * vec;
+ avgLen += vec.Modulus();
+ if ( substituteSrcNodes )
+ {
+ s._nNext = _n2eMap[ s._nNext ]->_nodes.back();
+ s._nPrev = _n2eMap[ s._nPrev ]->_nodes.back();
+ }
+ }
+ avgNormProj /= edge->_simplices.size();
+ avgLen /= edge->_simplices.size();
+ edge->_curvature = _Curvature::New( avgNormProj, avgLen );
}
+}
- iBeg = _nbShapesToSmooth ? _endEdgeOnShape[ _nbShapesToSmooth-1 ] : 0;
- std::copy( smoothLE.begin(), smoothLE.end(), &_edges[ iBeg ] );
- std::copy( nonSmoothLE.begin(), nonSmoothLE.end(), &_edges[ iBeg + smoothLE.size()]);
+//================================================================================
+/*!
+ * \brief Add faces for smoothing
+ */
+//================================================================================
- // update _endEdgeOnShape
- for ( size_t i = _nbShapesToSmooth; i < _endEdgeOnShape.size(); ++i )
+void _SolidData::AddShapesToSmooth( const set< _EdgesOnShape* >& eosSet )
+{
+ set< _EdgesOnShape * >::const_iterator eos = eosSet.begin();
+ for ( ; eos != eosSet.end(); ++eos )
{
- TGeomID curShape = _edges[ iBeg ]->_nodes[0]->getshapeId();
- while ( ++iBeg < _edges.size() &&
- curShape == _edges[ iBeg ]->_nodes[0]->getshapeId() );
+ if ( !*eos || (*eos)->_toSmooth ) continue;
- _endEdgeOnShape[ i ] = iBeg;
- }
+ (*eos)->_toSmooth = true;
- _nbShapesToSmooth += nbFacesToAdd;
+ if ( (*eos)->ShapeType() == TopAbs_FACE )
+ {
+ PrepareEdgesToSmoothOnFace( *eos, /*substituteSrcNodes=*/true );
+ }
+ }
}
//================================================================================
//================================================================================
bool _ViscousBuilder::smoothAnalyticEdge( _SolidData& data,
- const int iFrom,
- const int iTo,
+ _EdgesOnShape& eos,
Handle(Geom_Surface)& surface,
const TopoDS_Face& F,
SMESH_MesherHelper& helper)
{
- TopoDS_Shape S = helper.GetSubShapeByNode( data._edges[ iFrom ]->_nodes[0],
- helper.GetMeshDS());
- TopoDS_Edge E = TopoDS::Edge( S );
+ const TopoDS_Edge& E = TopoDS::Edge( eos._shape );
- Handle(Geom_Curve) curve = data.CurveForSmooth( E, iFrom, iTo, surface, F, helper );
+ Handle(Geom_Curve) curve = data.CurveForSmooth( E, eos, helper );
if ( curve.IsNull() ) return false;
+ const size_t iFrom = 0, iTo = eos._edges.size();
+
// compute a relative length of segments
vector< double > len( iTo-iFrom+1 );
{
double curLen, prevLen = len[0] = 1.0;
for ( int i = iFrom; i < iTo; ++i )
{
- curLen = prevLen * data._edges[i]->_2neibors->_wgt[0] / data._edges[i]->_2neibors->_wgt[1];
+ curLen = prevLen * eos._edges[i]->_2neibors->_wgt[0] / eos._edges[i]->_2neibors->_wgt[1];
len[i-iFrom+1] = len[i-iFrom] + curLen;
prevLen = curLen;
}
{
if ( F.IsNull() ) // 3D
{
- SMESH_TNodeXYZ p0( data._edges[iFrom]->_2neibors->tgtNode(0));
- SMESH_TNodeXYZ p1( data._edges[iTo-1]->_2neibors->tgtNode(1));
+ SMESH_TNodeXYZ p0( eos._edges[iFrom]->_2neibors->tgtNode(0));
+ SMESH_TNodeXYZ p1( eos._edges[iTo-1]->_2neibors->tgtNode(1));
for ( int i = iFrom; i < iTo; ++i )
{
double r = len[i-iFrom] / len.back();
gp_XYZ newPos = p0 * ( 1. - r ) + p1 * r;
- data._edges[i]->_pos.back() = newPos;
- SMDS_MeshNode* tgtNode = const_cast<SMDS_MeshNode*>( data._edges[i]->_nodes.back() );
+ eos._edges[i]->_pos.back() = newPos;
+ SMDS_MeshNode* tgtNode = const_cast<SMDS_MeshNode*>( eos._edges[i]->_nodes.back() );
tgtNode->setXYZ( newPos.X(), newPos.Y(), newPos.Z() );
dumpMove( tgtNode );
}
}
else
{
- // gp_XY uv0 = helper.GetNodeUV( F, data._edges[iFrom]->_2neibors->tgtNode(0));
- // gp_XY uv1 = helper.GetNodeUV( F, data._edges[iTo-1]->_2neibors->tgtNode(1));
- gp_XY uv0 = data._edges[iFrom]->_2neibors->_edges[0]->LastUV( F );
- gp_XY uv1 = data._edges[iTo-1]->_2neibors->_edges[1]->LastUV( F );
- if ( data._edges[iFrom]->_2neibors->tgtNode(0) ==
- data._edges[iTo-1]->_2neibors->tgtNode(1) ) // closed edge
+ // gp_XY uv0 = helper.GetNodeUV( F, eos._edges[iFrom]->_2neibors->tgtNode(0));
+ // gp_XY uv1 = helper.GetNodeUV( F, eos._edges[iTo-1]->_2neibors->tgtNode(1));
+ _LayerEdge* e0 = eos._edges[iFrom]->_2neibors->_edges[0];
+ _LayerEdge* e1 = eos._edges[iTo-1]->_2neibors->_edges[1];
+ gp_XY uv0 = e0->LastUV( F, *data.GetShapeEdges( e0 ));
+ gp_XY uv1 = e1->LastUV( F, *data.GetShapeEdges( e1 ));
+ if ( eos._edges[iFrom]->_2neibors->tgtNode(0) ==
+ eos._edges[iTo-1]->_2neibors->tgtNode(1) ) // closed edge
{
int iPeriodic = helper.GetPeriodicIndex();
if ( iPeriodic == 1 || iPeriodic == 2 )
{
double r = len[i-iFrom] / len.back();
gp_XY newUV = uv0 + r * rangeUV;
- data._edges[i]->_pos.back().SetCoord( newUV.X(), newUV.Y(), 0 );
+ eos._edges[i]->_pos.back().SetCoord( newUV.X(), newUV.Y(), 0 );
gp_Pnt newPos = surface->Value( newUV.X(), newUV.Y() );
- SMDS_MeshNode* tgtNode = const_cast<SMDS_MeshNode*>( data._edges[i]->_nodes.back() );
+ SMDS_MeshNode* tgtNode = const_cast<SMDS_MeshNode*>( eos._edges[i]->_nodes.back() );
tgtNode->setXYZ( newPos.X(), newPos.Y(), newPos.Z() );
dumpMove( tgtNode );
if ( F.IsNull() ) // 3D
{
- if ( data._edges[iFrom]->_2neibors->tgtNode(0) ==
- data._edges[iTo-1]->_2neibors->tgtNode(1) )
+ if ( eos._edges[iFrom]->_2neibors->tgtNode(0) ==
+ eos._edges[iTo-1]->_2neibors->tgtNode(1) )
return true; // closed EDGE - nothing to do
return false; // TODO ???
{
const gp_XY center( center3D.X(), center3D.Y() );
- gp_XY uv0 = data._edges[iFrom]->_2neibors->_edges[0]->LastUV( F );
- gp_XY uvM = data._edges[iFrom]->LastUV( F );
- gp_XY uv1 = data._edges[iTo-1]->_2neibors->_edges[1]->LastUV( F );
- // gp_XY uv0 = helper.GetNodeUV( F, data._edges[iFrom]->_2neibors->tgtNode(0));
- // gp_XY uvM = helper.GetNodeUV( F, data._edges[iFrom]->_nodes.back());
- // gp_XY uv1 = helper.GetNodeUV( F, data._edges[iTo-1]->_2neibors->tgtNode(1));
+ _LayerEdge* e0 = eos._edges[iFrom]->_2neibors->_edges[0];
+ _LayerEdge* eM = eos._edges[iFrom];
+ _LayerEdge* e1 = eos._edges[iTo-1]->_2neibors->_edges[1];
+ gp_XY uv0 = e0->LastUV( F, *data.GetShapeEdges( e0 ) );
+ gp_XY uvM = eM->LastUV( F, *data.GetShapeEdges( eM ) );
+ gp_XY uv1 = e1->LastUV( F, *data.GetShapeEdges( e1 ) );
gp_Vec2d vec0( center, uv0 );
gp_Vec2d vecM( center, uvM );
gp_Vec2d vec1( center, uv1 );
{
double newU = uLast * len[i-iFrom] / len.back();
gp_Pnt2d newUV = ElCLib::Value( newU, circ );
- data._edges[i]->_pos.back().SetCoord( newUV.X(), newUV.Y(), 0 );
+ eos._edges[i]->_pos.back().SetCoord( newUV.X(), newUV.Y(), 0 );
gp_Pnt newPos = surface->Value( newUV.X(), newUV.Y() );
- SMDS_MeshNode* tgtNode = const_cast<SMDS_MeshNode*>( data._edges[i]->_nodes.back() );
+ SMDS_MeshNode* tgtNode = const_cast<SMDS_MeshNode*>( eos._edges[i]->_nodes.back() );
tgtNode->setXYZ( newPos.X(), newPos.Y(), newPos.Z() );
dumpMove( tgtNode );
vector< const SMDS_MeshNode*> nodes(4); // of a tmp mesh face
dumpFunction(SMESH_Comment("makeTmpFacesOnEdges")<<data._index);
- for ( size_t i = 0; i < data._edges.size(); ++i )
+ for ( size_t iS = 0; iS < data._edgesOnShape.size(); ++iS )
{
- _LayerEdge* edge = data._edges[i];
- if ( !edge->IsOnEdge() || !edge->_sWOL.IsNull() ) continue;
- const SMDS_MeshNode* tgt1 = edge->_nodes.back();
- for ( int j = 0; j < 2; ++j ) // loop on _2NearEdges
+ _EdgesOnShape& eos = data._edgesOnShape[ iS ];
+ if ( eos.ShapeType() != TopAbs_EDGE || !eos._sWOL.IsNull() )
+ continue;
+ for ( size_t i = 0; i < eos._edges.size(); ++i )
{
- const SMDS_MeshNode* tgt2 = edge->_2neibors->tgtNode(j);
- pair< set< SMESH_TLink >::iterator, bool > link_isnew =
- extrudedLinks.insert( SMESH_TLink( tgt1, tgt2 ));
- if ( !link_isnew.second )
+ _LayerEdge* edge = eos._edges[i];
+ const SMDS_MeshNode* tgt1 = edge->_nodes.back();
+ for ( int j = 0; j < 2; ++j ) // loop on _2NearEdges
{
- extrudedLinks.erase( link_isnew.first );
- continue; // already extruded and will no more encounter
- }
- // a _LayerEdge containg tgt2
- _LayerEdge* neiborEdge = edge->_2neibors->_edges[j];
+ const SMDS_MeshNode* tgt2 = edge->_2neibors->tgtNode(j);
+ pair< set< SMESH_TLink >::iterator, bool > link_isnew =
+ extrudedLinks.insert( SMESH_TLink( tgt1, tgt2 ));
+ if ( !link_isnew.second )
+ {
+ extrudedLinks.erase( link_isnew.first );
+ continue; // already extruded and will no more encounter
+ }
+ // a _LayerEdge containg tgt2
+ _LayerEdge* neiborEdge = edge->_2neibors->_edges[j];
- _TmpMeshFaceOnEdge* f = new _TmpMeshFaceOnEdge( edge, neiborEdge, --_tmpFaceID );
- tmpFaces.push_back( f );
+ _TmpMeshFaceOnEdge* f = new _TmpMeshFaceOnEdge( edge, neiborEdge, --_tmpFaceID );
+ tmpFaces.push_back( f );
- dumpCmd(SMESH_Comment("mesh.AddFace([ ")
- <<f->_nn[0]->GetID()<<", "<<f->_nn[1]->GetID()<<", "
- <<f->_nn[2]->GetID()<<", "<<f->_nn[3]->GetID()<<" ])");
+ dumpCmd(SMESH_Comment("mesh.AddFace([ ")
+ <<f->_nn[0]->GetID()<<", "<<f->_nn[1]->GetID()<<", "
+ <<f->_nn[2]->GetID()<<", "<<f->_nn[3]->GetID()<<" ])");
+ }
}
}
dumpFunctionEnd();
TLEdge2LEdgeSet edge2CloseEdge;
const double eps = data._epsilon * data._epsilon;
- for ( size_t i = 0; i < data._edges.size(); ++i )
+ for ( size_t iS = 0; iS < data._edgesOnShape.size(); ++iS )
{
- _LayerEdge* edge = data._edges[i];
- if (( !edge->IsOnEdge() ) &&
- ( edge->_sWOL.IsNull() || edge->_sWOL.ShapeType() != TopAbs_FACE ))
+ _EdgesOnShape& eos = data._edgesOnShape[ iS ];
+ if (( eos.ShapeType() != TopAbs_EDGE ) &&
+ ( eos._sWOL.IsNull() || eos.SWOLType() != TopAbs_FACE ))
continue;
- if ( edge->FindIntersection( *searcher, dist, eps, &face ))
+ for ( size_t i = 0; i < eos._edges.size(); ++i )
{
- const _TmpMeshFaceOnEdge* f = (const _TmpMeshFaceOnEdge*) face;
- set< _LayerEdge*, _LayerEdgeCmp > & ee = edge2CloseEdge[ edge ];
- ee.insert( f->_le1 );
- ee.insert( f->_le2 );
- if ( f->_le1->IsOnEdge() && f->_le1->_sWOL.IsNull() )
- edge2CloseEdge[ f->_le1 ].insert( edge );
- if ( f->_le2->IsOnEdge() && f->_le2->_sWOL.IsNull() )
- edge2CloseEdge[ f->_le2 ].insert( edge );
+ _LayerEdge* edge = eos._edges[i];
+ if ( edge->FindIntersection( *searcher, dist, eps, eos, &face ))
+ {
+ const _TmpMeshFaceOnEdge* f = (const _TmpMeshFaceOnEdge*) face;
+ set< _LayerEdge*, _LayerEdgeCmp > & ee = edge2CloseEdge[ edge ];
+ ee.insert( f->_le1 );
+ ee.insert( f->_le2 );
+ if ( f->_le1->IsOnEdge() && data.GetShapeEdges( f->_le1 )->_sWOL.IsNull() )
+ edge2CloseEdge[ f->_le1 ].insert( edge );
+ if ( f->_le2->IsOnEdge() && data.GetShapeEdges( f->_le2 )->_sWOL.IsNull() )
+ edge2CloseEdge[ f->_le2 ].insert( edge );
+ }
}
}
{
dumpFunction(SMESH_Comment("updateNormals")<<data._index);
- set< TGeomID > shapesToSmooth;
+ set< _EdgesOnShape* > shapesToSmooth;
// vector to store new _normal and _cosin for each edge in edge2CloseEdge
vector< pair< _LayerEdge*, _LayerEdge > > edge2newEdge( edge2CloseEdge.size() );
edge2newEdge[ iE ].first = NULL;
+ _EdgesOnShape* eos1 = data.GetShapeEdges( edge1 );
+ if ( !eos1 ) continue;
+
// find EDGEs the edges reside
// TopoDS_Edge E1, E2;
// TopoDS_Shape S = helper.GetSubShapeByNode( edge1->_nodes[0], getMeshDS() );
set< _LayerEdge*, _LayerEdgeCmp >::iterator eIt = ee.begin();
for ( ; !edge2 && eIt != ee.end(); ++eIt )
{
- if ( edge1->_sWOL == (*eIt)->_sWOL )
+ if ( eos1->_sWOL == data.GetShapeEdges( *eIt )->_sWOL )
edge2 = *eIt;
}
if ( !edge2 ) continue;
if ( edge1->_cosin < theMinSmoothCosin &&
newEdge._cosin > theMinSmoothCosin )
{
- if ( edge1->_sWOL.IsNull() )
+ if ( eos1->_sWOL.IsNull() )
{
SMDS_ElemIteratorPtr fIt = edge1->_nodes[0]->GetInverseElementIterator(SMDSAbs_Face);
while ( fIt->more() )
- shapesToSmooth.insert( fIt->next()->getshapeId() );
+ shapesToSmooth.insert( data.GetShapeEdges( fIt->next()->getshapeId() ));
//limitStepSize( data, fIt->next(), edge1->_cosin ); // too late
}
else // edge1 inflates along a FACE
PShapeIteratorPtr eIt = helper.GetAncestors( V, *_mesh, TopAbs_EDGE );
while ( const TopoDS_Shape* E = eIt->next() )
{
- if ( !helper.IsSubShape( *E, /*FACE=*/edge1->_sWOL ))
+ if ( !helper.IsSubShape( *E, /*FACE=*/eos1->_sWOL ))
continue;
gp_Vec edgeDir = getEdgeDir( TopoDS::Edge( *E ), TopoDS::Vertex( V ));
double angle = edgeDir.Angle( newEdge._normal ); // [0,PI]
if ( angle < M_PI / 2 )
- shapesToSmooth.insert( getMeshDS()->ShapeToIndex( *E ));
+ shapesToSmooth.insert( data.GetShapeEdges( *E ));
}
}
}
_LayerEdge* edge1 = edge2newEdge[ iE ].first;
_LayerEdge& newEdge = edge2newEdge[ iE ].second;
if ( !edge1 ) continue;
+ _EdgesOnShape* eos1 = data.GetShapeEdges( edge1 );
+ if ( !eos1 ) continue;
edge1->_normal = newEdge._normal;
edge1->SetCosin( newEdge._cosin );
- edge1->InvalidateStep( 1 );
+ edge1->InvalidateStep( 1, *eos1 );
edge1->_len = 0;
- edge1->SetNewLength( data._stepSize, helper );
+ edge1->SetNewLength( data._stepSize, *eos1, helper );
if ( edge1->IsOnEdge() )
{
const SMDS_MeshNode * n1 = edge1->_2neibors->srcNode(0);
const SMDS_MeshNode * n2 = edge1->_2neibors->srcNode(1);
- edge1->SetDataByNeighbors( n1, n2, helper );
+ edge1->SetDataByNeighbors( n1, n2, *eos1, helper );
}
// Update normals and other dependent data of not intersecting _LayerEdge's
_LayerEdge* neighbor = edge1->_2neibors->_edges[j];
if ( edge2CloseEdge.count ( neighbor ))
continue; // j-th neighbor is also intersected
+ _EdgesOnShape* eos = data.GetShapeEdges( neighbor );
+ if ( !eos ) continue;
_LayerEdge* prevEdge = edge1;
const int nbSteps = 10;
for ( int step = nbSteps; step; --step ) // step from edge1 in j-th direction
neighbor->_normal = newNorm;
neighbor->SetCosin( prevEdge->_cosin * r + nextEdge->_cosin * (1-r) );
- neighbor->SetDataByNeighbors( prevEdge->_nodes[0], nextEdge->_nodes[0], helper );
+ neighbor->SetDataByNeighbors( prevEdge->_nodes[0], nextEdge->_nodes[0], *eos, helper );
- neighbor->InvalidateStep( 1 );
+ neighbor->InvalidateStep( 1, *eos );
neighbor->_len = 0;
- neighbor->SetNewLength( data._stepSize, helper );
+ neighbor->SetNewLength( data._stepSize, *eos, helper );
// goto the next neighbor
prevEdge = neighbor;
Bnd_B3d centersBox; // bbox of centers of curvature of _LayerEdge's on VERTEXes
Bnd_B3d nodesBox;
gp_Pnt center;
- int iBeg, iEnd;
- map< TGeomID, int >::iterator id2end = convFace._subIdToEdgeEnd.begin();
- for ( ; id2end != convFace._subIdToEdgeEnd.end(); ++id2end )
+ map< TGeomID, _EdgesOnShape* >::iterator id2eos = convFace._subIdToEOS.begin();
+ for ( ; id2eos != convFace._subIdToEOS.end(); ++id2eos )
{
- data.GetEdgesOnShape( id2end->second, iBeg, iEnd );
-
- if ( meshDS->IndexToShape( id2end->first ).ShapeType() == TopAbs_VERTEX )
+ _EdgesOnShape& eos = *(id2eos->second);
+ if ( eos.ShapeType() == TopAbs_VERTEX )
{
- _LayerEdge* ledge = data._edges[ iBeg ];
+ _LayerEdge* ledge = eos._edges[ 0 ];
if ( convFace.GetCenterOfCurvature( ledge, surfProp, helper, center ))
centersBox.Add( center );
}
- for ( ; iBeg < iEnd; ++iBeg )
- nodesBox.Add( SMESH_TNodeXYZ( data._edges[ iBeg ]->_nodes[0] ));
+ for ( size_t i = 0; i < eos._edges.size(); ++i )
+ nodesBox.Add( SMESH_TNodeXYZ( eos._edges[ i ]->_nodes[0] ));
}
if ( centersBox.IsVoid() )
{
gp_XYZ avgNormal( 0,0,0 );
nbEdges = 0;
- id2end = convFace._subIdToEdgeEnd.begin();
- for ( ; id2end != convFace._subIdToEdgeEnd.end(); ++id2end )
+ id2eos = convFace._subIdToEOS.begin();
+ for ( ; id2eos != convFace._subIdToEOS.end(); ++id2eos )
{
- data.GetEdgesOnShape( id2end->second, iBeg, iEnd );
+ _EdgesOnShape& eos = *(id2eos->second);
// set data of _CentralCurveOnEdge
- const TopoDS_Shape& S = meshDS->IndexToShape( id2end->first );
- if ( S.ShapeType() == TopAbs_EDGE )
+ if ( eos.ShapeType() == TopAbs_EDGE )
{
_CentralCurveOnEdge& ceCurve = centerCurves[ nbEdges++ ];
- ceCurve.SetShapes( TopoDS::Edge(S), convFace, data, helper );
- if ( !data._edges[ iBeg ]->_sWOL.IsNull() )
+ ceCurve.SetShapes( TopoDS::Edge( eos._shape ), convFace, data, helper );
+ if ( !eos._sWOL.IsNull() )
ceCurve._adjFace.Nullify();
else
ceCurve._ledges.insert( ceCurve._ledges.end(),
- &data._edges[ iBeg ], &data._edges[ iEnd ]);
+ eos._edges.begin(), eos._edges.end());
}
// summarize normals
- for ( ; iBeg < iEnd; ++iBeg )
- avgNormal += data._edges[ iBeg ]->_normal;
+ for ( size_t i = 0; i < eos._edges.size(); ++i )
+ avgNormal += eos._edges[ i ]->_normal;
}
double normSize = avgNormal.SquareModulus();
if ( normSize < 1e-200 )
avgCosin /= nbCosin;
// set _LayerEdge::_normal = avgNormal
- id2end = convFace._subIdToEdgeEnd.begin();
- for ( ; id2end != convFace._subIdToEdgeEnd.end(); ++id2end )
+ id2eos = convFace._subIdToEOS.begin();
+ for ( ; id2eos != convFace._subIdToEOS.end(); ++id2eos )
{
- data.GetEdgesOnShape( id2end->second, iBeg, iEnd );
- const TopoDS_Shape& S = meshDS->IndexToShape( id2end->first );
- if ( S.ShapeType() != TopAbs_EDGE )
- for ( int i = iBeg; i < iEnd; ++i )
- data._edges[ i ]->_cosin = avgCosin;
+ _EdgesOnShape& eos = *(id2eos->second);
+ if ( eos.ShapeType() != TopAbs_EDGE )
+ for ( size_t i = 0; i < eos._edges.size(); ++i )
+ eos._edges[ i ]->_cosin = avgCosin;
- for ( ; iBeg < iEnd; ++iBeg )
- data._edges[ iBeg ]->_normal = avgNormal;
+ for ( size_t i = 0; i < eos._edges.size(); ++i )
+ eos._edges[ i ]->_normal = avgNormal;
}
}
else // if ( isSpherical )
// get _LayerEdge's of the EDGE
TGeomID edgeID = meshDS->ShapeToIndex( edge );
- id2end = convFace._subIdToEdgeEnd.find( edgeID );
- if ( id2end == convFace._subIdToEdgeEnd.end() )
+ _EdgesOnShape* eos = data.GetShapeEdges( edgeID );
+ if ( !eos || eos->_edges.empty() )
{
// no _LayerEdge's on EDGE, use _LayerEdge's on VERTEXes
for ( int iV = 0; iV < 2; ++iV )
{
TopoDS_Vertex v = helper.IthVertex( iV, edge );
TGeomID vID = meshDS->ShapeToIndex( v );
- int end = convFace._subIdToEdgeEnd[ vID ];
- int iBeg = end > 0 ? data._endEdgeOnShape[ end-1 ] : 0;
- vertexLEdges[ iV ] = data._edges[ iBeg ];
+ eos = data.GetShapeEdges( vID );
+ vertexLEdges[ iV ] = eos->_edges[ 0 ];
}
edgeLEdge = &vertexLEdges[0];
edgeLEdgeEnd = edgeLEdge + 2;
}
else
{
- data.GetEdgesOnShape( id2end->second, iBeg, iEnd );
- if ( id2end->second >= data._nbShapesToSmooth )
- data.SortOnEdge( edge, iBeg, iEnd, helper );
- edgeLEdge = &data._edges[ iBeg ];
- edgeLEdgeEnd = edgeLEdge + iEnd - iBeg;
- vertexLEdges[0] = data._edges[ iBeg ]->_2neibors->_edges[0];
- vertexLEdges[1] = data._edges[ iEnd-1 ]->_2neibors->_edges[1];
-
- if ( ! data._edges[ iBeg ]->_sWOL.IsNull() )
+ if ( ! eos->_toSmooth )
+ data.SortOnEdge( edge, eos->_edges, helper );
+ edgeLEdge = &eos->_edges[ 0 ];
+ edgeLEdgeEnd = edgeLEdge + eos->_edges.size();
+ vertexLEdges[0] = eos->_edges.front()->_2neibors->_edges[0];
+ vertexLEdges[1] = eos->_edges.back() ->_2neibors->_edges[1];
+
+ if ( ! eos->_sWOL.IsNull() )
centerCurves[ iE ]._adjFace.Nullify();
}
if ( nbCosin > 0 )
avgCosin /= nbCosin;
const TGeomID faceID = meshDS->ShapeToIndex( convFace._face );
- map< TGeomID, int >::iterator id2end = convFace._subIdToEdgeEnd.find( faceID );
- if ( id2end != convFace._subIdToEdgeEnd.end() )
+ map< TGeomID, _EdgesOnShape* >::iterator id2eos = convFace._subIdToEOS.find( faceID );
+ if ( id2eos != convFace._subIdToEOS.end() )
{
int iE = 0;
gp_XYZ newNorm;
- data.GetEdgesOnShape( id2end->second, iBeg, iEnd );
- for ( ; iBeg < iEnd; ++iBeg )
+ _EdgesOnShape& eos = * ( id2eos->second );
+ for ( size_t i = 0; i < eos._edges.size(); ++i )
{
- _LayerEdge* ledge = data._edges[ iBeg ];
+ _LayerEdge* ledge = eos._edges[ i ];
if ( !convFace.GetCenterOfCurvature( ledge, surfProp, helper, center ))
continue;
for ( size_t i = 0; i < centerCurves.size(); ++i, ++iE )
dumpFunction(SMESH_Comment("updateNormalsOfConvexFaces")<<data._index
<<"_F"<<meshDS->ShapeToIndex( convFace._face ));
- id2end = convFace._subIdToEdgeEnd.begin();
- for ( ; id2end != convFace._subIdToEdgeEnd.end(); ++id2end )
+ id2eos = convFace._subIdToEOS.begin();
+ for ( ; id2eos != convFace._subIdToEOS.end(); ++id2eos )
{
- data.GetEdgesOnShape( id2end->second, iBeg, iEnd );
- for ( ; iBeg < iEnd; ++iBeg )
+ _EdgesOnShape& eos = * ( id2eos->second );
+ for ( size_t i = 0; i < eos._edges.size(); ++i )
{
- _LayerEdge* & ledge = data._edges[ iBeg ];
+ _LayerEdge* & ledge = eos._edges[ i ];
double len = ledge->_len;
- ledge->InvalidateStep( stepNb + 1, /*restoreLength=*/true );
+ ledge->InvalidateStep( stepNb + 1, eos, /*restoreLength=*/true );
ledge->SetCosin( ledge->_cosin );
- ledge->SetNewLength( len, helper );
+ ledge->SetNewLength( len, eos, helper );
}
} // loop on sub-shapes of convFace._face
// Find FACEs adjacent to convFace._face that got necessity to smooth
// as a result of normals modification
- set< TGeomID > adjFacesToSmooth;
+ set< _EdgesOnShape* > adjFacesToSmooth;
for ( size_t iE = 0; iE < centerCurves.size(); ++iE )
{
if ( centerCurves[ iE ]._adjFace.IsNull() ||
{
if ( centerCurves[ iE ]._ledges[ iLE ]->_cosin > theMinSmoothCosin )
{
- adjFacesToSmooth.insert( meshDS->ShapeToIndex( centerCurves[ iE ]._adjFace ));
+ adjFacesToSmooth.insert( data.GetShapeEdges( centerCurves[ iE ]._adjFace ));
break;
}
}
bool _ConvexFace::CheckPrisms() const
{
+ double vol = 0;
for ( size_t i = 0; i < _simplexTestEdges.size(); ++i )
{
const _LayerEdge* edge = _simplexTestEdges[i];
SMESH_TNodeXYZ tgtXYZ( edge->_nodes.back() );
for ( size_t j = 0; j < edge->_simplices.size(); ++j )
- if ( !edge->_simplices[j].IsForward( edge->_nodes[0], &tgtXYZ ))
+ if ( !edge->_simplices[j].IsForward( edge->_nodes[0], &tgtXYZ, vol ))
{
debugMsg( "Bad simplex of _simplexTestEdges ("
<< " "<< edge->_nodes[0]->GetID()<< " "<< tgtXYZ._node->GetID()
void _CentralCurveOnEdge::SetShapes( const TopoDS_Edge& edge,
const _ConvexFace& convFace,
- const _SolidData& data,
+ _SolidData& data,
SMESH_MesherHelper& helper)
{
_edge = edge;
_adjFace = TopoDS::Face( *F );
_adjFaceToSmooth = false;
// _adjFace already in a smoothing queue ?
- size_t end;
- TGeomID adjFaceID = helper.GetMeshDS()->ShapeToIndex( *F );
- if ( data.GetShapeEdges( adjFaceID, end ))
- _adjFaceToSmooth = ( end < data._nbShapesToSmooth );
+ if ( _EdgesOnShape* eos = data.GetShapeEdges( _adjFace ))
+ _adjFaceToSmooth = eos->_toSmooth;
break;
}
}
bool _LayerEdge::FindIntersection( SMESH_ElementSearcher& searcher,
double & distance,
const double& epsilon,
+ _EdgesOnShape& eos,
const SMDS_MeshElement** face)
{
vector< const SMDS_MeshElement* > suspectFaces;
double segLen;
- gp_Ax1 lastSegment = LastSegment(segLen);
+ gp_Ax1 lastSegment = LastSegment( segLen, eos );
searcher.GetElementsNearLine( lastSegment, SMDSAbs_Face, suspectFaces );
bool segmentIntersected = false;
*/
//================================================================================
-gp_Ax1 _LayerEdge::LastSegment(double& segLen) const
+gp_Ax1 _LayerEdge::LastSegment(double& segLen, _EdgesOnShape& eos) const
{
// find two non-coincident positions
gp_XYZ orig = _pos.back();
gp_XYZ dir;
int iPrev = _pos.size() - 2;
+ const double tol = ( _len > 0 ) ? 0.3*_len : 1e-100; // adjusted for IPAL52478 + PAL22576
while ( iPrev >= 0 )
{
dir = orig - _pos[iPrev];
- if ( dir.SquareModulus() > 1e-100 )
+ if ( dir.SquareModulus() > tol*tol )
break;
else
iPrev--;
else
{
gp_Pnt pPrev = _pos[ iPrev ];
- if ( !_sWOL.IsNull() )
+ if ( !eos._sWOL.IsNull() )
{
TopLoc_Location loc;
- if ( _sWOL.ShapeType() == TopAbs_EDGE )
+ if ( eos.SWOLType() == TopAbs_EDGE )
{
double f,l;
- Handle(Geom_Curve) curve = BRep_Tool::Curve( TopoDS::Edge( _sWOL ), loc, f,l);
+ Handle(Geom_Curve) curve = BRep_Tool::Curve( TopoDS::Edge( eos._sWOL ), loc, f,l);
pPrev = curve->Value( pPrev.X() ).Transformed( loc );
}
else
{
- Handle(Geom_Surface) surface = BRep_Tool::Surface( TopoDS::Face(_sWOL), loc );
+ Handle(Geom_Surface) surface = BRep_Tool::Surface( TopoDS::Face( eos._sWOL ), loc );
pPrev = surface->Value( pPrev.X(), pPrev.Y() ).Transformed( loc );
}
dir = SMESH_TNodeXYZ( _nodes.back() ) - pPrev.XYZ();
*/
//================================================================================
-gp_XY _LayerEdge::LastUV( const TopoDS_Face& F ) const
+gp_XY _LayerEdge::LastUV( const TopoDS_Face& F, _EdgesOnShape& eos ) const
{
- if ( F.IsSame( _sWOL )) // F is my FACE
+ if ( F.IsSame( eos._sWOL )) // F is my FACE
return gp_XY( _pos.back().X(), _pos.back().Y() );
- if ( _sWOL.IsNull() || _sWOL.ShapeType() != TopAbs_EDGE ) // wrong call
+ if ( eos.SWOLType() != TopAbs_EDGE ) // wrong call
return gp_XY( 1e100, 1e100 );
// _sWOL is EDGE of F; _pos.back().X() is the last U on the EDGE
double f, l, u = _pos.back().X();
- Handle(Geom2d_Curve) C2d = BRep_Tool::CurveOnSurface( TopoDS::Edge(_sWOL), F, f,l);
+ Handle(Geom2d_Curve) C2d = BRep_Tool::CurveOnSurface( TopoDS::Edge(eos._sWOL), F, f,l);
if ( !C2d.IsNull() && f <= u && u <= l )
return C2d->Value( u ).XY();
{
//const double EPSILON = 1e-6;
- gp_XYZ orig = lastSegment.Location().XYZ();
- gp_XYZ dir = lastSegment.Direction().XYZ();
+ const gp_Pnt& orig = lastSegment.Location();
+ const gp_Dir& dir = lastSegment.Direction();
SMESH_TNodeXYZ vert0( n0 );
SMESH_TNodeXYZ vert1( n1 );
SMESH_TNodeXYZ vert2( n2 );
/* calculate distance from vert0 to ray origin */
- gp_XYZ tvec = orig - vert0;
+ gp_XYZ tvec = orig.XYZ() - vert0;
//if ( tvec * dir > EPSILON )
// intersected face is at back side of the temporary face this _LayerEdge belongs to
gp_XYZ edge2 = vert2 - vert0;
/* begin calculating determinant - also used to calculate U parameter */
- gp_XYZ pvec = dir ^ edge2;
+ gp_XYZ pvec = dir.XYZ() ^ edge2;
/* if determinant is near zero, ray lies in plane of triangle */
double det = edge1 * pvec;
if (det > -EPSILON && det < EPSILON)
return false;
- double inv_det = 1.0 / det;
/* calculate U parameter and test bounds */
- double u = ( tvec * pvec ) * inv_det;
+ double u = ( tvec * pvec ) / det;
//if (u < 0.0 || u > 1.0)
if (u < -EPSILON || u > 1.0 + EPSILON)
return false;
gp_XYZ qvec = tvec ^ edge1;
/* calculate V parameter and test bounds */
- double v = (dir * qvec) * inv_det;
+ double v = (dir.XYZ() * qvec) / det;
//if ( v < 0.0 || u + v > 1.0 )
if ( v < -EPSILON || u + v > 1.0 + EPSILON)
return false;
- /* calculate t, ray intersects triangle */
- t = (edge2 * qvec) * inv_det;
+ /* calculate t, ray intersects triangle */
+ t = (edge2 * qvec) / det;
+
+ //return true;
+ return t > 0.;
+}
+
+//================================================================================
+/*!
+ * \brief Perform smooth of _LayerEdge's based on EDGE's
+ * \retval bool - true if node has been moved
+ */
+//================================================================================
+
+bool _LayerEdge::SmoothOnEdge(Handle(Geom_Surface)& surface,
+ const TopoDS_Face& F,
+ SMESH_MesherHelper& helper)
+{
+ ASSERT( IsOnEdge() );
+
+ SMDS_MeshNode* tgtNode = const_cast<SMDS_MeshNode*>( _nodes.back() );
+ SMESH_TNodeXYZ oldPos( tgtNode );
+ double dist01, distNewOld;
+
+ SMESH_TNodeXYZ p0( _2neibors->tgtNode(0));
+ SMESH_TNodeXYZ p1( _2neibors->tgtNode(1));
+ dist01 = p0.Distance( _2neibors->tgtNode(1) );
+
+ gp_Pnt newPos = p0 * _2neibors->_wgt[0] + p1 * _2neibors->_wgt[1];
+ double lenDelta = 0;
+ if ( _curvature )
+ {
+ //lenDelta = _curvature->lenDelta( _len );
+ lenDelta = _curvature->lenDeltaByDist( dist01 );
+ newPos.ChangeCoord() += _normal * lenDelta;
+ }
+
+ distNewOld = newPos.Distance( oldPos );
+
+ if ( F.IsNull() )
+ {
+ if ( _2neibors->_plnNorm )
+ {
+ // put newPos on the plane defined by source node and _plnNorm
+ gp_XYZ new2src = SMESH_TNodeXYZ( _nodes[0] ) - newPos.XYZ();
+ double new2srcProj = (*_2neibors->_plnNorm) * new2src;
+ newPos.ChangeCoord() += (*_2neibors->_plnNorm) * new2srcProj;
+ }
+ tgtNode->setXYZ( newPos.X(), newPos.Y(), newPos.Z() );
+ _pos.back() = newPos.XYZ();
+ }
+ else
+ {
+ tgtNode->setXYZ( newPos.X(), newPos.Y(), newPos.Z() );
+ gp_XY uv( Precision::Infinite(), 0 );
+ helper.CheckNodeUV( F, tgtNode, uv, 1e-10, /*force=*/true );
+ _pos.back().SetCoord( uv.X(), uv.Y(), 0 );
+
+ newPos = surface->Value( uv.X(), uv.Y() );
+ tgtNode->setXYZ( newPos.X(), newPos.Y(), newPos.Z() );
+ }
+
+ // commented for IPAL0052478
+ // if ( _curvature && lenDelta < 0 )
+ // {
+ // gp_Pnt prevPos( _pos[ _pos.size()-2 ]);
+ // _len -= prevPos.Distance( oldPos );
+ // _len += prevPos.Distance( newPos );
+ // }
+ bool moved = distNewOld > dist01/50;
+ //if ( moved )
+ dumpMove( tgtNode ); // debug
+
+ return moved;
+}
+
+//================================================================================
+/*!
+ * \brief Perform laplacian smooth in 3D of nodes inflated from FACE
+ * \retval bool - true if _tgtNode has been moved
+ */
+//================================================================================
+
+int _LayerEdge::Smooth(const int step, const bool isConcaveFace, const bool findBest )
+{
+ if ( _simplices.size() < 2 )
+ return 0; // _LayerEdge inflated along EDGE or FACE
+
+ const gp_XYZ& curPos ( _pos.back() );
+ const gp_XYZ& prevPos( _pos[ _pos.size()-2 ]);
+
+ // quality metrics (orientation) of tetras around _tgtNode
+ int nbOkBefore = 0;
+ double vol, minVolBefore = 1e100;
+ for ( size_t i = 0; i < _simplices.size(); ++i )
+ {
+ nbOkBefore += _simplices[i].IsForward( _nodes[0], &curPos, vol );
+ minVolBefore = Min( minVolBefore, vol );
+ }
+ int nbBad = _simplices.size() - nbOkBefore;
+
+ // compute new position for the last _pos using different _funs
+ gp_XYZ newPos;
+ for ( int iFun = -1; iFun < theNbSmooFuns; ++iFun )
+ {
+ if ( iFun < 0 )
+ newPos = (this->*_smooFunction)(); // fun chosen by ChooseSmooFunction()
+ else if ( _funs[ iFun ] == _smooFunction )
+ continue; // _smooFunction again
+ else if ( step > 0 )
+ newPos = (this->*_funs[ iFun ])(); // try other smoothing fun
+ else
+ break; // let "easy" functions improve elements around distorted ones
+
+ if ( _curvature )
+ {
+ double delta = _curvature->lenDelta( _len );
+ if ( delta > 0 )
+ newPos += _normal * delta;
+ else
+ {
+ double segLen = _normal * ( newPos - prevPos );
+ if ( segLen + delta > 0 )
+ newPos += _normal * delta;
+ }
+ // double segLenChange = _normal * ( curPos - newPos );
+ // newPos += 0.5 * _normal * segLenChange;
+ }
+
+ int nbOkAfter = 0;
+ double minVolAfter = 1e100;
+ for ( size_t i = 0; i < _simplices.size(); ++i )
+ {
+ nbOkAfter += _simplices[i].IsForward( _nodes[0], &newPos, vol );
+ minVolAfter = Min( minVolAfter, vol );
+ }
+ // get worse?
+ if ( nbOkAfter < nbOkBefore )
+ continue;
+ if (( isConcaveFace || findBest ) &&
+ ( nbOkAfter == nbOkBefore ) &&
+ //( iFun > -1 || nbOkAfter < _simplices.size() ) &&
+ ( minVolAfter <= minVolBefore ))
+ continue;
+
+ SMDS_MeshNode* n = const_cast< SMDS_MeshNode* >( _nodes.back() );
+
+ // commented for IPAL0052478
+ // _len -= prevPos.Distance(SMESH_TNodeXYZ( n ));
+ // _len += prevPos.Distance(newPos);
+
+ n->setXYZ( newPos.X(), newPos.Y(), newPos.Z());
+ _pos.back() = newPos;
+ dumpMoveComm( n, _funNames[ iFun < 0 ? smooFunID() : iFun ]);
+
+ nbBad = _simplices.size() - nbOkAfter;
+
+ if ( iFun > -1 )
+ {
+ //_smooFunction = _funs[ iFun ];
+ // cout << "# " << _funNames[ iFun ] << "\t N:" << _nodes.back()->GetID()
+ // << "\t nbBad: " << _simplices.size() - nbOkAfter
+ // << " minVol: " << minVolAfter
+ // << " " << newPos.X() << " " << newPos.Y() << " " << newPos.Z()
+ // << endl;
+ minVolBefore = minVolAfter;
+ nbOkBefore = nbOkAfter;
+ continue; // look for a better function
+ }
+
+ if ( !findBest )
+ break;
+
+ } // loop on smoothing functions
+
+ return nbBad;
+}
+
+//================================================================================
+/*!
+ * \brief Chooses a smoothing technic giving a position most close to an initial one.
+ * For a correct result, _simplices must contain nodes lying on geometry.
+ */
+//================================================================================
+
+void _LayerEdge::ChooseSmooFunction( const set< TGeomID >& concaveVertices,
+ const TNode2Edge& n2eMap)
+{
+ if ( _smooFunction ) return;
+
+ // use smoothNefPolygon() near concaveVertices
+ if ( !concaveVertices.empty() )
+ {
+ for ( size_t i = 0; i < _simplices.size(); ++i )
+ {
+ if ( concaveVertices.count( _simplices[i]._nPrev->getshapeId() ))
+ {
+ _smooFunction = _funs[ FUN_NEFPOLY ];
+
+ // set FUN_CENTROIDAL to neighbor edges
+ TNode2Edge::const_iterator n2e;
+ for ( i = 0; i < _simplices.size(); ++i )
+ {
+ if (( _simplices[i]._nPrev->GetPosition()->GetDim() == 2 ) &&
+ (( n2e = n2eMap.find( _simplices[i]._nPrev )) != n2eMap.end() ))
+ {
+ n2e->second->_smooFunction = _funs[ FUN_CENTROIDAL ];
+ }
+ }
+ return;
+ }
+ }
+ //}
+
+ // this coice is done only if ( !concaveVertices.empty() ) for Grids/smesh/bugs_19/X1
+ // where the nodes are smoothed too far along a sphere thus creating
+ // inverted _simplices
+ double dist[theNbSmooFuns];
+ //double coef[theNbSmooFuns] = { 1., 1.2, 1.4, 1.4 };
+ double coef[theNbSmooFuns] = { 1., 1., 1., 1. };
+
+ double minDist = Precision::Infinite();
+ gp_Pnt p = SMESH_TNodeXYZ( _nodes[0] );
+ for ( int i = 0; i < FUN_NEFPOLY; ++i )
+ {
+ gp_Pnt newP = (this->*_funs[i])();
+ dist[i] = p.SquareDistance( newP );
+ if ( dist[i]*coef[i] < minDist )
+ {
+ _smooFunction = _funs[i];
+ minDist = dist[i]*coef[i];
+ }
+ }
+ }
+ else
+ {
+ _smooFunction = _funs[ FUN_LAPLACIAN ];
+ }
+ // int minDim = 3;
+ // for ( size_t i = 0; i < _simplices.size(); ++i )
+ // minDim = Min( minDim, _simplices[i]._nPrev->GetPosition()->GetDim() );
+ // if ( minDim == 0 )
+ // _smooFunction = _funs[ FUN_CENTROIDAL ];
+ // else if ( minDim == 1 )
+ // _smooFunction = _funs[ FUN_CENTROIDAL ];
+
+
+ // int iMin;
+ // for ( int i = 0; i < FUN_NB; ++i )
+ // {
+ // //cout << dist[i] << " ";
+ // if ( _smooFunction == _funs[i] ) {
+ // iMin = i;
+ // //debugMsg( fNames[i] );
+ // break;
+ // }
+ // }
+ // cout << _funNames[ iMin ] << "\t N:" << _nodes.back()->GetID() << endl;
+}
+
+//================================================================================
+/*!
+ * \brief Returns a name of _SmooFunction
+ */
+//================================================================================
+
+int _LayerEdge::smooFunID( _LayerEdge::PSmooFun fun) const
+{
+ if ( !fun )
+ fun = _smooFunction;
+ for ( int i = 0; i < theNbSmooFuns; ++i )
+ if ( fun == _funs[i] )
+ return i;
+
+ return theNbSmooFuns;
+}
+
+//================================================================================
+/*!
+ * \brief Computes a new node position using Laplacian smoothing
+ */
+//================================================================================
+
+gp_XYZ _LayerEdge::smoothLaplacian()
+{
+ gp_XYZ newPos (0,0,0);
+ for ( size_t i = 0; i < _simplices.size(); ++i )
+ newPos += SMESH_TNodeXYZ( _simplices[i]._nPrev );
+ newPos /= _simplices.size();
- //return true;
- return t > 0.;
+ return newPos;
}
//================================================================================
/*!
- * \brief Perform smooth of _LayerEdge's based on EDGE's
- * \retval bool - true if node has been moved
+ * \brief Computes a new node position using angular-based smoothing
*/
//================================================================================
-bool _LayerEdge::SmoothOnEdge(Handle(Geom_Surface)& surface,
- const TopoDS_Face& F,
- SMESH_MesherHelper& helper)
+gp_XYZ _LayerEdge::smoothAngular()
{
- ASSERT( IsOnEdge() );
+ vector< gp_Vec > edgeDir; edgeDir. reserve( _simplices.size() + 1);
+ vector< double > edgeSize; edgeSize.reserve( _simplices.size() );
+ vector< gp_XYZ > points; points. reserve( _simplices.size() );
- SMDS_MeshNode* tgtNode = const_cast<SMDS_MeshNode*>( _nodes.back() );
- SMESH_TNodeXYZ oldPos( tgtNode );
- double dist01, distNewOld;
-
- SMESH_TNodeXYZ p0( _2neibors->tgtNode(0));
- SMESH_TNodeXYZ p1( _2neibors->tgtNode(1));
- dist01 = p0.Distance( _2neibors->tgtNode(1) );
+ gp_XYZ pPrev = SMESH_TNodeXYZ( _simplices.back()._nPrev );
+ gp_XYZ pN( 0,0,0 );
+ for ( size_t i = 0; i < _simplices.size(); ++i )
+ {
+ gp_XYZ p = SMESH_TNodeXYZ( _simplices[i]._nPrev );
+ edgeDir.push_back( p - pPrev );
+ edgeSize.push_back( edgeDir.back().Magnitude() );
+ //double edgeSize = edgeDir.back().Magnitude();
+ if ( edgeSize.back() < numeric_limits<double>::min() )
+ {
+ edgeDir.pop_back();
+ edgeSize.pop_back();
+ }
+ else
+ {
+ edgeDir.back() /= edgeSize.back();
+ points.push_back( p );
+ pN += p;
+ }
+ pPrev = p;
+ }
+ edgeDir.push_back ( edgeDir[0] );
+ edgeSize.push_back( edgeSize[0] );
+ pN /= points.size();
- gp_Pnt newPos = p0 * _2neibors->_wgt[0] + p1 * _2neibors->_wgt[1];
- double lenDelta = 0;
- if ( _curvature )
+ gp_XYZ newPos(0,0,0);
+ //gp_XYZ pN = SMESH_TNodeXYZ( _nodes.back() );
+ double sumSize = 0;
+ for ( size_t i = 0; i < points.size(); ++i )
{
- //lenDelta = _curvature->lenDelta( _len );
- lenDelta = _curvature->lenDeltaByDist( dist01 );
- newPos.ChangeCoord() += _normal * lenDelta;
+ gp_Vec toN( pN - points[i]);
+ double toNLen = toN.Magnitude();
+ if ( toNLen < numeric_limits<double>::min() )
+ {
+ newPos += pN;
+ continue;
+ }
+ gp_Vec bisec = edgeDir[i] + edgeDir[i+1];
+ double bisecLen = bisec.SquareMagnitude();
+ if ( bisecLen < numeric_limits<double>::min() )
+ {
+ gp_Vec norm = edgeDir[i] ^ toN;
+ bisec = norm ^ edgeDir[i];
+ bisecLen = bisec.SquareMagnitude();
+ }
+ bisecLen = Sqrt( bisecLen );
+ bisec /= bisecLen;
+
+#if 1
+ //bisecLen = 1.;
+ gp_XYZ pNew = ( points[i] + bisec.XYZ() * toNLen ) * bisecLen;
+ sumSize += bisecLen;
+#else
+ gp_XYZ pNew = ( points[i] + bisec.XYZ() * toNLen ) * ( edgeSize[i] + edgeSize[i+1] );
+ sumSize += ( edgeSize[i] + edgeSize[i+1] );
+#endif
+ newPos += pNew;
}
+ newPos /= sumSize;
- distNewOld = newPos.Distance( oldPos );
+ return newPos;
+}
- if ( F.IsNull() )
+//================================================================================
+/*!
+ * \brief Computes a new node position using weigthed node positions
+ */
+//================================================================================
+
+gp_XYZ _LayerEdge::smoothLengthWeighted()
+{
+ vector< double > edgeSize; edgeSize.reserve( _simplices.size() + 1);
+ vector< gp_XYZ > points; points. reserve( _simplices.size() );
+
+ gp_XYZ pPrev = SMESH_TNodeXYZ( _simplices.back()._nPrev );
+ for ( size_t i = 0; i < _simplices.size(); ++i )
{
- if ( _2neibors->_plnNorm )
+ gp_XYZ p = SMESH_TNodeXYZ( _simplices[i]._nPrev );
+ edgeSize.push_back( ( p - pPrev ).Modulus() );
+ if ( edgeSize.back() < numeric_limits<double>::min() )
{
- // put newPos on the plane defined by source node and _plnNorm
- gp_XYZ new2src = SMESH_TNodeXYZ( _nodes[0] ) - newPos.XYZ();
- double new2srcProj = (*_2neibors->_plnNorm) * new2src;
- newPos.ChangeCoord() += (*_2neibors->_plnNorm) * new2srcProj;
+ edgeSize.pop_back();
}
- tgtNode->setXYZ( newPos.X(), newPos.Y(), newPos.Z() );
- _pos.back() = newPos.XYZ();
+ else
+ {
+ points.push_back( p );
+ }
+ pPrev = p;
}
- else
- {
- tgtNode->setXYZ( newPos.X(), newPos.Y(), newPos.Z() );
- gp_XY uv( Precision::Infinite(), 0 );
- helper.CheckNodeUV( F, tgtNode, uv, 1e-10, /*force=*/true );
- _pos.back().SetCoord( uv.X(), uv.Y(), 0 );
+ edgeSize.push_back( edgeSize[0] );
- newPos = surface->Value( uv.X(), uv.Y() );
- tgtNode->setXYZ( newPos.X(), newPos.Y(), newPos.Z() );
+ gp_XYZ newPos(0,0,0);
+ double sumSize = 0;
+ for ( size_t i = 0; i < points.size(); ++i )
+ {
+ newPos += points[i] * ( edgeSize[i] + edgeSize[i+1] );
+ sumSize += edgeSize[i] + edgeSize[i+1];
}
+ newPos /= sumSize;
+ return newPos;
+}
+
+//================================================================================
+/*!
+ * \brief Computes a new node position using angular-based smoothing
+ */
+//================================================================================
- if ( _curvature && lenDelta < 0 )
+gp_XYZ _LayerEdge::smoothCentroidal()
+{
+ gp_XYZ newPos(0,0,0);
+ gp_XYZ pN = SMESH_TNodeXYZ( _nodes.back() );
+ double sumSize = 0;
+ for ( size_t i = 0; i < _simplices.size(); ++i )
{
- gp_Pnt prevPos( _pos[ _pos.size()-2 ]);
- _len -= prevPos.Distance( oldPos );
- _len += prevPos.Distance( newPos );
+ gp_XYZ p1 = SMESH_TNodeXYZ( _simplices[i]._nPrev );
+ gp_XYZ p2 = SMESH_TNodeXYZ( _simplices[i]._nNext );
+ gp_XYZ gc = ( pN + p1 + p2 ) / 3.;
+ double size = (( p1 - pN ) ^ ( p2 - pN )).Modulus();
+
+ sumSize += size;
+ newPos += gc * size;
}
- bool moved = distNewOld > dist01/50;
- //if ( moved )
- dumpMove( tgtNode ); // debug
+ newPos /= sumSize;
- return moved;
+ return newPos;
}
//================================================================================
/*!
- * \brief Perform laplacian smooth in 3D of nodes inflated from FACE
- * \retval bool - true if _tgtNode has been moved
+ * \brief Computes a new node position located inside a Nef polygon
*/
//================================================================================
-bool _LayerEdge::Smooth(int& badNb)
+gp_XYZ _LayerEdge::smoothNefPolygon()
{
- if ( _simplices.size() < 2 )
- return false; // _LayerEdge inflated along EDGE or FACE
+ gp_XYZ newPos(0,0,0);
- // compute new position for the last _pos
- gp_XYZ newPos (0,0,0);
- for ( size_t i = 0; i < _simplices.size(); ++i )
- newPos += SMESH_TNodeXYZ( _simplices[i]._nPrev );
- newPos /= _simplices.size();
+ // get a plane to seach a solution on
- const gp_XYZ& curPos ( _pos.back() );
- const gp_Pnt prevPos( _pos[ _pos.size()-2 ]);
- if ( _curvature )
+ vector< gp_XYZ > vecs( _simplices.size() + 1 );
+ size_t i;
+ const double tol = numeric_limits<double>::min();
+ gp_XYZ center(0,0,0);
+ for ( i = 0; i < _simplices.size(); ++i )
{
- double delta = _curvature->lenDelta( _len );
- if ( delta > 0 )
- newPos += _normal * delta;
- else
- {
- double segLen = _normal * ( newPos - prevPos.XYZ() );
- if ( segLen + delta > 0 )
- newPos += _normal * delta;
- }
- // double segLenChange = _normal * ( curPos - newPos );
- // newPos += 0.5 * _normal * segLenChange;
+ vecs[i] = ( SMESH_TNodeXYZ( _simplices[i]._nNext ) -
+ SMESH_TNodeXYZ( _simplices[i]._nPrev ));
+ center += SMESH_TNodeXYZ( _simplices[i]._nPrev );
}
+ vecs.back() = vecs[0];
+ center /= _simplices.size();
- // count quality metrics (orientation) of tetras around _tgtNode
- int nbOkBefore = 0;
- for ( size_t i = 0; i < _simplices.size(); ++i )
- nbOkBefore += _simplices[i].IsForward( _nodes[0], &curPos );
+ gp_XYZ zAxis(0,0,0);
+ for ( i = 0; i < _simplices.size(); ++i )
+ zAxis += vecs[i] ^ vecs[i+1];
- int nbOkAfter = 0;
+ gp_XYZ yAxis;
+ for ( i = 0; i < _simplices.size(); ++i )
+ {
+ yAxis = vecs[i];
+ if ( yAxis.SquareModulus() > tol )
+ break;
+ }
+ gp_XYZ xAxis = yAxis ^ zAxis;
+ // SMESH_TNodeXYZ p0( _simplices[0]._nPrev );
+ // const double tol = 1e-6 * ( p0.Distance( _simplices[1]._nPrev ) +
+ // p0.Distance( _simplices[2]._nPrev ));
+ // gp_XYZ center = smoothLaplacian();
+ // gp_XYZ xAxis, yAxis, zAxis;
+ // for ( i = 0; i < _simplices.size(); ++i )
+ // {
+ // xAxis = SMESH_TNodeXYZ( _simplices[i]._nPrev ) - center;
+ // if ( xAxis.SquareModulus() > tol*tol )
+ // break;
+ // }
+ // for ( i = 1; i < _simplices.size(); ++i )
+ // {
+ // yAxis = SMESH_TNodeXYZ( _simplices[i]._nPrev ) - center;
+ // zAxis = xAxis ^ yAxis;
+ // if ( zAxis.SquareModulus() > tol*tol )
+ // break;
+ // }
+ // if ( i == _simplices.size() ) return newPos;
+
+ yAxis = zAxis ^ xAxis;
+ xAxis /= xAxis.Modulus();
+ yAxis /= yAxis.Modulus();
+
+ // get half-planes of _simplices
+
+ vector< _halfPlane > halfPlns( _simplices.size() );
+ int nbHP = 0;
for ( size_t i = 0; i < _simplices.size(); ++i )
- nbOkAfter += _simplices[i].IsForward( _nodes[0], &newPos );
+ {
+ gp_XYZ OP1 = SMESH_TNodeXYZ( _simplices[i]._nPrev ) - center;
+ gp_XYZ OP2 = SMESH_TNodeXYZ( _simplices[i]._nNext ) - center;
+ gp_XY p1( OP1 * xAxis, OP1 * yAxis );
+ gp_XY p2( OP2 * xAxis, OP2 * yAxis );
+ gp_XY vec12 = p2 - p1;
+ double dist12 = vec12.Modulus();
+ if ( dist12 < tol )
+ continue;
+ vec12 /= dist12;
+ halfPlns[ nbHP ]._pos = p1;
+ halfPlns[ nbHP ]._dir = vec12;
+ halfPlns[ nbHP ]._inNorm.SetCoord( -vec12.Y(), vec12.X() );
+ ++nbHP;
+ }
- if ( nbOkAfter < nbOkBefore )
- return false;
+ // intersect boundaries of half-planes, define state of intersection points
+ // in relation to all half-planes and calculate internal point of a 2D polygon
- SMDS_MeshNode* n = const_cast< SMDS_MeshNode* >( _nodes.back() );
+ double sumLen = 0;
+ gp_XY newPos2D (0,0);
- _len -= prevPos.Distance(SMESH_TNodeXYZ( n ));
- _len += prevPos.Distance(newPos);
+ enum { UNDEF = -1, NOT_OUT, IS_OUT, NO_INT };
+ typedef std::pair< gp_XY, int > TIntPntState; // coord and isOut state
+ TIntPntState undefIPS( gp_XY(1e100,1e100), UNDEF );
- n->setXYZ( newPos.X(), newPos.Y(), newPos.Z());
- _pos.back() = newPos;
+ vector< vector< TIntPntState > > allIntPnts( nbHP );
+ for ( int iHP1 = 0; iHP1 < nbHP; ++iHP1 )
+ {
+ vector< TIntPntState > & intPnts1 = allIntPnts[ iHP1 ];
+ if ( intPnts1.empty() ) intPnts1.resize( nbHP, undefIPS );
- badNb += _simplices.size() - nbOkAfter;
+ int iPrev = SMESH_MesherHelper::WrapIndex( iHP1 - 1, nbHP );
+ int iNext = SMESH_MesherHelper::WrapIndex( iHP1 + 1, nbHP );
- dumpMove( n );
+ int nbNotOut = 0;
+ const gp_XY* segEnds[2] = { 0, 0 }; // NOT_OUT points
- return true;
+ for ( int iHP2 = 0; iHP2 < nbHP; ++iHP2 )
+ {
+ if ( iHP1 == iHP2 ) continue;
+
+ TIntPntState & ips1 = intPnts1[ iHP2 ];
+ if ( ips1.second == UNDEF )
+ {
+ // find an intersection point of boundaries of iHP1 and iHP2
+
+ if ( iHP2 == iPrev ) // intersection with neighbors is known
+ ips1.first = halfPlns[ iHP1 ]._pos;
+ else if ( iHP2 == iNext )
+ ips1.first = halfPlns[ iHP2 ]._pos;
+ else if ( !halfPlns[ iHP1 ].FindInterestion( halfPlns[ iHP2 ], ips1.first ))
+ ips1.second = NO_INT;
+
+ // classify the found intersection point
+ if ( ips1.second != NO_INT )
+ {
+ ips1.second = NOT_OUT;
+ for ( int i = 0; i < nbHP && ips1.second == NOT_OUT; ++i )
+ if ( i != iHP1 && i != iHP2 &&
+ halfPlns[ i ].IsOut( ips1.first, tol ))
+ ips1.second = IS_OUT;
+ }
+ vector< TIntPntState > & intPnts2 = allIntPnts[ iHP2 ];
+ if ( intPnts2.empty() ) intPnts2.resize( nbHP, undefIPS );
+ TIntPntState & ips2 = intPnts2[ iHP1 ];
+ ips2 = ips1;
+ }
+ if ( ips1.second == NOT_OUT )
+ {
+ ++nbNotOut;
+ segEnds[ bool(segEnds[0]) ] = & ips1.first;
+ }
+ }
+
+ // find a NOT_OUT segment of boundary which is located between
+ // two NOT_OUT int points
+
+ if ( nbNotOut < 2 )
+ continue; // no such a segment
+
+ if ( nbNotOut > 2 )
+ {
+ // sort points along the boundary
+ map< double, TIntPntState* > ipsByParam;
+ for ( int iHP2 = 0; iHP2 < nbHP; ++iHP2 )
+ {
+ TIntPntState & ips1 = intPnts1[ iHP2 ];
+ if ( ips1.second != NO_INT )
+ {
+ gp_XY op = ips1.first - halfPlns[ iHP1 ]._pos;
+ double param = op * halfPlns[ iHP1 ]._dir;
+ ipsByParam.insert( make_pair( param, & ips1 ));
+ }
+ }
+ // look for two neighboring NOT_OUT points
+ nbNotOut = 0;
+ map< double, TIntPntState* >::iterator u2ips = ipsByParam.begin();
+ for ( ; u2ips != ipsByParam.end(); ++u2ips )
+ {
+ TIntPntState & ips1 = *(u2ips->second);
+ if ( ips1.second == NOT_OUT )
+ segEnds[ bool( nbNotOut++ ) ] = & ips1.first;
+ else if ( nbNotOut >= 2 )
+ break;
+ else
+ nbNotOut = 0;
+ }
+ }
+
+ if ( nbNotOut >= 2 )
+ {
+ double len = ( *segEnds[0] - *segEnds[1] ).Modulus();
+ sumLen += len;
+
+ newPos2D += 0.5 * len * ( *segEnds[0] + *segEnds[1] );
+ }
+ }
+
+ if ( sumLen > 0 )
+ {
+ newPos2D /= sumLen;
+ newPos = center + xAxis * newPos2D.X() + yAxis * newPos2D.Y();
+ }
+ else
+ {
+ newPos = center;
+ }
+
+ return newPos;
}
//================================================================================
*/
//================================================================================
-void _LayerEdge::SetNewLength( double len, SMESH_MesherHelper& helper )
+void _LayerEdge::SetNewLength( double len, _EdgesOnShape& eos, SMESH_MesherHelper& helper )
{
if ( _len - len > -1e-6 )
{
}
SMDS_MeshNode* n = const_cast< SMDS_MeshNode*>( _nodes.back() );
- SMESH_TNodeXYZ oldXYZ( n );
- gp_XYZ nXYZ = oldXYZ + _normal * ( len - _len ) * _lenFactor;
- n->setXYZ( nXYZ.X(), nXYZ.Y(), nXYZ.Z() );
+ gp_XYZ oldXYZ = SMESH_TNodeXYZ( n );
+ gp_XYZ newXYZ;
+ if ( eos._hyp.IsOffsetMethod() )
+ {
+ newXYZ = oldXYZ;
+ gp_Vec faceNorm;
+ SMDS_ElemIteratorPtr faceIt = _nodes[0]->GetInverseElementIterator( SMDSAbs_Face );
+ while ( faceIt->more() )
+ {
+ const SMDS_MeshElement* face = faceIt->next();
+ if ( !eos.GetNormal( face, faceNorm ))
+ continue;
+
+ // translate plane of a face
+ gp_XYZ baryCenter = oldXYZ + faceNorm.XYZ() * ( len - _len );
+
+ // find point of intersection of the face plane located at baryCenter
+ // and _normal located at newXYZ
+ double d = -( faceNorm.XYZ() * baryCenter ); // d of plane equation ax+by+cz+d=0
+ double dot = ( faceNorm.XYZ() * _normal );
+ if ( dot < std::numeric_limits<double>::min() )
+ dot = ( len - _len ) * 1e-3;
+ double step = -( faceNorm.XYZ() * newXYZ + d ) / dot;
+ newXYZ += step * _normal;
+ }
+ }
+ else
+ {
+ newXYZ = oldXYZ + _normal * ( len - _len ) * _lenFactor;
+ }
+ n->setXYZ( newXYZ.X(), newXYZ.Y(), newXYZ.Z() );
- _pos.push_back( nXYZ );
+ _pos.push_back( newXYZ );
_len = len;
- if ( !_sWOL.IsNull() )
+
+ if ( !eos._sWOL.IsNull() )
{
double distXYZ[4];
- if ( _sWOL.ShapeType() == TopAbs_EDGE )
+ if ( eos.SWOLType() == TopAbs_EDGE )
{
double u = Precision::Infinite(); // to force projection w/o distance check
- helper.CheckNodeU( TopoDS::Edge( _sWOL ), n, u, 1e-10, /*force=*/true, distXYZ );
+ helper.CheckNodeU( TopoDS::Edge( eos._sWOL ), n, u, 1e-10, /*force=*/true, distXYZ );
_pos.back().SetCoord( u, 0, 0 );
if ( _nodes.size() > 1 )
{
else // TopAbs_FACE
{
gp_XY uv( Precision::Infinite(), 0 );
- helper.CheckNodeUV( TopoDS::Face( _sWOL ), n, uv, 1e-10, /*force=*/true, distXYZ );
+ helper.CheckNodeUV( TopoDS::Face( eos._sWOL ), n, uv, 1e-10, /*force=*/true, distXYZ );
_pos.back().SetCoord( uv.X(), uv.Y(), 0 );
if ( _nodes.size() > 1 )
{
*/
//================================================================================
-void _LayerEdge::InvalidateStep( int curStep, bool restoreLength )
+void _LayerEdge::InvalidateStep( int curStep, const _EdgesOnShape& eos, bool restoreLength )
{
if ( _pos.size() > curStep )
{
_pos.resize( curStep );
gp_Pnt nXYZ = _pos.back();
SMDS_MeshNode* n = const_cast< SMDS_MeshNode*>( _nodes.back() );
- if ( !_sWOL.IsNull() )
+ if ( !eos._sWOL.IsNull() )
{
TopLoc_Location loc;
- if ( _sWOL.ShapeType() == TopAbs_EDGE )
+ if ( eos.SWOLType() == TopAbs_EDGE )
{
SMDS_EdgePosition* pos = static_cast<SMDS_EdgePosition*>( n->GetPosition() );
pos->SetUParameter( nXYZ.X() );
double f,l;
- Handle(Geom_Curve) curve = BRep_Tool::Curve( TopoDS::Edge( _sWOL ), loc, f,l);
+ Handle(Geom_Curve) curve = BRep_Tool::Curve( TopoDS::Edge( eos._sWOL ), loc, f,l);
nXYZ = curve->Value( nXYZ.X() ).Transformed( loc );
}
else
SMDS_FacePosition* pos = static_cast<SMDS_FacePosition*>( n->GetPosition() );
pos->SetUParameter( nXYZ.X() );
pos->SetVParameter( nXYZ.Y() );
- Handle(Geom_Surface) surface = BRep_Tool::Surface( TopoDS::Face(_sWOL), loc );
+ Handle(Geom_Surface) surface = BRep_Tool::Surface( TopoDS::Face(eos._sWOL), loc );
nXYZ = surface->Value( nXYZ.X(), nXYZ.Y() ).Transformed( loc );
}
}
// Create intermediate nodes on each _LayerEdge
- int iS = 0, iEnd = data._endEdgeOnShape[ iS ];
-
- for ( size_t i = 0; i < data._edges.size(); ++i )
+ for ( size_t iS = 0; iS < data._edgesOnShape.size(); ++iS )
{
- _LayerEdge& edge = *data._edges[i];
+ _EdgesOnShape& eos = data._edgesOnShape[iS];
+ if ( eos._edges.empty() ) continue;
- if ( edge._nodes.size() < 2 )
+ if ( eos._edges[0]->_nodes.size() < 2 )
continue; // on _noShrinkShapes
- // get parameters of layers for the edge
- if ( i == iEnd )
- iEnd = data._endEdgeOnShape[ ++iS ];
- const AverageHyp& hyp = data._hypOnShape[ iS ];
+ for ( size_t i = 0; i < eos._edges.size(); ++i )
+ {
+ _LayerEdge& edge = *eos._edges[i];
- // get accumulated length of segments
- vector< double > segLen( edge._pos.size() );
- segLen[0] = 0.0;
- for ( size_t j = 1; j < edge._pos.size(); ++j )
- segLen[j] = segLen[j-1] + (edge._pos[j-1] - edge._pos[j] ).Modulus();
+ // get accumulated length of segments
+ vector< double > segLen( edge._pos.size() );
+ segLen[0] = 0.0;
+ for ( size_t j = 1; j < edge._pos.size(); ++j )
+ segLen[j] = segLen[j-1] + (edge._pos[j-1] - edge._pos[j] ).Modulus();
- // allocate memory for new nodes if it is not yet refined
- const SMDS_MeshNode* tgtNode = edge._nodes.back();
- if ( edge._nodes.size() == 2 )
- {
- edge._nodes.resize( hyp.GetNumberLayers() + 1, 0 );
- edge._nodes[1] = 0;
- edge._nodes.back() = tgtNode;
- }
- // get data of a shrink shape
- if ( !edge._sWOL.IsNull() && edge._sWOL != prevSWOL )
- {
- isOnEdge = ( edge._sWOL.ShapeType() == TopAbs_EDGE );
- if ( isOnEdge )
- {
- geomEdge = TopoDS::Edge( edge._sWOL );
- curve = BRep_Tool::Curve( geomEdge, loc, f,l);
- }
- else
- {
- geomFace = TopoDS::Face( edge._sWOL );
- surface = BRep_Tool::Surface( geomFace, loc );
- }
- prevSWOL = edge._sWOL;
- }
- // restore shapePos of the last node by already treated _LayerEdge of another _SolidData
- const TGeomID baseShapeId = edge._nodes[0]->getshapeId();
- if ( baseShapeId != prevBaseId )
- {
- map< TGeomID, TNode2Edge* >::iterator s2ne = data._s2neMap.find( baseShapeId );
- n2eMap = ( s2ne == data._s2neMap.end() ) ? 0 : n2eMap = s2ne->second;
- prevBaseId = baseShapeId;
- }
- _LayerEdge* edgeOnSameNode = 0;
- if ( n2eMap && (( n2e = n2eMap->find( edge._nodes[0] )) != n2eMap->end() ))
- {
- edgeOnSameNode = n2e->second;
- const gp_XYZ& otherTgtPos = edgeOnSameNode->_pos.back();
- SMDS_PositionPtr lastPos = tgtNode->GetPosition();
- if ( isOnEdge )
+ // allocate memory for new nodes if it is not yet refined
+ const SMDS_MeshNode* tgtNode = edge._nodes.back();
+ if ( edge._nodes.size() == 2 )
{
- SMDS_EdgePosition* epos = static_cast<SMDS_EdgePosition*>( lastPos );
- epos->SetUParameter( otherTgtPos.X() );
+ edge._nodes.resize( eos._hyp.GetNumberLayers() + 1, 0 );
+ edge._nodes[1] = 0;
+ edge._nodes.back() = tgtNode;
}
- else
+ // get data of a shrink shape
+ if ( !eos._sWOL.IsNull() && eos._sWOL != prevSWOL )
{
- SMDS_FacePosition* fpos = static_cast<SMDS_FacePosition*>( lastPos );
- fpos->SetUParameter( otherTgtPos.X() );
- fpos->SetVParameter( otherTgtPos.Y() );
- }
- }
- // calculate height of the first layer
- double h0;
- const double T = segLen.back(); //data._hyp.GetTotalThickness();
- const double f = hyp.GetStretchFactor();
- const int N = hyp.GetNumberLayers();
- const double fPowN = pow( f, N );
- if ( fPowN - 1 <= numeric_limits<double>::min() )
- h0 = T / N;
- else
- h0 = T * ( f - 1 )/( fPowN - 1 );
-
- const double zeroLen = std::numeric_limits<double>::min();
-
- // create intermediate nodes
- double hSum = 0, hi = h0/f;
- size_t iSeg = 1;
- for ( size_t iStep = 1; iStep < edge._nodes.size(); ++iStep )
- {
- // compute an intermediate position
- hi *= f;
- hSum += hi;
- while ( hSum > segLen[iSeg] && iSeg < segLen.size()-1)
- ++iSeg;
- int iPrevSeg = iSeg-1;
- while ( fabs( segLen[iPrevSeg] - segLen[iSeg]) <= zeroLen && iPrevSeg > 0 )
- --iPrevSeg;
- double r = ( segLen[iSeg] - hSum ) / ( segLen[iSeg] - segLen[iPrevSeg] );
- gp_Pnt pos = r * edge._pos[iPrevSeg] + (1-r) * edge._pos[iSeg];
-
- SMDS_MeshNode*& node = const_cast< SMDS_MeshNode*& >( edge._nodes[ iStep ]);
- if ( !edge._sWOL.IsNull() )
- {
- // compute XYZ by parameters <pos>
+ isOnEdge = ( eos.SWOLType() == TopAbs_EDGE );
if ( isOnEdge )
{
- u = pos.X();
- if ( !node )
- pos = curve->Value( u ).Transformed(loc);
+ geomEdge = TopoDS::Edge( eos._sWOL );
+ curve = BRep_Tool::Curve( geomEdge, loc, f,l);
}
else
{
- uv.SetCoord( pos.X(), pos.Y() );
- if ( !node )
- pos = surface->Value( pos.X(), pos.Y() ).Transformed(loc);
+ geomFace = TopoDS::Face( eos._sWOL );
+ surface = BRep_Tool::Surface( geomFace, loc );
}
+ prevSWOL = eos._sWOL;
+ }
+ // restore shapePos of the last node by already treated _LayerEdge of another _SolidData
+ const TGeomID baseShapeId = edge._nodes[0]->getshapeId();
+ if ( baseShapeId != prevBaseId )
+ {
+ map< TGeomID, TNode2Edge* >::iterator s2ne = data._s2neMap.find( baseShapeId );
+ n2eMap = ( s2ne == data._s2neMap.end() ) ? 0 : n2eMap = s2ne->second;
+ prevBaseId = baseShapeId;
}
- // create or update the node
- if ( !node )
+ _LayerEdge* edgeOnSameNode = 0;
+ if ( n2eMap && (( n2e = n2eMap->find( edge._nodes[0] )) != n2eMap->end() ))
{
- node = helper.AddNode( pos.X(), pos.Y(), pos.Z());
- if ( !edge._sWOL.IsNull() )
+ edgeOnSameNode = n2e->second;
+ const gp_XYZ& otherTgtPos = edgeOnSameNode->_pos.back();
+ SMDS_PositionPtr lastPos = tgtNode->GetPosition();
+ if ( isOnEdge )
{
- if ( isOnEdge )
- getMeshDS()->SetNodeOnEdge( node, geomEdge, u );
- else
- getMeshDS()->SetNodeOnFace( node, geomFace, uv.X(), uv.Y() );
+ SMDS_EdgePosition* epos = static_cast<SMDS_EdgePosition*>( lastPos );
+ epos->SetUParameter( otherTgtPos.X() );
}
else
{
- getMeshDS()->SetNodeInVolume( node, helper.GetSubShapeID() );
+ SMDS_FacePosition* fpos = static_cast<SMDS_FacePosition*>( lastPos );
+ fpos->SetUParameter( otherTgtPos.X() );
+ fpos->SetVParameter( otherTgtPos.Y() );
}
}
+ // calculate height of the first layer
+ double h0;
+ const double T = segLen.back(); //data._hyp.GetTotalThickness();
+ const double f = eos._hyp.GetStretchFactor();
+ const int N = eos._hyp.GetNumberLayers();
+ const double fPowN = pow( f, N );
+ if ( fPowN - 1 <= numeric_limits<double>::min() )
+ h0 = T / N;
else
+ h0 = T * ( f - 1 )/( fPowN - 1 );
+
+ const double zeroLen = std::numeric_limits<double>::min();
+
+ // create intermediate nodes
+ double hSum = 0, hi = h0/f;
+ size_t iSeg = 1;
+ for ( size_t iStep = 1; iStep < edge._nodes.size(); ++iStep )
{
- if ( !edge._sWOL.IsNull() )
+ // compute an intermediate position
+ hi *= f;
+ hSum += hi;
+ while ( hSum > segLen[iSeg] && iSeg < segLen.size()-1)
+ ++iSeg;
+ int iPrevSeg = iSeg-1;
+ while ( fabs( segLen[iPrevSeg] - segLen[iSeg]) <= zeroLen && iPrevSeg > 0 )
+ --iPrevSeg;
+ double r = ( segLen[iSeg] - hSum ) / ( segLen[iSeg] - segLen[iPrevSeg] );
+ gp_Pnt pos = r * edge._pos[iPrevSeg] + (1-r) * edge._pos[iSeg];
+
+ SMDS_MeshNode*& node = const_cast< SMDS_MeshNode*& >( edge._nodes[ iStep ]);
+ if ( !eos._sWOL.IsNull() )
{
- // make average pos from new and current parameters
+ // compute XYZ by parameters <pos>
if ( isOnEdge )
{
- u = 0.5 * ( u + helper.GetNodeU( geomEdge, node ));
- pos = curve->Value( u ).Transformed(loc);
-
- SMDS_EdgePosition* epos = static_cast<SMDS_EdgePosition*>( node->GetPosition() );
- epos->SetUParameter( u );
+ u = pos.X();
+ if ( !node )
+ pos = curve->Value( u ).Transformed(loc);
+ }
+ else
+ {
+ uv.SetCoord( pos.X(), pos.Y() );
+ if ( !node )
+ pos = surface->Value( pos.X(), pos.Y() ).Transformed(loc);
+ }
+ }
+ // create or update the node
+ if ( !node )
+ {
+ node = helper.AddNode( pos.X(), pos.Y(), pos.Z());
+ if ( !eos._sWOL.IsNull() )
+ {
+ if ( isOnEdge )
+ getMeshDS()->SetNodeOnEdge( node, geomEdge, u );
+ else
+ getMeshDS()->SetNodeOnFace( node, geomFace, uv.X(), uv.Y() );
}
else
{
- uv = 0.5 * ( uv + helper.GetNodeUV( geomFace, node ));
- pos = surface->Value( uv.X(), uv.Y()).Transformed(loc);
+ getMeshDS()->SetNodeInVolume( node, helper.GetSubShapeID() );
+ }
+ }
+ else
+ {
+ if ( !eos._sWOL.IsNull() )
+ {
+ // make average pos from new and current parameters
+ if ( isOnEdge )
+ {
+ u = 0.5 * ( u + helper.GetNodeU( geomEdge, node ));
+ pos = curve->Value( u ).Transformed(loc);
- SMDS_FacePosition* fpos = static_cast<SMDS_FacePosition*>( node->GetPosition() );
- fpos->SetUParameter( uv.X() );
- fpos->SetVParameter( uv.Y() );
+ SMDS_EdgePosition* epos = static_cast<SMDS_EdgePosition*>( node->GetPosition() );
+ epos->SetUParameter( u );
+ }
+ else
+ {
+ uv = 0.5 * ( uv + helper.GetNodeUV( geomFace, node ));
+ pos = surface->Value( uv.X(), uv.Y()).Transformed(loc);
+
+ SMDS_FacePosition* fpos = static_cast<SMDS_FacePosition*>( node->GetPosition() );
+ fpos->SetUParameter( uv.X() );
+ fpos->SetVParameter( uv.Y() );
+ }
}
+ node->setXYZ( pos.X(), pos.Y(), pos.Z() );
}
- node->setXYZ( pos.X(), pos.Y(), pos.Z() );
+ } // loop on edge._nodes
+
+ if ( !eos._sWOL.IsNull() ) // prepare for shrink()
+ {
+ if ( isOnEdge )
+ edge._pos.back().SetCoord( u, 0,0);
+ else
+ edge._pos.back().SetCoord( uv.X(), uv.Y() ,0);
+
+ if ( edgeOnSameNode )
+ edgeOnSameNode->_pos.back() = edge._pos.back();
}
- } // loop on edge._nodes
- if ( !edge._sWOL.IsNull() ) // prepare for shrink()
- {
- if ( isOnEdge )
- edge._pos.back().SetCoord( u, 0,0);
- else
- edge._pos.back().SetCoord( uv.X(), uv.Y() ,0);
+ } // loop on eos._edges to create nodes
- if ( edgeOnSameNode )
- edgeOnSameNode->_pos.back() = edge._pos.back();
- }
- } // loop on data._edges to create nodes
+ if ( !getMeshDS()->IsEmbeddedMode() )
+ // Log node movement
+ for ( size_t i = 0; i < eos._edges.size(); ++i )
+ {
+ SMESH_TNodeXYZ p ( eos._edges[i]->_nodes.back() );
+ getMeshDS()->MoveNode( p._node, p.X(), p.Y(), p.Z() );
+ }
+ }
- if ( !getMeshDS()->IsEmbeddedMode() )
- // Log node movement
- for ( size_t i = 0; i < data._edges.size(); ++i )
- {
- _LayerEdge& edge = *data._edges[i];
- SMESH_TNodeXYZ p ( edge._nodes.back() );
- getMeshDS()->MoveNode( p._node, p.X(), p.Y(), p.Z() );
- }
// Create volumes
// EDGE's to shrink
map< TGeomID, _Shrinker1D > e2shrMap;
+ vector< _EdgesOnShape* > subEOS;
vector< _LayerEdge* > lEdges;
// loop on FACES to srink mesh on
if ( !smoothNodes.empty() )
{
vector<_Simplex> simplices;
- getSimplices( smoothNodes[0], simplices, ignoreShapes );
+ _Simplex::GetSimplices( smoothNodes[0], simplices, ignoreShapes );
helper.GetNodeUV( F, simplices[0]._nPrev, 0, &isOkUV ); // fix UV of silpmex nodes
helper.GetNodeUV( F, simplices[0]._nNext, 0, &isOkUV );
gp_XY uv = helper.GetNodeUV( F, smoothNodes[0], 0, &isOkUV );
}
// Find _LayerEdge's inflated along F
+ subEOS.clear();
lEdges.clear();
{
- set< TGeomID > subIDs;
- SMESH_subMeshIteratorPtr subIt = sm->getDependsOnIterator(/*includeSelf=*/false);
+ SMESH_subMeshIteratorPtr subIt = sm->getDependsOnIterator(/*includeSelf=*/false,
+ /*complexFirst=*/true); //!!!
while ( subIt->more() )
- subIDs.insert( subIt->next()->GetId() );
-
- int iBeg, iEnd = 0;
- for ( int iS = 0; iS < data._endEdgeOnShape.size() && !subIDs.empty(); ++iS )
{
- iBeg = iEnd;
- iEnd = data._endEdgeOnShape[ iS ];
- TGeomID shapeID = data._edges[ iBeg ]->_nodes[0]->getshapeId();
- set< TGeomID >::iterator idIt = subIDs.find( shapeID );
- if ( idIt == subIDs.end() ||
- data._edges[ iBeg ]->_sWOL.IsNull() ) continue;
- subIDs.erase( idIt );
+ const TGeomID subID = subIt->next()->GetId();
+ if ( data._noShrinkShapes.count( subID ))
+ continue;
+ _EdgesOnShape* eos = data.GetShapeEdges( subID );
+ if ( !eos || eos->_sWOL.IsNull() ) continue;
- if ( !data._noShrinkShapes.count( shapeID ))
- for ( ; iBeg < iEnd; ++iBeg )
- {
- lEdges.push_back( data._edges[ iBeg ] );
- prepareEdgeToShrink( *data._edges[ iBeg ], F, helper, smDS );
- }
+ subEOS.push_back( eos );
+
+ for ( size_t i = 0; i < eos->_edges.size(); ++i )
+ {
+ lEdges.push_back( eos->_edges[ i ] );
+ prepareEdgeToShrink( *eos->_edges[ i ], *eos, helper, smDS );
+ }
}
}
while ( fIt->more() )
if ( const SMDS_MeshElement* f = fIt->next() )
dumpChangeNodes( f );
+ dumpFunctionEnd();
// Replace source nodes by target nodes in mesh faces to shrink
dumpFunction(SMESH_Comment("replNodesOnFace")<<f2sd->first); // debug
const SMDS_MeshNode* nodes[20];
- for ( size_t i = 0; i < lEdges.size(); ++i )
+ for ( size_t iS = 0; iS < subEOS.size(); ++iS )
{
- _LayerEdge& edge = *lEdges[i];
- const SMDS_MeshNode* srcNode = edge._nodes[0];
- const SMDS_MeshNode* tgtNode = edge._nodes.back();
- SMDS_ElemIteratorPtr fIt = srcNode->GetInverseElementIterator(SMDSAbs_Face);
- while ( fIt->more() )
+ _EdgesOnShape& eos = * subEOS[ iS ];
+ for ( size_t i = 0; i < eos._edges.size(); ++i )
{
- const SMDS_MeshElement* f = fIt->next();
- if ( !smDS->Contains( f ))
- continue;
- SMDS_NodeIteratorPtr nIt = f->nodeIterator();
- for ( int iN = 0; nIt->more(); ++iN )
+ _LayerEdge& edge = *eos._edges[i];
+ const SMDS_MeshNode* srcNode = edge._nodes[0];
+ const SMDS_MeshNode* tgtNode = edge._nodes.back();
+ SMDS_ElemIteratorPtr fIt = srcNode->GetInverseElementIterator(SMDSAbs_Face);
+ while ( fIt->more() )
{
- const SMDS_MeshNode* n = nIt->next();
- nodes[iN] = ( n == srcNode ? tgtNode : n );
+ const SMDS_MeshElement* f = fIt->next();
+ if ( !smDS->Contains( f ))
+ continue;
+ SMDS_NodeIteratorPtr nIt = f->nodeIterator();
+ for ( int iN = 0; nIt->more(); ++iN )
+ {
+ const SMDS_MeshNode* n = nIt->next();
+ nodes[iN] = ( n == srcNode ? tgtNode : n );
+ }
+ helper.GetMeshDS()->ChangeElementNodes( f, nodes, f->NbNodes() );
+ dumpChangeNodes( f );
}
- helper.GetMeshDS()->ChangeElementNodes( f, nodes, f->NbNodes() );
- dumpChangeNodes( f );
}
}
+ dumpFunctionEnd();
// find out if a FACE is concave
const bool isConcaveFace = isConcave( F, helper );
const SMDS_MeshNode* n = smoothNodes[i];
nodesToSmooth[ i ]._node = n;
// src nodes must be replaced by tgt nodes to have tgt nodes in _simplices
- getSimplices( n, nodesToSmooth[ i ]._simplices, ignoreShapes, NULL, sortSimplices );
+ _Simplex::GetSimplices( n, nodesToSmooth[ i ]._simplices, ignoreShapes, 0, sortSimplices);
// fix up incorrect uv of nodes on the FACE
helper.GetNodeUV( F, n, 0, &isOkUV);
dumpMove( n );
}
+ dumpFunctionEnd();
}
//if ( nodesToSmooth.empty() ) continue;
// Find EDGE's to shrink and set simpices to LayerEdge's
set< _Shrinker1D* > eShri1D;
{
- for ( size_t i = 0; i < lEdges.size(); ++i )
+ for ( size_t iS = 0; iS < subEOS.size(); ++iS )
{
- _LayerEdge* edge = lEdges[i];
- if ( edge->_sWOL.ShapeType() == TopAbs_EDGE )
+ _EdgesOnShape& eos = * subEOS[ iS ];
+ if ( eos.SWOLType() == TopAbs_EDGE )
{
- TGeomID edgeIndex = getMeshDS()->ShapeToIndex( edge->_sWOL );
- _Shrinker1D& srinker = e2shrMap[ edgeIndex ];
+ SMESH_subMesh* edgeSM = _mesh->GetSubMesh( eos._sWOL );
+ _Shrinker1D& srinker = e2shrMap[ edgeSM->GetId() ];
eShri1D.insert( & srinker );
- srinker.AddEdge( edge, helper );
- VISCOUS_3D::ToClearSubWithMain( _mesh->GetSubMesh( edge->_sWOL ), data._solid );
+ srinker.AddEdge( eos._edges[0], eos, helper );
+ VISCOUS_3D::ToClearSubWithMain( edgeSM, data._solid );
// restore params of nodes on EGDE if the EDGE has been already
- // srinked while srinking another FACE
+ // srinked while srinking other FACE
srinker.RestoreParams();
}
- getSimplices( /*tgtNode=*/edge->_nodes.back(), edge->_simplices, ignoreShapes );
+ for ( size_t i = 0; i < eos._edges.size(); ++i )
+ {
+ _LayerEdge& edge = * eos._edges[i];
+ _Simplex::GetSimplices( /*tgtNode=*/edge._nodes.back(), edge._simplices, ignoreShapes );
+ }
}
}
// -----------------------------------------------
dumpFunction(SMESH_Comment("moveBoundaryOnF")<<f2sd->first<<"_st"<<shriStep ); // debug
shrinked = false;
- for ( size_t i = 0; i < lEdges.size(); ++i )
+ for ( size_t iS = 0; iS < subEOS.size(); ++iS )
{
- shrinked |= lEdges[i]->SetNewLength2d( surface,F,helper );
+ _EdgesOnShape& eos = * subEOS[ iS ];
+ for ( size_t i = 0; i < eos._edges.size(); ++i )
+ {
+ shrinked |= eos._edges[i]->SetNewLength2d( surface, F, eos, helper );
+ }
}
dumpFunctionEnd();
int oldBadNb = badNb;
badNb = 0;
moved = false;
+ // '% 5' minimizes NB FUNCTIONS on viscous_layers_00/B2 case
+ _SmoothNode::SmoothType smooTy = ( smooStep % 5 ) ? smoothType : _SmoothNode::LAPLACIAN;
for ( size_t i = 0; i < nodesToSmooth.size(); ++i )
{
- moved |= nodesToSmooth[i].Smooth( badNb,surface,helper,refSign,
- smoothType, /*set3D=*/isConcaveFace);
+ moved |= nodesToSmooth[i].Smooth( badNb, surface, helper, refSign,
+ smooTy, /*set3D=*/isConcaveFace);
}
if ( badNb < oldBadNb )
nbNoImpSteps = 0;
n = usedNodes.find( nodesToSmooth[ i ]._node );
if ( n != usedNodes.end())
{
- getSimplices( nodesToSmooth[ i ]._node,
- nodesToSmooth[ i ]._simplices,
- ignoreShapes, NULL,
- /*sortSimplices=*/ smoothType == _SmoothNode::ANGULAR );
+ _Simplex::GetSimplices( nodesToSmooth[ i ]._node,
+ nodesToSmooth[ i ]._simplices,
+ ignoreShapes, NULL,
+ /*sortSimplices=*/ smoothType == _SmoothNode::ANGULAR );
usedNodes.erase( n );
}
}
n = usedNodes.find( /*tgtNode=*/ lEdges[i]->_nodes.back() );
if ( n != usedNodes.end())
{
- getSimplices( lEdges[i]->_nodes.back(),
- lEdges[i]->_simplices,
- ignoreShapes );
+ _Simplex::GetSimplices( lEdges[i]->_nodes.back(),
+ lEdges[i]->_simplices,
+ ignoreShapes );
usedNodes.erase( n );
}
}
//================================================================================
bool _ViscousBuilder::prepareEdgeToShrink( _LayerEdge& edge,
- const TopoDS_Face& F,
+ _EdgesOnShape& eos,
SMESH_MesherHelper& helper,
const SMESHDS_SubMesh* faceSubMesh)
{
const SMDS_MeshNode* srcNode = edge._nodes[0];
const SMDS_MeshNode* tgtNode = edge._nodes.back();
- if ( edge._sWOL.ShapeType() == TopAbs_FACE )
+ if ( eos.SWOLType() == TopAbs_FACE )
{
- gp_XY srcUV( edge._pos[0].X(), edge._pos[0].Y() );//helper.GetNodeUV( F, srcNode );
- gp_XY tgtUV = edge.LastUV( F ); //helper.GetNodeUV( F, tgtNode );
+ gp_XY srcUV ( edge._pos[0].X(), edge._pos[0].Y() ); //helper.GetNodeUV( F, srcNode );
+ gp_XY tgtUV = edge.LastUV( TopoDS::Face( eos._sWOL ), eos ); //helper.GetNodeUV( F, tgtNode );
gp_Vec2d uvDir( srcUV, tgtUV );
double uvLen = uvDir.Magnitude();
uvDir /= uvLen;
}
else // _sWOL is TopAbs_EDGE
{
- const TopoDS_Edge& E = TopoDS::Edge( edge._sWOL );
+ const TopoDS_Edge& E = TopoDS::Edge( eos._sWOL );
SMESHDS_SubMesh* edgeSM = getMeshDS()->MeshElements( E );
if ( !edgeSM || edgeSM->NbElements() == 0 )
return error(SMESH_Comment("Not meshed EDGE ") << getMeshDS()->ShapeToIndex( E ));
bool _LayerEdge::SetNewLength2d( Handle(Geom_Surface)& surface,
const TopoDS_Face& F,
+ _EdgesOnShape& eos,
SMESH_MesherHelper& helper )
{
if ( _pos.empty() )
SMDS_MeshNode* tgtNode = const_cast< SMDS_MeshNode*& >( _nodes.back() );
- if ( _sWOL.ShapeType() == TopAbs_FACE )
+ if ( eos.SWOLType() == TopAbs_FACE )
{
gp_XY curUV = helper.GetNodeUV( F, tgtNode );
gp_Pnt2d tgtUV( _pos[0].X(), _pos[0].Y() );
}
else // _sWOL is TopAbs_EDGE
{
- const TopoDS_Edge& E = TopoDS::Edge( _sWOL );
+ const TopoDS_Edge& E = TopoDS::Edge( eos._sWOL );
const SMDS_MeshNode* n2 = _simplices[0]._nPrev;
SMDS_EdgePosition* tgtPos = static_cast<SMDS_EdgePosition*>( tgtNode->GetPosition() );
edgeSize.back() = edgeSize.front();
gp_XY newPos(0,0);
- int nbEdges = 0;
+ //int nbEdges = 0;
double sumSize = 0;
for ( size_t i = 1; i < edgeDir.size(); ++i )
{
distToN = -distToN;
newPos += ( p + bisec * distToN ) * ( edgeSize[i1] + edgeSize[i] );
- ++nbEdges;
+ //++nbEdges;
sumSize += edgeSize[i1] + edgeSize[i];
}
newPos /= /*nbEdges * */sumSize;
_SolidData::~_SolidData()
{
- for ( size_t i = 0; i < _edges.size(); ++i )
- {
- if ( _edges[i] && _edges[i]->_2neibors )
- delete _edges[i]->_2neibors;
- delete _edges[i];
+ TNode2Edge::iterator n2e = _n2eMap.begin();
+ for ( ; n2e != _n2eMap.end(); ++n2e )
+ {
+ _LayerEdge* & e = n2e->second;
+ if ( e && e->_2neibors )
+ delete e->_2neibors;
+ delete e;
+ e = NULL;
}
- _edges.clear();
+ _n2eMap.clear();
}
//================================================================================
/*!
- * \brief Add a _LayerEdge inflated along the EDGE
+ * \brief Keep a _LayerEdge inflated along the EDGE
*/
//================================================================================
-void _Shrinker1D::AddEdge( const _LayerEdge* e, SMESH_MesherHelper& helper )
+void _Shrinker1D::AddEdge( const _LayerEdge* e,
+ _EdgesOnShape& eos,
+ SMESH_MesherHelper& helper )
{
// init
if ( _nodes.empty() )
// check _LayerEdge
if ( e == _edges[0] || e == _edges[1] )
return;
- if ( e->_sWOL.IsNull() || e->_sWOL.ShapeType() != TopAbs_EDGE )
+ if ( eos.SWOLType() != TopAbs_EDGE )
throw SALOME_Exception(LOCALIZED("Wrong _LayerEdge is added"));
- if ( _edges[0] && _edges[0]->_sWOL != e->_sWOL )
+ if ( _edges[0] && !_geomEdge.IsSame( eos._sWOL ))
throw SALOME_Exception(LOCALIZED("Wrong _LayerEdge is added"));
// store _LayerEdge
- const TopoDS_Edge& E = TopoDS::Edge( e->_sWOL );
+ _geomEdge = TopoDS::Edge( eos._sWOL );
double f,l;
- BRep_Tool::Range( E, f,l );
- double u = helper.GetNodeU( E, e->_nodes[0], e->_nodes.back());
+ BRep_Tool::Range( _geomEdge, f,l );
+ double u = helper.GetNodeU( _geomEdge, e->_nodes[0], e->_nodes.back());
_edges[ u < 0.5*(f+l) ? 0 : 1 ] = e;
// Update _nodes
if ( _nodes.empty() )
{
- SMESHDS_SubMesh * eSubMesh = helper.GetMeshDS()->MeshElements( E );
+ SMESHDS_SubMesh * eSubMesh = helper.GetMeshDS()->MeshElements( _geomEdge );
if ( !eSubMesh || eSubMesh->NbNodes() < 1 )
return;
TopLoc_Location loc;
- Handle(Geom_Curve) C = BRep_Tool::Curve(E, loc, f,l);
+ Handle(Geom_Curve) C = BRep_Tool::Curve( _geomEdge, loc, f,l );
GeomAdaptor_Curve aCurve(C, f,l);
const double totLen = GCPnts_AbscissaPoint::Length(aCurve, f, l);
node == tgtNode0 || node == tgtNode1 )
continue; // refinement nodes
_nodes.push_back( node );
- _initU.push_back( helper.GetNodeU( E, node ));
+ _initU.push_back( helper.GetNodeU( _geomEdge, node ));
double len = GCPnts_AbscissaPoint::Length(aCurve, f, _initU.back());
_normPar.push_back( len / totLen );
}
_done = (( !_edges[0] || _edges[0]->_pos.empty() ) &&
( !_edges[1] || _edges[1]->_pos.empty() ));
- const TopoDS_Edge& E = TopoDS::Edge( e->_sWOL );
double f,l;
if ( set3D || _done )
{
- Handle(Geom_Curve) C = BRep_Tool::Curve(E, f,l);
+ Handle(Geom_Curve) C = BRep_Tool::Curve(_geomEdge, f,l);
GeomAdaptor_Curve aCurve(C, f,l);
if ( _edges[0] )
- f = helper.GetNodeU( E, _edges[0]->_nodes.back(), _nodes[0] );
+ f = helper.GetNodeU( _geomEdge, _edges[0]->_nodes.back(), _nodes[0] );
if ( _edges[1] )
- l = helper.GetNodeU( E, _edges[1]->_nodes.back(), _nodes.back() );
+ l = helper.GetNodeU( _geomEdge, _edges[1]->_nodes.back(), _nodes.back() );
double totLen = GCPnts_AbscissaPoint::Length( aCurve, f, l );
for ( size_t i = 0; i < _nodes.size(); ++i )
}
else
{
- BRep_Tool::Range( E, f,l );
+ BRep_Tool::Range( _geomEdge, f,l );
if ( _edges[0] )
- f = helper.GetNodeU( E, _edges[0]->_nodes.back(), _nodes[0] );
+ f = helper.GetNodeU( _geomEdge, _edges[0]->_nodes.back(), _nodes[0] );
if ( _edges[1] )
- l = helper.GetNodeU( E, _edges[1]->_nodes.back(), _nodes.back() );
+ l = helper.GetNodeU( _geomEdge, _edges[1]->_nodes.back(), _nodes.back() );
for ( size_t i = 0; i < _nodes.size(); ++i )
{
{
if ( !_edges[i] ) continue;
- SMESHDS_SubMesh * eSubMesh = mesh->MeshElements( _edges[i]->_sWOL );
+ SMESHDS_SubMesh * eSubMesh = mesh->MeshElements( _geomEdge );
if ( !eSubMesh ) return;
const SMDS_MeshNode* srcNode = _edges[i]->_nodes[0];
const SMDS_MeshNode* tgtNode = _edges[i]->_nodes.back();
for ( int isFirst = 0; isFirst < 2; ++isFirst )
{
_LayerEdge* edge = isFirst ? ledges.front() : ledges.back();
- if ( !edge->_sWOL.IsNull() && edge->_sWOL.ShapeType() == TopAbs_EDGE )
+ _EdgesOnShape* eos = data.GetShapeEdges( edge );
+ if ( eos && eos->SWOLType() == TopAbs_EDGE )
{
vector< const SMDS_MeshNode*>& nn = edge->_nodes;
if ( nn.size() < 2 || nn[1]->GetInverseElementIterator( SMDSAbs_Edge )->more() )
continue;
- helper.SetSubShape( edge->_sWOL );
+ helper.SetSubShape( eos->_sWOL );
helper.SetElementsOnShape( true );
for ( size_t z = 1; z < nn.size(); ++z )
helper.AddEdge( nn[z-1], nn[z] );
}
}
- }
- }
+
+ } // loop on EDGE's
+ } // loop on _SolidData's
return true;
}