X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=blobdiff_plain;f=src%2FStdMeshers%2FStdMeshers_Regular_1D.cxx;h=32270cdcc92af858c2ebf614bc383240250faf05;hp=7025642b3b9bbdc5c5c53b93e171fd6a00a24de8;hb=70c33e5f83059e589c93b7818348e3c003eaec4d;hpb=65c1beab50fcec33a4e988c10b3fedb081543164 diff --git a/src/StdMeshers/StdMeshers_Regular_1D.cxx b/src/StdMeshers/StdMeshers_Regular_1D.cxx index 7025642b3..32270cdcc 100644 --- a/src/StdMeshers/StdMeshers_Regular_1D.cxx +++ b/src/StdMeshers/StdMeshers_Regular_1D.cxx @@ -29,6 +29,7 @@ #include "SMDS_MeshElement.hxx" #include "SMDS_MeshNode.hxx" +#include "SMESHDS_Mesh.hxx" #include "SMESH_Comment.hxx" #include "SMESH_Gen.hxx" #include "SMESH_HypoFilter.hxx" @@ -37,8 +38,8 @@ #include "SMESH_subMeshEventListener.hxx" #include "StdMeshers_Adaptive1D.hxx" #include "StdMeshers_Arithmetic1D.hxx" -#include "StdMeshers_Geometric1D.hxx" #include "StdMeshers_AutomaticLength.hxx" +#include "StdMeshers_Geometric1D.hxx" #include "StdMeshers_Deflection1D.hxx" #include "StdMeshers_Distribution.hxx" #include "StdMeshers_FixedPoints1D.hxx" @@ -49,8 +50,8 @@ #include "StdMeshers_SegmentLengthAroundVertex.hxx" #include "StdMeshers_StartEndLength.hxx" -#include "Utils_SALOME_Exception.hxx" -#include "utilities.h" +#include +#include #include #include @@ -121,10 +122,11 @@ bool StdMeshers_Regular_1D::CheckHypothesis( SMESH_Mesh& aMesh, const TopoDS_Shape& aShape, Hypothesis_Status& aStatus ) { - _hypType = NONE; - _quadraticMesh = false; + _hypType = NONE; + _quadraticMesh = false; _onlyUnaryInput = true; + // check propagation in a redefined GetUsedHypothesis() const list & hyps = GetUsedHypothesis(aMesh, aShape, /*ignoreAuxiliaryHyps=*/false); @@ -155,13 +157,17 @@ bool StdMeshers_Regular_1D::CheckHypothesis( SMESH_Mesh& aMesh, string hypName = theHyp->GetName(); - if ( hypName == "LocalLength" ) + if ( !_mainEdge.IsNull() && _hypType == DISTRIB_PROPAGATION ) + { + aStatus = SMESH_Hypothesis::HYP_OK; + } + else if ( hypName == "LocalLength" ) { const StdMeshers_LocalLength * hyp = dynamic_cast (theHyp); ASSERT(hyp); _value[ BEG_LENGTH_IND ] = hyp->GetLength(); - _value[ PRECISION_IND ] = hyp->GetPrecision(); + _value[ PRECISION_IND ] = hyp->GetPrecision(); ASSERT( _value[ BEG_LENGTH_IND ] > 0 ); _hypType = LOCAL_LENGTH; aStatus = SMESH_Hypothesis::HYP_OK; @@ -385,6 +391,7 @@ static bool computeParamByFunc(Adaptor3d_Curve& C3d, } if ( theReverse ) theParams.reverse(); + return true; } @@ -392,15 +399,15 @@ static bool computeParamByFunc(Adaptor3d_Curve& C3d, //================================================================================ /*! * \brief adjust internal node parameters so that the last segment length == an - * \param a1 - the first segment length - * \param an - the last segment length - * \param U1 - the first edge parameter - * \param Un - the last edge parameter - * \param length - the edge length - * \param C3d - the edge curve - * \param theParams - internal node parameters to adjust - * \param adjustNeighbors2an - to adjust length of segments next to the last one - * and not to remove parameters + * \param a1 - the first segment length + * \param an - the last segment length + * \param U1 - the first edge parameter + * \param Un - the last edge parameter + * \param length - the edge length + * \param C3d - the edge curve + * \param theParams - internal node parameters to adjust + * \param adjustNeighbors2an - to adjust length of segments next to the last one + * and not to remove parameters */ //================================================================================ @@ -415,16 +422,17 @@ static void compensateError(double a1, double an, if ( a1 + an <= length && nPar > 1 ) { bool reverse = ( U1 > Un ); - GCPnts_AbscissaPoint Discret(C3d, reverse ? an : -an, Un); + double tol = Min( Precision::Confusion(), 0.01 * an ); + GCPnts_AbscissaPoint Discret( tol, C3d, reverse ? an : -an, Un ); if ( !Discret.IsDone() ) return; double Utgt = Discret.Parameter(); // target value of the last parameter list::reverse_iterator itU = theParams.rbegin(); double Ul = *itU++; // real value of the last parameter double dUn = Utgt - Ul; // parametric error of - if ( Abs(dUn) <= Precision::Confusion() ) - return; double dU = Abs( Ul - *itU ); // parametric length of the last but one segment + if ( Abs(dUn) <= 1e-3 * dU ) + return; if ( adjustNeighbors2an || Abs(dUn) < 0.5 * dU ) { // last segment is a bit shorter than it should // move the last parameter to the edge beginning } @@ -494,7 +502,7 @@ static void compensateError(double a1, double an, // * \brief Clean mesh on edges // * \param event - algo_event or compute_event itself (of SMESH_subMesh) // * \param eventType - ALGO_EVENT or COMPUTE_EVENT (of SMESH_subMesh) -// * \param subMesh - the submesh where the event occures +// * \param subMesh - the submesh where the event occurs // */ // void ProcessEvent(const int event, const int eventType, SMESH_subMesh* subMesh, // EventListenerData*, const SMESH_Hypothesis*) @@ -595,7 +603,8 @@ void StdMeshers_Regular_1D::redistributeNearVertices (SMESH_Mesh & theM { if ( !isEnd1 ) vertexLength = -vertexLength; - GCPnts_AbscissaPoint Discret(theC3d, vertexLength, l); + double tol = Min( Precision::Confusion(), 0.01 * vertexLength ); + GCPnts_AbscissaPoint Discret( tol, theC3d, vertexLength, l ); if ( Discret.IsDone() ) { if ( nPar == 0 ) theParameters.push_back( Discret.Parameter()); @@ -669,10 +678,10 @@ bool StdMeshers_Regular_1D::computeInternalParameters(SMESH_Mesh & theMesh, // Propagation Of Distribution // - if ( !_mainEdge.IsNull() && _isPropagOfDistribution ) + if ( !_mainEdge.IsNull() && _hypType == DISTRIB_PROPAGATION ) { TopoDS_Edge mainEdge = TopoDS::Edge( _mainEdge ); // should not be a reference! - _gen->Compute( theMesh, mainEdge, /*aShapeOnly=*/true, /*anUpward=*/true); + _gen->Compute( theMesh, mainEdge, SMESH_Gen::SHAPE_ONLY_UPWARD ); SMESHDS_SubMesh* smDS = theMesh.GetMeshDS()->MeshElements( mainEdge ); if ( !smDS ) @@ -705,7 +714,8 @@ bool StdMeshers_Regular_1D::computeInternalParameters(SMESH_Mesh & theMesh, size_t nbParams = 0; for ( int i = 0, nb = segLen.size()-1; i < nb; ++i, iSeg += dSeg ) { - GCPnts_AbscissaPoint Discret( theC3d, segLen[ iSeg ], param ); + double tol = Min( Precision::Confusion(), 0.01 * segLen[ iSeg ]); + GCPnts_AbscissaPoint Discret( tol, theC3d, segLen[ iSeg ], param ); if ( !Discret.IsDone() ) break; param = Discret.Parameter(); theParams.push_back( param ); @@ -733,8 +743,8 @@ bool StdMeshers_Regular_1D::computeInternalParameters(SMESH_Mesh & theMesh, { double nbseg = ceil(theLength / _value[ BEG_LENGTH_IND ]); // integer sup if (nbseg <= 0) - nbseg = 1; // degenerated edge - eltSize = theLength / nbseg; + nbseg = 1; // degenerated edge + eltSize = theLength / nbseg * ( 1. - 1e-9 ); nbSegments = (int) nbseg; } else if ( _hypType == LOCAL_LENGTH ) @@ -802,7 +812,7 @@ bool StdMeshers_Regular_1D::computeInternalParameters(SMESH_Mesh & theMesh, if ( theReverse ) scale = 1.0 / scale; - double alpha = pow(scale, 1.0 / (nbSegments - 1)); + double alpha = pow(scale, 1.0 / (nbSegments - 1)); double factor = (l - f) / (1.0 - pow(alpha, nbSegments)); for (int i = 1; i < nbSegments; i++) { @@ -811,10 +821,12 @@ bool StdMeshers_Regular_1D::computeInternalParameters(SMESH_Mesh & theMesh, } } const double lenFactor = theLength/(l-f); + const double minSegLen = Min( theParams.front() - f, l - theParams.back() ); + const double tol = Min( Precision::Confusion(), 0.01 * minSegLen ); list::iterator u = theParams.begin(), uEnd = theParams.end(); for ( ; u != uEnd; ++u ) { - GCPnts_AbscissaPoint Discret( theC3d, ((*u)-f) * lenFactor, f ); + GCPnts_AbscissaPoint Discret( tol, theC3d, ((*u)-f) * lenFactor, f ); if ( Discret.IsDone() ) *u = Discret.Parameter(); } @@ -844,9 +856,13 @@ bool StdMeshers_Regular_1D::computeInternalParameters(SMESH_Mesh & theMesh, return false; } } - GCPnts_UniformAbscissa Discret(theC3d, eltSize, f, l); + + double tol = Min( Precision::Confusion(), 0.01 * eltSize ); + GCPnts_UniformAbscissa Discret(theC3d, nbSegments + 1, f, l, tol ); if ( !Discret.IsDone() ) return error( "GCPnts_UniformAbscissa failed"); + if ( Discret.NbPoints() < nbSegments + 1 ) + Discret.Initialize(theC3d, nbSegments + 2, f, l, tol ); int NbPoints = Min( Discret.NbPoints(), nbSegments + 1 ); for ( int i = 2; i < NbPoints; i++ ) // skip 1st and last points @@ -858,6 +874,7 @@ bool StdMeshers_Regular_1D::computeInternalParameters(SMESH_Mesh & theMesh, return true; } + case BEG_END_LENGTH: { // geometric progression: SUM(n) = ( a1 - an * q ) / ( 1 - q ) = theLength @@ -869,14 +886,15 @@ bool StdMeshers_Regular_1D::computeInternalParameters(SMESH_Mesh & theMesh, return error ( SMESH_Comment("Invalid segment lengths (")< at the distance // from the point of parameter . - GCPnts_AbscissaPoint Discret( theC3d, eltSize, param ); + GCPnts_AbscissaPoint Discret( tol, theC3d, eltSize, param ); if ( !Discret.IsDone() ) break; param = Discret.Parameter(); if ( f < param && param < l ) @@ -903,10 +921,11 @@ bool StdMeshers_Regular_1D::computeInternalParameters(SMESH_Mesh & theMesh, double q = ( an - a1 ) / ( 2 *theLength/( a1 + an ) - 1 ); int n = int(fabs(q) > numeric_limits::min() ? ( 1+( an-a1 )/q ) : ( 1+theLength/a1 )); - double U1 = theReverse ? l : f; - double Un = theReverse ? f : l; - double param = U1; + double U1 = theReverse ? l : f; + double Un = theReverse ? f : l; + double param = U1; double eltSize = a1; + double tol = Min( Precision::Confusion(), 0.01 * Min( a1, an )); if ( theReverse ) { eltSize = -eltSize; q = -q; @@ -914,7 +933,7 @@ bool StdMeshers_Regular_1D::computeInternalParameters(SMESH_Mesh & theMesh, while ( n-- > 0 && eltSize * ( Un - U1 ) > 0 ) { // computes a point on a curve at the distance // from the point of parameter . - GCPnts_AbscissaPoint Discret( theC3d, eltSize, param ); + GCPnts_AbscissaPoint Discret( tol, theC3d, eltSize, param ); if ( !Discret.IsDone() ) break; param = Discret.Parameter(); if ( param > f && param < l ) @@ -945,7 +964,8 @@ bool StdMeshers_Regular_1D::computeInternalParameters(SMESH_Mesh & theMesh, while ( true ) { // computes a point on a curve at the distance // from the point of parameter . - GCPnts_AbscissaPoint Discret( theC3d, eltSize, param ); + double tol = Min( Precision::Confusion(), 0.01 * eltSize ); + GCPnts_AbscissaPoint Discret( tol, theC3d, eltSize, param ); if ( !Discret.IsDone() ) break; param = Discret.Parameter(); if ( f < param && param < l ) @@ -977,96 +997,86 @@ bool StdMeshers_Regular_1D::computeInternalParameters(SMESH_Mesh & theMesh, case FIXED_POINTS_1D: { const std::vector& aPnts = _fpHyp->GetPoints(); - const std::vector& nbsegs = _fpHyp->GetNbSegments(); + std::vector nbsegs = _fpHyp->GetNbSegments(); + + // sort normalized params, taking into account theReverse TColStd_SequenceOfReal Params; + double tol = 1e-7 / theLength; // GCPnts_UniformAbscissa allows u2-u1 > 1e-7 for ( size_t i = 0; i < aPnts.size(); i++ ) { - if( aPnts[i]<0.0001 || aPnts[i]>0.9999 ) continue; - int j=1; + if( aPnts[i] < tol || aPnts[i] > 1 - tol ) + continue; + double u = theReverse ? ( 1 - aPnts[i] ) : aPnts[i]; + int j = 1; bool IsExist = false; for ( ; j <= Params.Length(); j++ ) { - if ( Abs( aPnts[i] - Params.Value(j) ) < 1e-4 ) { + if ( Abs( u - Params.Value(j) ) < tol ) { IsExist = true; break; } - if ( aPnts[i] uVec( Params.Length() + 2 ); + uVec[ 0 ] = theFirstU; + double abscissa; + for ( int i = 1; i <= Params.Length(); i++ ) { - int nbseg = ( i > (int)nbsegs.size()-1 ) ? nbsegs[0] : nbsegs[i]; - segmentSize = Params.Value( i+1 ) * theLength - currAbscissa; - currAbscissa += segmentSize; - GCPnts_AbscissaPoint APnt( theC3d, sign*segmentSize, par1 ); + abscissa = Params( i ) * theLength; + tol = Min( Precision::Confusion(), 0.01 * abscissa ); + GCPnts_AbscissaPoint APnt( tol, theC3d, abscissa, theFirstU ); if ( !APnt.IsDone() ) return error( "GCPnts_AbscissaPoint failed"); - par2 = APnt.Parameter(); - eltSize = segmentSize/nbseg; - GCPnts_UniformAbscissa Discret( theC3d, eltSize, par1, par2 ); - if ( theReverse ) - Discret.Initialize( theC3d, eltSize, par2, par1 ); - else - Discret.Initialize( theC3d, eltSize, par1, par2 ); - if ( !Discret.IsDone() ) - return error( "GCPnts_UniformAbscissa failed"); - int NbPoints = Discret.NbPoints(); - list tmpParams; - for ( int i = 2; i < NbPoints; i++ ) { - double param = Discret.Parameter(i); - tmpParams.push_back( param ); - } - if ( theReverse ) { - compensateError( eltSize, eltSize, par2, par1, segmentSize, theC3d, tmpParams ); - tmpParams.reverse(); - } - else { - compensateError( eltSize, eltSize, par1, par2, segmentSize, theC3d, tmpParams ); - } - theParams.splice( theParams.end(), tmpParams ); - theParams.push_back( par2 ); - - par1 = par2; + uVec[ i ] = APnt.Parameter(); } - // add for last - int nbseg = ( (int)nbsegs.size() > Params.Length() ) ? nbsegs[Params.Length()] : nbsegs[0]; - segmentSize = theLength - currAbscissa; - eltSize = segmentSize/nbseg; - GCPnts_UniformAbscissa Discret; + uVec.back() = theLastU; + + // divide segments if ( theReverse ) - Discret.Initialize( theC3d, eltSize, par1, lp ); - else - Discret.Initialize( theC3d, eltSize, lp, par1 ); - if ( !Discret.IsDone() ) - return error( "GCPnts_UniformAbscissa failed"); - int NbPoints = Discret.NbPoints(); - list tmpParams; - for ( int i = 2; i < NbPoints; i++ ) { - double param = Discret.Parameter(i); - tmpParams.push_back( param ); + { + if ((int) nbsegs.size() > Params.Length() + 1 ) + nbsegs.resize( Params.Length() + 1 ); + std::reverse( nbsegs.begin(), nbsegs.end() ); } - if ( theReverse ) { - compensateError( eltSize, eltSize, lp, par1, segmentSize, theC3d, tmpParams ); - tmpParams.reverse(); + if ( nbsegs.empty() ) + { + nbsegs.push_back( 1 ); } - else { - compensateError( eltSize, eltSize, par1, lp, segmentSize, theC3d, tmpParams ); + Params.InsertBefore( 1, 0.0 ); + Params.Append( 1.0 ); + double eltSize, segmentSize, par1, par2; + for ( size_t i = 0; i < uVec.size()-1; i++ ) + { + par1 = uVec[ i ]; + par2 = uVec[ i+1 ]; + int nbseg = ( i < nbsegs.size() ) ? nbsegs[i] : nbsegs[0]; + if ( nbseg == 1 ) + { + theParams.push_back( par2 ); + } + else + { + segmentSize = ( Params( i+2 ) - Params( i+1 )) * theLength; + eltSize = segmentSize / nbseg; + tol = Min( Precision::Confusion(), 0.01 * eltSize ); + GCPnts_UniformAbscissa Discret( theC3d, eltSize, par1, par2, tol ); + if ( !Discret.IsDone() ) + return error( "GCPnts_UniformAbscissa failed"); + if ( Discret.NbPoints() < nbseg + 1 ) { + eltSize = segmentSize / ( nbseg + 0.5 ); + Discret.Initialize( theC3d, eltSize, par1, par2, tol ); + } + int NbPoints = Discret.NbPoints(); + for ( int i = 2; i <= NbPoints; i++ ) { + double param = Discret.Parameter(i); + theParams.push_back( param ); + } + } } - theParams.splice( theParams.end(), tmpParams ); - - if ( theReverse ) - theParams.reverse(); // NPAL18025 + theParams.pop_back(); return true; } @@ -1124,15 +1134,14 @@ bool StdMeshers_Regular_1D::Compute(SMESH_Mesh & theMesh, const TopoDS_Shape & t ASSERT(!VFirst.IsNull()); ASSERT(!VLast.IsNull()); - const SMDS_MeshNode * idFirst = SMESH_Algo::VertexNode( VFirst, meshDS ); - const SMDS_MeshNode * idLast = SMESH_Algo::VertexNode( VLast, meshDS ); - if (!idFirst || !idLast) + const SMDS_MeshNode * nFirst = SMESH_Algo::VertexNode( VFirst, meshDS ); + const SMDS_MeshNode * nLast = SMESH_Algo::VertexNode( VLast, meshDS ); + if ( !nFirst || !nLast ) return error( COMPERR_BAD_INPUT_MESH, "No node on vertex"); - // remove elements created by e.g. patern mapping (PAL21999) + // remove elements created by e.g. pattern mapping (PAL21999) // CLEAN event is incorrectly ptopagated seemingly due to Propagation hyp // so TEMPORARY solution is to clean the submesh manually - //theMesh.GetSubMesh(theShape)->ComputeStateEngine( SMESH_subMesh::CLEAN ); if (SMESHDS_SubMesh * subMeshDS = meshDS->MeshElements(theShape)) { SMDS_ElemIteratorPtr ite = subMeshDS->GetElements(); @@ -1148,11 +1157,12 @@ bool StdMeshers_Regular_1D::Compute(SMESH_Mesh & theMesh, const TopoDS_Shape & t } } - if (!Curve.IsNull()) + double length = EdgeLength( E ); + if ( !Curve.IsNull() && length > 0 ) { list< double > params; bool reversed = false; - if ( theMesh.GetShapeToMesh().ShapeType() >= TopAbs_WIRE ) { + if ( theMesh.GetShapeToMesh().ShapeType() >= TopAbs_WIRE && _revEdgesIDs.empty() ) { // if the shape to mesh is WIRE or EDGE reversed = ( EE.Orientation() == TopAbs_REVERSED ); } @@ -1160,7 +1170,7 @@ bool StdMeshers_Regular_1D::Compute(SMESH_Mesh & theMesh, const TopoDS_Shape & t // take into account reversing the edge the hypothesis is propagated from // (_mainEdge.Orientation() marks mutual orientation of EDGEs in propagation chain) reversed = ( _mainEdge.Orientation() == TopAbs_REVERSED ); - if ( !_isPropagOfDistribution ) { + if ( _hypType != DISTRIB_PROPAGATION ) { int mainID = meshDS->ShapeToIndex(_mainEdge); if ( std::find( _revEdgesIDs.begin(), _revEdgesIDs.end(), mainID) != _revEdgesIDs.end()) reversed = !reversed; @@ -1171,7 +1181,6 @@ bool StdMeshers_Regular_1D::Compute(SMESH_Mesh & theMesh, const TopoDS_Shape & t reversed = !reversed; BRepAdaptor_Curve C3d( E ); - double length = EdgeLength( E ); if ( ! computeInternalParameters( theMesh, C3d, length, f, l, params, reversed, true )) { return false; } @@ -1180,19 +1189,10 @@ bool StdMeshers_Regular_1D::Compute(SMESH_Mesh & theMesh, const TopoDS_Shape & t // edge extrema (indexes : 1 & NbPoints) already in SMDS (TopoDS_Vertex) // only internal nodes receive an edge position with param on curve - const SMDS_MeshNode * idPrev = idFirst; + const SMDS_MeshNode * nPrev = nFirst; double parPrev = f; double parLast = l; - /* NPAL18025 - if (reversed) { - idPrev = idLast; - idLast = idFirst; - idFirst = idPrev; - parPrev = l; - parLast = f; - } - */ for (list::iterator itU = params.begin(); itU != params.end(); itU++) { double param = *itU; gp_Pnt P = Curve->Value(param); @@ -1204,18 +1204,18 @@ bool StdMeshers_Regular_1D::Compute(SMESH_Mesh & theMesh, const TopoDS_Shape & t if(_quadraticMesh) { // create medium node double prm = ( parPrev + param )/2; - gp_Pnt PM = Curve->Value(prm); + gp_Pnt PM = Curve->Value(prm); SMDS_MeshNode * NM = meshDS->AddNode(PM.X(), PM.Y(), PM.Z()); meshDS->SetNodeOnEdge(NM, shapeID, prm); - SMDS_MeshEdge * edge = meshDS->AddEdge(idPrev, node, NM); + SMDS_MeshEdge * edge = meshDS->AddEdge(nPrev, node, NM); meshDS->SetMeshElementOnShape(edge, shapeID); } else { - SMDS_MeshEdge * edge = meshDS->AddEdge(idPrev, node); + SMDS_MeshEdge * edge = meshDS->AddEdge(nPrev, node); meshDS->SetMeshElementOnShape(edge, shapeID); } - idPrev = node; + nPrev = node; parPrev = param; } if(_quadraticMesh) { @@ -1223,11 +1223,11 @@ bool StdMeshers_Regular_1D::Compute(SMESH_Mesh & theMesh, const TopoDS_Shape & t gp_Pnt PM = Curve->Value(prm); SMDS_MeshNode * NM = meshDS->AddNode(PM.X(), PM.Y(), PM.Z()); meshDS->SetNodeOnEdge(NM, shapeID, prm); - SMDS_MeshEdge * edge = meshDS->AddEdge(idPrev, idLast, NM); + SMDS_MeshEdge * edge = meshDS->AddEdge(nPrev, nLast, NM); meshDS->SetMeshElementOnShape(edge, shapeID); } else { - SMDS_MeshEdge* edge = meshDS->AddEdge(idPrev, idLast); + SMDS_MeshEdge* edge = meshDS->AddEdge(nPrev, nLast); meshDS->SetMeshElementOnShape(edge, shapeID); } } @@ -1240,7 +1240,7 @@ bool StdMeshers_Regular_1D::Compute(SMESH_Mesh & theMesh, const TopoDS_Shape & t gp_Pnt P = BRep_Tool::Pnt(VFirst); - const SMDS_MeshNode * idPrev = idFirst; + const SMDS_MeshNode * nPrev = nFirst; for (int i = 2; i < NbPoints; i++) { double param = f + (i - 1) * du; SMDS_MeshNode * node = meshDS->AddNode(P.X(), P.Y(), P.Z()); @@ -1249,26 +1249,26 @@ bool StdMeshers_Regular_1D::Compute(SMESH_Mesh & theMesh, const TopoDS_Shape & t double prm = param - du/2.; SMDS_MeshNode * NM = meshDS->AddNode(P.X(), P.Y(), P.Z()); meshDS->SetNodeOnEdge(NM, shapeID, prm); - SMDS_MeshEdge * edge = meshDS->AddEdge(idPrev, node, NM); + SMDS_MeshEdge * edge = meshDS->AddEdge(nPrev, node, NM); meshDS->SetMeshElementOnShape(edge, shapeID); } else { - SMDS_MeshEdge * edge = meshDS->AddEdge(idPrev, node); + SMDS_MeshEdge * edge = meshDS->AddEdge(nPrev, node); meshDS->SetMeshElementOnShape(edge, shapeID); } meshDS->SetNodeOnEdge(node, shapeID, param); - idPrev = node; + nPrev = node; } if(_quadraticMesh) { // create medium node double prm = l - du/2.; SMDS_MeshNode * NM = meshDS->AddNode(P.X(), P.Y(), P.Z()); meshDS->SetNodeOnEdge(NM, shapeID, prm); - SMDS_MeshEdge * edge = meshDS->AddEdge(idPrev, idLast, NM); + SMDS_MeshEdge * edge = meshDS->AddEdge(nPrev, nLast, NM); meshDS->SetMeshElementOnShape(edge, shapeID); } else { - SMDS_MeshEdge * edge = meshDS->AddEdge(idPrev, idLast); + SMDS_MeshEdge * edge = meshDS->AddEdge(nPrev, nLast); meshDS->SetMeshElementOnShape(edge, shapeID); } } @@ -1282,9 +1282,9 @@ bool StdMeshers_Regular_1D::Compute(SMESH_Mesh & theMesh, const TopoDS_Shape & t */ //============================================================================= -bool StdMeshers_Regular_1D::Evaluate(SMESH_Mesh & theMesh, +bool StdMeshers_Regular_1D::Evaluate(SMESH_Mesh & theMesh, const TopoDS_Shape & theShape, - MapShapeNbElems& aResMap) + MapShapeNbElems& theResMap) { if ( _hypType == NONE ) return false; @@ -1292,7 +1292,7 @@ bool StdMeshers_Regular_1D::Evaluate(SMESH_Mesh & theMesh, if ( _hypType == ADAPTIVE ) { _adaptiveHyp->GetAlgo()->InitComputeError(); - _adaptiveHyp->GetAlgo()->Evaluate( theMesh, theShape, aResMap ); + _adaptiveHyp->GetAlgo()->Evaluate( theMesh, theShape, theResMap ); return error( _adaptiveHyp->GetAlgo()->GetComputeError() ); } @@ -1310,14 +1310,14 @@ bool StdMeshers_Regular_1D::Evaluate(SMESH_Mesh & theMesh, std::vector aVec(SMDSEntity_Last,0); - if (!Curve.IsNull()) { + double length = EdgeLength( E ); + if ( !Curve.IsNull() && length > 0 ) + { list< double > params; - BRepAdaptor_Curve C3d( E ); - double length = EdgeLength( E ); if ( ! computeInternalParameters( theMesh, C3d, length, f, l, params, false, true )) { SMESH_subMesh * sm = theMesh.GetSubMesh(theShape); - aResMap.insert(std::make_pair(sm,aVec)); + theResMap.insert(std::make_pair(sm,aVec)); SMESH_ComputeErrorPtr& smError = sm->GetComputeError(); smError.reset( new SMESH_ComputeError(COMPERR_ALGO_FAILED,"Submesh can not be evaluated",this)); return false; @@ -1325,19 +1325,19 @@ bool StdMeshers_Regular_1D::Evaluate(SMESH_Mesh & theMesh, redistributeNearVertices( theMesh, C3d, length, params, VFirst, VLast ); if(_quadraticMesh) { - aVec[SMDSEntity_Node] = 2*params.size() + 1; + aVec[SMDSEntity_Node ] = 2*params.size() + 1; aVec[SMDSEntity_Quad_Edge] = params.size() + 1; } else { aVec[SMDSEntity_Node] = params.size(); aVec[SMDSEntity_Edge] = params.size() + 1; } - + } else { // Edge is a degenerated Edge : We put n = 5 points on the edge. if ( _quadraticMesh ) { - aVec[SMDSEntity_Node] = 11; + aVec[SMDSEntity_Node ] = 11; aVec[SMDSEntity_Quad_Edge] = 6; } else { @@ -1346,8 +1346,8 @@ bool StdMeshers_Regular_1D::Evaluate(SMESH_Mesh & theMesh, } } - SMESH_subMesh * sm = theMesh.GetSubMesh(theShape); - aResMap.insert(std::make_pair(sm,aVec)); + SMESH_subMesh * sm = theMesh.GetSubMesh( theShape ); + theResMap.insert( std::make_pair( sm, aVec )); return true; } @@ -1376,10 +1376,13 @@ StdMeshers_Regular_1D::GetUsedHypothesis(SMESH_Mesh & aMesh, if (nbHyp == 0 && aShape.ShapeType() == TopAbs_EDGE) { // Check, if propagated from some other edge + bool isPropagOfDistribution = false; _mainEdge = StdMeshers_Propagation::GetPropagationSource( aMesh, aShape, - _isPropagOfDistribution ); + isPropagOfDistribution ); if ( !_mainEdge.IsNull() ) { + if ( isPropagOfDistribution ) + _hypType = DISTRIB_PROPAGATION; // Propagation of 1D hypothesis from on this edge; // get non-auxiliary assigned to _mainEdge nbHyp = aMesh.GetHypotheses( _mainEdge, *compatibleFilter, _usedHypList, true );