X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=blobdiff_plain;f=src%2FStdMeshers%2FStdMeshers_Regular_1D.cxx;h=1b2ba291f06a886ea4d02ef6b8d7fee14235eb00;hp=e5c4d8eb2c8688340e1ce5fe521efda2692fd48e;hb=83b0c984cc12946923dc2640d68ba3a2700faa28;hpb=05cbd0eed80fc47431066455b03bc1e3b493e767 diff --git a/src/StdMeshers/StdMeshers_Regular_1D.cxx b/src/StdMeshers/StdMeshers_Regular_1D.cxx index e5c4d8eb2..1b2ba291f 100644 --- a/src/StdMeshers/StdMeshers_Regular_1D.cxx +++ b/src/StdMeshers/StdMeshers_Regular_1D.cxx @@ -1,4 +1,4 @@ -// Copyright (C) 2007-2015 CEA/DEN, EDF R&D, OPEN CASCADE +// Copyright (C) 2007-2016 CEA/DEN, EDF R&D, OPEN CASCADE // // Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS @@ -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" @@ -72,15 +73,15 @@ using namespace StdMeshers; //============================================================================= /*! - * + * */ //============================================================================= -StdMeshers_Regular_1D::StdMeshers_Regular_1D(int hypId, int studyId, +StdMeshers_Regular_1D::StdMeshers_Regular_1D(int hypId, + int studyId, SMESH_Gen * gen) - :SMESH_1D_Algo(hypId, studyId, gen) + :SMESH_1D_Algo( hypId, studyId, gen ) { - MESSAGE("StdMeshers_Regular_1D::StdMeshers_Regular_1D"); _name = "Regular_1D"; _shapeType = (1 << TopAbs_EDGE); _fpHyp = 0; @@ -155,7 +156,7 @@ bool StdMeshers_Regular_1D::CheckHypothesis( SMESH_Mesh& aMesh, string hypName = theHyp->GetName(); - if (hypName == "LocalLength") + if ( hypName == "LocalLength" ) { const StdMeshers_LocalLength * hyp = dynamic_cast (theHyp); @@ -167,7 +168,7 @@ bool StdMeshers_Regular_1D::CheckHypothesis( SMESH_Mesh& aMesh, aStatus = SMESH_Hypothesis::HYP_OK; } - else if (hypName == "MaxLength") + else if ( hypName == "MaxLength" ) { const StdMeshers_MaxLength * hyp = dynamic_cast (theHyp); @@ -182,9 +183,8 @@ bool StdMeshers_Regular_1D::CheckHypothesis( SMESH_Mesh& aMesh, aStatus = SMESH_Hypothesis::HYP_OK; } - else if (hypName == "NumberOfSegments") + else if ( hypName == "NumberOfSegments" ) { - MESSAGE("CheckHypothesis: NumberOfSegments"); const StdMeshers_NumberOfSegments * hyp = dynamic_cast (theHyp); ASSERT(hyp); @@ -218,7 +218,7 @@ bool StdMeshers_Regular_1D::CheckHypothesis( SMESH_Mesh& aMesh, aStatus = SMESH_Hypothesis::HYP_OK; } - else if (hypName == "Arithmetic1D") + else if ( hypName == "Arithmetic1D" ) { const StdMeshers_Arithmetic1D * hyp = dynamic_cast (theHyp); @@ -233,7 +233,7 @@ bool StdMeshers_Regular_1D::CheckHypothesis( SMESH_Mesh& aMesh, aStatus = SMESH_Hypothesis::HYP_OK; } - else if (hypName == "GeometricProgression") + else if ( hypName == "GeometricProgression" ) { const StdMeshers_Geometric1D * hyp = dynamic_cast (theHyp); @@ -248,7 +248,7 @@ bool StdMeshers_Regular_1D::CheckHypothesis( SMESH_Mesh& aMesh, aStatus = SMESH_Hypothesis::HYP_OK; } - else if (hypName == "FixedPoints1D") { + else if ( hypName == "FixedPoints1D" ) { _fpHyp = dynamic_cast (theHyp); ASSERT(_fpHyp); _hypType = FIXED_POINTS_1D; @@ -258,7 +258,7 @@ bool StdMeshers_Regular_1D::CheckHypothesis( SMESH_Mesh& aMesh, aStatus = SMESH_Hypothesis::HYP_OK; } - else if (hypName == "StartEndLength") + else if ( hypName == "StartEndLength" ) { const StdMeshers_StartEndLength * hyp = dynamic_cast (theHyp); @@ -273,7 +273,7 @@ bool StdMeshers_Regular_1D::CheckHypothesis( SMESH_Mesh& aMesh, aStatus = SMESH_Hypothesis::HYP_OK; } - else if (hypName == "Deflection1D") + else if ( hypName == "Deflection1D" ) { const StdMeshers_Deflection1D * hyp = dynamic_cast (theHyp); @@ -284,7 +284,7 @@ bool StdMeshers_Regular_1D::CheckHypothesis( SMESH_Mesh& aMesh, aStatus = SMESH_Hypothesis::HYP_OK; } - else if (hypName == "AutomaticLength") + else if ( hypName == "AutomaticLength" ) { StdMeshers_AutomaticLength * hyp = const_cast (dynamic_cast (theHyp)); @@ -294,7 +294,7 @@ bool StdMeshers_Regular_1D::CheckHypothesis( SMESH_Mesh& aMesh, _hypType = MAX_LENGTH; aStatus = SMESH_Hypothesis::HYP_OK; } - else if (hypName == "Adaptive1D") + else if ( hypName == "Adaptive1D" ) { _adaptiveHyp = dynamic_cast < const StdMeshers_Adaptive1D* >(theHyp); ASSERT(_adaptiveHyp); @@ -352,13 +352,11 @@ static bool computeParamByFunc(Adaptor3d_Curve& C3d, // never do this way //OSD::SetSignal( true ); - if (nbSeg <= 0) + if ( nbSeg <= 0 ) return false; - MESSAGE( "computeParamByFunc" ); - int nbPnt = 1 + nbSeg; - vector x(nbPnt, 0.); + vector x( nbPnt, 0. ); if ( !buildDistribution( func, 0.0, 1.0, nbSeg, x, 1E-4 )) return false; @@ -375,7 +373,7 @@ static bool computeParamByFunc(Adaptor3d_Curve& C3d, for ( int i = 1; i < nbSeg; i++ ) { double curvLength = length * (x[i] - x[i-1]) * sign; - double tol = Min( Precision::Confusion(), curvLength / 100. ); + double tol = Min( Precision::Confusion(), curvLength / 100. ); GCPnts_AbscissaPoint Discret( tol, C3d, curvLength, prevU ); if ( !Discret.IsDone() ) return false; @@ -418,16 +416,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 } @@ -592,14 +591,14 @@ void StdMeshers_Regular_1D::redistributeNearVertices (SMESH_Mesh & theM } if ( _hypType == NB_SEGMENTS ) { - MESSAGE("redistributeNearVertices NB_SEGMENTS"); compensateError(0, vertexLength, f, l, theLength, theC3d, theParameters, true ); } else if ( nPar <= 3 ) { 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()); @@ -667,7 +666,6 @@ bool StdMeshers_Regular_1D::computeInternalParameters(SMESH_Mesh & theMesh, const bool theReverse, bool theConsiderPropagation) { - MESSAGE("computeInternalParameters"); theParams.clear(); double f = theFirstU, l = theLastU; @@ -689,7 +687,6 @@ bool StdMeshers_Regular_1D::computeInternalParameters(SMESH_Mesh & theMesh, if ( ! SMESH_Algo::GetSortedNodesOnEdge( theMesh.GetMeshDS(), mainEdge, _quadraticMesh, mainEdgeParamsOfNodes, SMDSAbs_Edge )) return error("Bad node parameters on the source edge of Propagation Of Distribution"); - MESSAGE("mainEdgeParamsOfNodes.size(): " << mainEdgeParamsOfNodes.size()); vector< double > segLen( mainEdgeParamsOfNodes.size() - 1 ); double totalLen = 0; BRepAdaptor_Curve mainEdgeCurve( mainEdge ); @@ -711,7 +708,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 ); @@ -731,16 +729,16 @@ bool StdMeshers_Regular_1D::computeInternalParameters(SMESH_Mesh & theMesh, { case LOCAL_LENGTH: case MAX_LENGTH: - case NB_SEGMENTS: { - MESSAGE("computeInternalParameters: LOCAL_LENGTH MAX_LENGTH NB_SEGMENTS"); + case NB_SEGMENTS: + { double eltSize = 1; int nbSegments; if ( _hypType == MAX_LENGTH ) { 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 ) @@ -764,8 +762,7 @@ bool StdMeshers_Regular_1D::computeInternalParameters(SMESH_Mesh & theMesh, } if (computed) { SMESHDS_SubMesh* smds = sm->GetSubMeshDS(); - int nb_segments = smds->NbElements(); - MESSAGE("nb_segments: "<NbElements(); if (nbseg - 1 <= nb_segments && nb_segments <= nbseg + 1) { isFound = true; nbseg = nb_segments; @@ -809,7 +806,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++) { @@ -818,10 +815,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(); } @@ -846,27 +845,30 @@ bool StdMeshers_Regular_1D::computeInternalParameters(SMESH_Mesh & theMesh, break; case StdMeshers_NumberOfSegments::DT_Regular: eltSize = theLength / nbSegments; - MESSAGE("eltSize = theLength / nbSegments " << eltSize << " = " << theLength << " / " << nbSegments ); break; default: 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 { double param = Discret.Parameter(i); - MESSAGE("computeInternalParameters: theParams " << i << " " << param); theParams.push_back( param ); } compensateError( eltSize, eltSize, f, l, theLength, theC3d, theParams, true ); // for PAL9899 return true; } + case BEG_END_LENGTH: { // geometric progression: SUM(n) = ( a1 - an * q ) / ( 1 - q ) = theLength @@ -878,14 +880,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 ) @@ -899,23 +902,24 @@ bool StdMeshers_Regular_1D::computeInternalParameters(SMESH_Mesh & theMesh, return true; } - case ARITHMETIC_1D: { - + case ARITHMETIC_1D: + { // arithmetic progression: SUM(n) = ( an - a1 + q ) * ( a1 + an ) / ( 2 * q ) = theLength double a1 = _value[ BEG_LENGTH_IND ]; double an = _value[ END_LENGTH_IND ]; - if ( 1.01*theLength < a1 + an) + if ( 1.01*theLength < a1 + an ) return error ( SMESH_Comment("Invalid segment lengths (")< numeric_limits::min() ? ( 1+( an-a1 )/q ) : ( 1+theLength/a1 )); + 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; @@ -923,7 +927,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 ) @@ -933,14 +937,14 @@ bool StdMeshers_Regular_1D::computeInternalParameters(SMESH_Mesh & theMesh, eltSize += q; } compensateError( a1, an, U1, Un, theLength, theC3d, theParams ); - if (theReverse) theParams.reverse(); // NPAL18025 + if ( theReverse ) theParams.reverse(); // NPAL18025 return true; } - case GEOMETRIC_1D: { - - double a1 = _value[ BEG_LENGTH_IND ], an; + case GEOMETRIC_1D: + { + double a1 = _value[ BEG_LENGTH_IND ], an = 0; double q = _value[ END_LENGTH_IND ]; double U1 = theReverse ? l : f; @@ -954,7 +958,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 ) @@ -983,111 +988,88 @@ bool StdMeshers_Regular_1D::computeInternalParameters(SMESH_Mesh & theMesh, return true; } - case FIXED_POINTS_1D: { + case FIXED_POINTS_1D: + { const std::vector& aPnts = _fpHyp->GetPoints(); - const std::vector& nbsegs = _fpHyp->GetNbSegments(); + std::vector nbsegs = _fpHyp->GetNbSegments(); + if ( theReverse ) + std::reverse( nbsegs.begin(), nbsegs.end() ); + + // 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( fabs(aPnts[i]-Params.Value(j)) < 1e-4 ) { + for ( ; j <= Params.Length(); j++ ) { + 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); - if( !APnt.IsDone() ) + 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::iterator itP = tmpParams.begin(); - for(; itP != tmpParams.end(); itP++) { - theParams.push_back( *(itP) ); + 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.push_back( par2 ); - - par1 = par2; - } - // add for last - int nbseg = ( (int)nbsegs.size() > Params.Length() ) ? nbsegs[Params.Length()] : nbsegs[0]; - segmentSize = theLength - currAbscissa; - eltSize = segmentSize/nbseg; - GCPnts_UniformAbscissa Discret; - 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::iterator itP = tmpParams.begin(); - for(; itP != tmpParams.end(); itP++) { - theParams.push_back( *(itP) ); } + theParams.pop_back(); - if (theReverse) { - theParams.reverse(); // NPAL18025 - } return true; } - case DEFLECTION: { - - GCPnts_UniformDeflection Discret(theC3d, _value[ DEFLECTION_IND ], f, l, true); + case DEFLECTION: + { + GCPnts_UniformDeflection Discret( theC3d, _value[ DEFLECTION_IND ], f, l, true ); if ( !Discret.IsDone() ) return false; @@ -1114,7 +1096,6 @@ bool StdMeshers_Regular_1D::computeInternalParameters(SMESH_Mesh & theMesh, bool StdMeshers_Regular_1D::Compute(SMESH_Mesh & theMesh, const TopoDS_Shape & theShape) { - MESSAGE("Compute"); if ( _hypType == NONE ) return false; @@ -1167,7 +1148,7 @@ bool StdMeshers_Regular_1D::Compute(SMESH_Mesh & theMesh, const TopoDS_Shape & t { 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 ); } @@ -1214,7 +1195,6 @@ bool StdMeshers_Regular_1D::Compute(SMESH_Mesh & theMesh, const TopoDS_Shape & t //Add the Node in the DataStructure SMDS_MeshNode * node = meshDS->AddNode(P.X(), P.Y(), P.Z()); - MESSAGE("meshDS->AddNode parameter " << param << " coords=" << "("<< P.X() <<", " << P.Y() << ", " << P.Z() << ")"); meshDS->SetNodeOnEdge(node, shapeID, param); if(_quadraticMesh) { @@ -1249,8 +1229,6 @@ bool StdMeshers_Regular_1D::Compute(SMESH_Mesh & theMesh, const TopoDS_Shape & t } else { - //MESSAGE("************* Degenerated edge! *****************"); - // Edge is a degenerated Edge : We put n = 5 points on the edge. const int NbPoints = 5; BRep_Tool::Range( E, f, l ); // PAL15185 @@ -1353,9 +1331,8 @@ bool StdMeshers_Regular_1D::Evaluate(SMESH_Mesh & theMesh, } else { - //MESSAGE("************* Degenerated edge! *****************"); // Edge is a degenerated Edge : We put n = 5 points on the edge. - if(_quadraticMesh) { + if ( _quadraticMesh ) { aVec[SMDSEntity_Node] = 11; aVec[SMDSEntity_Quad_Edge] = 6; }