X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FStdMeshers%2FStdMeshers_Regular_1D.cxx;h=40e8fbd828a542198789eef5717e128305b2f554;hb=refs%2Fheads%2Fcbr%2Ffix_dual_mesh;hp=c3430af05eed4bbd54719167bbd881ac0743312e;hpb=a1920ff31054e2c882bd94d4f3c04abe53980ce0;p=modules%2Fsmesh.git diff --git a/src/StdMeshers/StdMeshers_Regular_1D.cxx b/src/StdMeshers/StdMeshers_Regular_1D.cxx index c3430af05..40e8fbd82 100644 --- a/src/StdMeshers/StdMeshers_Regular_1D.cxx +++ b/src/StdMeshers/StdMeshers_Regular_1D.cxx @@ -1,4 +1,4 @@ -// Copyright (C) 2007-2016 CEA/DEN, EDF R&D, OPEN CASCADE +// Copyright (C) 2007-2022 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 @@ -50,8 +50,8 @@ #include "StdMeshers_SegmentLengthAroundVertex.hxx" #include "StdMeshers_StartEndLength.hxx" -#include "Utils_SALOME_Exception.hxx" -#include "utilities.h" +#include +#include #include #include @@ -78,9 +78,8 @@ using namespace StdMeshers; //============================================================================= StdMeshers_Regular_1D::StdMeshers_Regular_1D(int hypId, - int studyId, SMESH_Gen * gen) - :SMESH_1D_Algo( hypId, studyId, gen ) + :SMESH_1D_Algo( hypId, gen ) { _name = "Regular_1D"; _shapeType = (1 << TopAbs_EDGE); @@ -122,10 +121,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); @@ -156,13 +156,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; @@ -294,10 +298,6 @@ bool StdMeshers_Regular_1D::CheckHypothesis( SMESH_Mesh& aMesh, _hypType = MAX_LENGTH; aStatus = SMESH_Hypothesis::HYP_OK; } - else if ( !_mainEdge.IsNull() && _hypType == DISTRIB_PROPAGATION ) // !!! before "Adaptive1D" - { - aStatus = SMESH_Hypothesis::HYP_OK; - } else if ( hypName == "Adaptive1D" ) { _adaptiveHyp = dynamic_cast < const StdMeshers_Adaptive1D* >(theHyp); @@ -350,7 +350,7 @@ bool StdMeshers_Regular_1D::CheckHypothesis( SMESH_Mesh& aMesh, static bool computeParamByFunc(Adaptor3d_Curve& C3d, double first, double last, double length, - bool theReverse, int nbSeg, Function& func, + bool theReverse, smIdType nbSeg, Function& func, list& theParams) { // never do this way @@ -359,10 +359,13 @@ static bool computeParamByFunc(Adaptor3d_Curve& C3d, if ( nbSeg <= 0 ) return false; - int nbPnt = 1 + nbSeg; + smIdType nbPnt = 1 + nbSeg; vector x( nbPnt, 0. ); - if ( !buildDistribution( func, 0.0, 1.0, nbSeg, x, 1E-4 )) + + const double eps = Min( 1E-4, 0.01 / double( nbSeg )); + + if ( !buildDistribution( func, 0.0, 1.0, nbSeg, x, eps )) return false; // apply parameters in range [0,1] to the space of the curve @@ -374,7 +377,7 @@ static bool computeParamByFunc(Adaptor3d_Curve& C3d, sign = -1.; } - for ( int i = 1; i < nbSeg; i++ ) + for ( smIdType i = 1; i < nbSeg; i++ ) { double curvLength = length * (x[i] - x[i-1]) * sign; double tol = Min( Precision::Confusion(), curvLength / 100. ); @@ -390,6 +393,7 @@ static bool computeParamByFunc(Adaptor3d_Curve& C3d, } if ( theReverse ) theParams.reverse(); + return true; } @@ -397,15 +401,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 */ //================================================================================ @@ -416,7 +420,7 @@ static void compensateError(double a1, double an, list & theParams, bool adjustNeighbors2an = false) { - int i, nPar = theParams.size(); + smIdType i, nPar = theParams.size(); if ( a1 + an <= length && nPar > 1 ) { bool reverse = ( U1 > Un ); @@ -455,7 +459,7 @@ static void compensateError(double a1, double an, } else { - double q = dUn / ( nPar - 1 ); + double q = dUn / double( nPar - 1 ); theParams.back() += dUn; double sign = reverse ? -1 : 1; double prevU = theParams.back(); @@ -500,7 +504,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*) @@ -536,7 +540,7 @@ void StdMeshers_Regular_1D::SetEventListener(SMESH_subMesh* subMesh) */ //============================================================================= -void StdMeshers_Regular_1D::SubmeshRestored(SMESH_subMesh* subMesh) +void StdMeshers_Regular_1D::SubmeshRestored(SMESH_subMesh* /*subMesh*/) { } @@ -561,14 +565,68 @@ StdMeshers_Regular_1D::getVertexHyp(SMESH_Mesh & theMesh, return 0; } +//================================================================================ +/*! + * \brief Divide a curve into equal segments + */ +//================================================================================ + +bool StdMeshers_Regular_1D::divideIntoEqualSegments( SMESH_Mesh & theMesh, + Adaptor3d_Curve & theC3d, + smIdType theNbPoints, + double theTol, + double theLength, + double theFirstU, + double theLastU, + std::list & theParameters ) +{ + bool ok = false; + if ( theNbPoints < IntegerLast() ) + { + int nbPnt = FromSmIdType( theNbPoints ); + GCPnts_UniformAbscissa discret(theC3d, nbPnt, theFirstU, theLastU, theTol ); + if ( !discret.IsDone() ) + return error( "GCPnts_UniformAbscissa failed"); + if ( discret.NbPoints() < nbPnt ) + discret.Initialize(theC3d, nbPnt + 1, theFirstU, theLastU, theTol ); + + int nbPoints = Min( discret.NbPoints(), nbPnt ); + for ( int i = 2; i < nbPoints; i++ ) // skip 1st and last points + { + double param = discret.Parameter(i); + theParameters.push_back( param ); + } + ok = true; + } + else // huge nb segments + { + // use FIXED_POINTS_1D method + StdMeshers_FixedPoints1D fixedPointsHyp( GetGen()->GetANewId(), GetGen() ); + _fpHyp = &fixedPointsHyp; + std::vector params = { 0., 1. }; + std::vector nbSegs = { theNbPoints - 1 }; + fixedPointsHyp.SetPoints( params ); + fixedPointsHyp.SetNbSegments( nbSegs ); + + HypothesisType curType = _hypType; + _hypType = FIXED_POINTS_1D; + + ok = computeInternalParameters( theMesh, theC3d, theLength, theFirstU, theLastU, + theParameters, /*reverse=*/false ); + _hypType = curType; + _fpHyp = 0; + } + return ok; +} + //================================================================================ /*! * \brief Tune parameters to fit "SegmentLengthAroundVertex" hypothesis - * \param theC3d - wire curve - * \param theLength - curve length - * \param theParameters - internal nodes parameters to modify - * \param theVf - 1st vertex - * \param theVl - 2nd vertex + * \param theC3d - wire curve + * \param theLength - curve length + * \param theParameters - internal nodes parameters to modify + * \param theVf - 1st vertex + * \param theVl - 2nd vertex */ //================================================================================ @@ -580,7 +638,7 @@ void StdMeshers_Regular_1D::redistributeNearVertices (SMESH_Mesh & theM const TopoDS_Vertex & theVl) { double f = theC3d.FirstParameter(), l = theC3d.LastParameter(); - int nPar = theParameters.size(); + size_t nPar = theParameters.size(); for ( int isEnd1 = 0; isEnd1 < 2; ++isEnd1 ) { const TopoDS_Vertex & V = isEnd1 ? theVf : theVl; @@ -619,7 +677,7 @@ void StdMeshers_Regular_1D::redistributeNearVertices (SMESH_Mesh & theM { // recompute params between the last segment and a middle one. // find size of a middle segment - int nHalf = ( nPar-1 ) / 2; + smIdType nHalf = ( nPar-1 ) / 2; list< double >::reverse_iterator itU = theParameters.rbegin(); std::advance( itU, nHalf ); double Um = *itU++; @@ -627,7 +685,7 @@ void StdMeshers_Regular_1D::redistributeNearVertices (SMESH_Mesh & theM double L = GCPnts_AbscissaPoint::Length( theC3d, *itU, l); static StdMeshers_Regular_1D* auxAlgo = 0; if ( !auxAlgo ) { - auxAlgo = new StdMeshers_Regular_1D( _gen->GetANewId(), _studyId, _gen ); + auxAlgo = new StdMeshers_Regular_1D( _gen->GetANewId(), _gen ); auxAlgo->_hypType = BEG_END_LENGTH; } auxAlgo->_value[ BEG_LENGTH_IND ] = Lm; @@ -710,7 +768,7 @@ bool StdMeshers_Regular_1D::computeInternalParameters(SMESH_Mesh & theMesh, size_t dSeg = theReverse ? -1 : +1; double param = theFirstU; size_t nbParams = 0; - for ( int i = 0, nb = segLen.size()-1; i < nb; ++i, iSeg += dSeg ) + for ( size_t i = 1; i < segLen.size(); ++i, iSeg += dSeg ) { double tol = Min( Precision::Confusion(), 0.01 * segLen[ iSeg ]); GCPnts_AbscissaPoint Discret( tol, theC3d, segLen[ iSeg ], param ); @@ -736,14 +794,14 @@ bool StdMeshers_Regular_1D::computeInternalParameters(SMESH_Mesh & theMesh, case NB_SEGMENTS: { double eltSize = 1; - int nbSegments; + smIdType 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 * ( 1. - 1e-9 ); - nbSegments = (int) nbseg; + nbSegments = ToSmIdType( nbseg ); } else if ( _hypType == LOCAL_LENGTH ) { @@ -766,10 +824,10 @@ bool StdMeshers_Regular_1D::computeInternalParameters(SMESH_Mesh & theMesh, } if (computed) { SMESHDS_SubMesh* smds = sm->GetSubMeshDS(); - int nb_segments = smds->NbElements(); + smIdType nb_segments = smds->NbElements(); if (nbseg - 1 <= nb_segments && nb_segments <= nbseg + 1) { isFound = true; - nbseg = nb_segments; + nbseg = FromSmIdType( nb_segments ); } } } @@ -784,7 +842,7 @@ bool StdMeshers_Regular_1D::computeInternalParameters(SMESH_Mesh & theMesh, if (nbseg <= 0) nbseg = 1; // degenerated edge eltSize = theLength / nbseg; - nbSegments = (int) nbseg; + nbSegments = ToSmIdType( nbseg ); } else { @@ -801,19 +859,19 @@ bool StdMeshers_Regular_1D::computeInternalParameters(SMESH_Mesh & theMesh, if (fabs(scale - 1.0) < Precision::Confusion()) { // special case to avoid division by zero - for (int i = 1; i < nbSegments; i++) { - double param = f + (l - f) * i / nbSegments; + for ( smIdType i = 1; i < nbSegments; i++) { + double param = f + (l - f) * double( i ) / double( nbSegments ); theParams.push_back( param ); } - } else { - // general case of scale distribution + } + else { // general case of scale distribution if ( theReverse ) scale = 1.0 / scale; - double alpha = pow(scale, 1.0 / (nbSegments - 1)); + double alpha = pow(scale, 1.0 / double( nbSegments - 1 )); double factor = (l - f) / (1.0 - pow(alpha, nbSegments)); - for (int i = 1; i < nbSegments; i++) { + for ( smIdType i = 1; i < nbSegments; i++) { double param = f + factor * (1.0 - pow(alpha, i)); theParams.push_back( param ); } @@ -833,7 +891,7 @@ bool StdMeshers_Regular_1D::computeInternalParameters(SMESH_Mesh & theMesh, break; case StdMeshers_NumberOfSegments::DT_TabFunc: { - FunctionTable func(_vvalue[ TAB_FUNC_IND ], _ivalue[ CONV_MODE_IND ]); + FunctionTable func(_vvalue[ TAB_FUNC_IND ], FromSmIdType( _ivalue[ CONV_MODE_IND ])); return computeParamByFunc(theC3d, f, l, theLength, theReverse, _ivalue[ NB_SEGMENTS_IND ], func, theParams); @@ -841,14 +899,15 @@ bool StdMeshers_Regular_1D::computeInternalParameters(SMESH_Mesh & theMesh, break; case StdMeshers_NumberOfSegments::DT_ExprFunc: { - FunctionExpr func(_svalue[ EXPR_FUNC_IND ].c_str(), _ivalue[ CONV_MODE_IND ]); + FunctionExpr func(_svalue[ EXPR_FUNC_IND ].c_str(), + FromSmIdType( _ivalue[ CONV_MODE_IND ])); return computeParamByFunc(theC3d, f, l, theLength, theReverse, _ivalue[ NB_SEGMENTS_IND ], func, theParams); } break; case StdMeshers_NumberOfSegments::DT_Regular: - eltSize = theLength / nbSegments; + eltSize = theLength / double( nbSegments ); break; default: return false; @@ -856,18 +915,9 @@ bool StdMeshers_Regular_1D::computeInternalParameters(SMESH_Mesh & theMesh, } 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 ); + divideIntoEqualSegments( theMesh, theC3d, nbSegments + 1, tol, + theLength, theFirstU, theLastU, theParams ); - int NbPoints = Min( Discret.NbPoints(), nbSegments + 1 ); - for ( int i = 2; i < NbPoints; i++ ) // skip 1st and last points - { - double param = Discret.Parameter(i); - theParams.push_back( param ); - } compensateError( eltSize, eltSize, f, l, theLength, theC3d, theParams, true ); // for PAL9899 return true; } @@ -973,6 +1023,8 @@ bool StdMeshers_Regular_1D::computeInternalParameters(SMESH_Mesh & theMesh, an = eltSize; eltSize *= q; ++nbParams; + if ( q < 1. && eltSize < 1e-100 ) + return error("Too small common ratio causes too many segments"); } if ( nbParams > 1 ) { @@ -995,11 +1047,11 @@ bool StdMeshers_Regular_1D::computeInternalParameters(SMESH_Mesh & theMesh, case FIXED_POINTS_1D: { const std::vector& aPnts = _fpHyp->GetPoints(); - 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 + double tol = 1e-7; for ( size_t i = 0; i < aPnts.size(); i++ ) { if( aPnts[i] < tol || aPnts[i] > 1 - tol ) @@ -1007,72 +1059,82 @@ bool StdMeshers_Regular_1D::computeInternalParameters(SMESH_Mesh & theMesh, double u = theReverse ? ( 1 - aPnts[i] ) : aPnts[i]; int j = 1; bool IsExist = false; - for ( ; j <= Params.Length(); j++ ) { - if ( Abs( u - Params.Value(j) ) < tol ) { - IsExist = true; - break; - } + for ( ; j <= Params.Length() && !IsExist; j++ ) + { + IsExist = ( Abs( u - Params.Value(j) ) < tol ); if ( u < Params.Value(j) ) break; } if ( !IsExist ) Params.InsertBefore( j, u ); } + Params.InsertBefore( 1, 0.0 ); + Params.Append( 1.0 ); + + if ( theReverse ) + { + if ((int) nbsegs.size() > Params.Length() - 1 ) + nbsegs.resize( Params.Length() - 1 ); + std::reverse( nbsegs.begin(), nbsegs.end() ); + } + if ( nbsegs.empty() ) + { + nbsegs.push_back( 1 ); + } + if ((int) nbsegs.size() < Params.Length() - 1 ) + nbsegs.resize( Params.Length() - 1, nbsegs[0] ); + + // care of huge nbsegs - additionally divide diapasons + for ( int i = 2; i <= Params.Length(); i++ ) + { + smIdType nbTot = nbsegs[ i-2 ]; + if ( nbTot <= IntegerLast() ) + continue; + smIdType nbDiapason = nbTot / IntegerLast() + 1; + smIdType nbSegPerDiap = nbTot / nbDiapason; + double par0 = Params( i - 1 ), par1 = Params( i ); + for ( smIdType iDiap = 0; iDiap < nbDiapason - 1; ++iDiap ) + { + double r = double( nbSegPerDiap * ( iDiap + 1 )) / double( nbTot ); + double parI = par0 + ( par1 - par0 ) * r; + Params.InsertBefore( i, parI ); + auto it = nbsegs.begin(); + smIdType incr_it = i - 2 + iDiap; + nbsegs.insert( it + incr_it, nbSegPerDiap ); + } + nbsegs[ i-2 + nbDiapason - 1 ] = nbSegPerDiap + nbTot % nbDiapason; + } // transform normalized Params into real ones - std::vector< double > uVec( Params.Length() + 2 ); + std::vector< double > uVec( Params.Length() ); uVec[ 0 ] = theFirstU; double abscissa; - for ( int i = 1; i <= Params.Length(); i++ ) + for ( int i = 2; i < Params.Length(); i++ ) { 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"); - uVec[ i ] = APnt.Parameter(); + uVec[ i-1 ] = APnt.Parameter(); } uVec.back() = theLastU; // divide segments - if ( theReverse ) - { - if ((int) nbsegs.size() > Params.Length() + 1 ) - nbsegs.resize( Params.Length() + 1 ); - std::reverse( nbsegs.begin(), nbsegs.end() ); - } - if ( nbsegs.empty() ) - { - nbsegs.push_back( 1 ); - } - Params.InsertBefore( 1, 0.0 ); - Params.Append( 1.0 ); double eltSize, segmentSize, par1, par2; - for ( size_t i = 0; i < uVec.size()-1; i++ ) + for ( int i = 0; i < (int)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 + smIdType nbseg = ( i < (int) nbsegs.size() ) ? nbsegs[i] : nbsegs[0]; + if ( nbseg > 1 ) { segmentSize = ( Params( i+2 ) - Params( i+1 )) * theLength; - eltSize = segmentSize / nbseg; + eltSize = segmentSize / double( 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 ); - } + if ( !divideIntoEqualSegments( theMesh, theC3d, nbseg + 1, tol, + segmentSize, par1, par2, theParams )) + return false; } + theParams.push_back( par2 ); } theParams.pop_back(); @@ -1137,7 +1199,7 @@ bool StdMeshers_Regular_1D::Compute(SMESH_Mesh & theMesh, const TopoDS_Shape & t 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 if (SMESHDS_SubMesh * subMeshDS = meshDS->MeshElements(theShape)) @@ -1280,9 +1342,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; @@ -1290,7 +1352,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() ); } @@ -1306,7 +1368,7 @@ bool StdMeshers_Regular_1D::Evaluate(SMESH_Mesh & theMesh, ASSERT(!VFirst.IsNull()); ASSERT(!VLast.IsNull()); - std::vector aVec(SMDSEntity_Last,0); + std::vector aVec(SMDSEntity_Last,0); double length = EdgeLength( E ); if ( !Curve.IsNull() && length > 0 ) @@ -1315,7 +1377,7 @@ bool StdMeshers_Regular_1D::Evaluate(SMESH_Mesh & theMesh, BRepAdaptor_Curve C3d( 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; @@ -1323,7 +1385,7 @@ 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 { @@ -1335,7 +1397,7 @@ bool StdMeshers_Regular_1D::Evaluate(SMESH_Mesh & theMesh, 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 { @@ -1344,8 +1406,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; } @@ -1390,7 +1452,7 @@ StdMeshers_Regular_1D::GetUsedHypothesis(SMESH_Mesh & aMesh, if (nbHyp == 0) // nothing propagated nor assigned to aShape { SMESH_Algo::GetUsedHypothesis( aMesh, aShape, ignoreAuxiliary ); - nbHyp = _usedHypList.size(); + nbHyp = (int)_usedHypList.size(); } else {