-// SMESH SMESH : implementaion of SMESH idl descriptions
+// Copyright (C) 2007-2016 CEA/DEN, EDF R&D, OPEN CASCADE
//
-// Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-//
-// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org
+// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// Lesser General Public License for more details.
//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
+
// File : StdMeshers_Regular_1D.cxx
// Moved here from SMESH_Regular_1D.cxx
// Author : Paul RASCLE, EDF
// Module : SMESH
-// $Header$
-
-using namespace std;
-
+//
#include "StdMeshers_Regular_1D.hxx"
+
+#include "SMDS_MeshElement.hxx"
+#include "SMDS_MeshNode.hxx"
+#include "SMESHDS_Mesh.hxx"
+#include "SMESH_Comment.hxx"
#include "SMESH_Gen.hxx"
+#include "SMESH_HypoFilter.hxx"
#include "SMESH_Mesh.hxx"
-
+#include "SMESH_subMesh.hxx"
+#include "SMESH_subMeshEventListener.hxx"
+#include "StdMeshers_Adaptive1D.hxx"
+#include "StdMeshers_Arithmetic1D.hxx"
+#include "StdMeshers_AutomaticLength.hxx"
+#include "StdMeshers_Geometric1D.hxx"
+#include "StdMeshers_Deflection1D.hxx"
+#include "StdMeshers_Distribution.hxx"
+#include "StdMeshers_FixedPoints1D.hxx"
#include "StdMeshers_LocalLength.hxx"
+#include "StdMeshers_MaxLength.hxx"
#include "StdMeshers_NumberOfSegments.hxx"
-#include "StdMeshers_Arithmetic1D.hxx"
+#include "StdMeshers_Propagation.hxx"
+#include "StdMeshers_SegmentLengthAroundVertex.hxx"
#include "StdMeshers_StartEndLength.hxx"
-#include "StdMeshers_Deflection1D.hxx"
-#include <StdMeshers_AutomaticLength.hxx>
-#include "SMDS_MeshElement.hxx"
-#include "SMDS_MeshNode.hxx"
-#include "SMDS_EdgePosition.hxx"
-#include "SMESH_subMesh.hxx"
-
-#include "Utils_SALOME_Exception.hxx"
-#include "utilities.h"
+#include <Utils_SALOME_Exception.hxx>
+#include <utilities.h>
+#include <BRepAdaptor_Curve.hxx>
#include <BRep_Tool.hxx>
-#include <TopoDS_Edge.hxx>
-#include <TopoDS_Shape.hxx>
-#include <TopTools_ListIteratorOfListOfShape.hxx>
-#include <GeomAdaptor_Curve.hxx>
#include <GCPnts_AbscissaPoint.hxx>
#include <GCPnts_UniformAbscissa.hxx>
#include <GCPnts_UniformDeflection.hxx>
-#include <Standard_ErrorHandler.hxx>
#include <Precision.hxx>
-#include <Expr_GeneralExpression.hxx>
-#include <Expr_NamedUnknown.hxx>
-#include <Expr_Array1OfNamedUnknown.hxx>
-#include <TColStd_Array1OfReal.hxx>
-#include <ExprIntrp_GenExp.hxx>
+#include <TopExp.hxx>
+#include <TopExp_Explorer.hxx>
+#include <TopoDS.hxx>
+#include <TopoDS_Edge.hxx>
+#include <TopoDS_Vertex.hxx>
#include <string>
-#include <math.h>
+#include <limits>
+
+using namespace std;
+using namespace StdMeshers;
//=============================================================================
/*!
- *
+ *
*/
//=============================================================================
-StdMeshers_Regular_1D::StdMeshers_Regular_1D(int hypId, int studyId,
- SMESH_Gen * gen):SMESH_1D_Algo(hypId, studyId, gen)
+StdMeshers_Regular_1D::StdMeshers_Regular_1D(int hypId,
+ int studyId,
+ SMESH_Gen * gen)
+ :SMESH_1D_Algo( hypId, studyId, gen )
{
- MESSAGE("StdMeshers_Regular_1D::StdMeshers_Regular_1D");
- _name = "Regular_1D";
- _shapeType = (1 << TopAbs_EDGE);
-
- _compatibleHypothesis.push_back("LocalLength");
- _compatibleHypothesis.push_back("NumberOfSegments");
- _compatibleHypothesis.push_back("StartEndLength");
- _compatibleHypothesis.push_back("Deflection1D");
- _compatibleHypothesis.push_back("Arithmetic1D");
- _compatibleHypothesis.push_back("AutomaticLength");
+ _name = "Regular_1D";
+ _shapeType = (1 << TopAbs_EDGE);
+ _fpHyp = 0;
+
+ _compatibleHypothesis.push_back("LocalLength");
+ _compatibleHypothesis.push_back("MaxLength");
+ _compatibleHypothesis.push_back("NumberOfSegments");
+ _compatibleHypothesis.push_back("StartEndLength");
+ _compatibleHypothesis.push_back("Deflection1D");
+ _compatibleHypothesis.push_back("Arithmetic1D");
+ _compatibleHypothesis.push_back("GeometricProgression");
+ _compatibleHypothesis.push_back("FixedPoints1D");
+ _compatibleHypothesis.push_back("AutomaticLength");
+ _compatibleHypothesis.push_back("Adaptive1D");
+ // auxiliary:
+ _compatibleHypothesis.push_back("QuadraticMesh");
+ _compatibleHypothesis.push_back("Propagation");
+ _compatibleHypothesis.push_back("PropagOfDistribution");
}
//=============================================================================
/*!
- *
+ *
*/
//=============================================================================
//=============================================================================
/*!
- *
+ *
*/
//=============================================================================
-bool StdMeshers_Regular_1D::CheckHypothesis
- (SMESH_Mesh& aMesh,
- const TopoDS_Shape& aShape,
- SMESH_Hypothesis::Hypothesis_Status& aStatus)
+bool StdMeshers_Regular_1D::CheckHypothesis( SMESH_Mesh& aMesh,
+ const TopoDS_Shape& aShape,
+ Hypothesis_Status& aStatus )
{
- _hypType = NONE;
+ _hypType = NONE;
+ _quadraticMesh = false;
+ _onlyUnaryInput = true;
+
+ // check propagation in a redefined GetUsedHypothesis()
+ const list <const SMESHDS_Hypothesis * > & hyps =
+ GetUsedHypothesis(aMesh, aShape, /*ignoreAuxiliaryHyps=*/false);
+
+ const SMESH_HypoFilter & propagFilter = StdMeshers_Propagation::GetFilter();
+
+ // find non-auxiliary hypothesis
+ const SMESHDS_Hypothesis *theHyp = 0;
+ set< string > propagTypes;
+ list <const SMESHDS_Hypothesis * >::const_iterator h = hyps.begin();
+ for ( ; h != hyps.end(); ++h ) {
+ if ( static_cast<const SMESH_Hypothesis*>(*h)->IsAuxiliary() ) {
+ if ( strcmp( "QuadraticMesh", (*h)->GetName() ) == 0 )
+ _quadraticMesh = true;
+ if ( propagFilter.IsOk( static_cast< const SMESH_Hypothesis*>( *h ), aShape ))
+ propagTypes.insert( (*h)->GetName() );
+ }
+ else {
+ if ( !theHyp )
+ theHyp = *h; // use only the first non-auxiliary hypothesis
+ }
+ }
- const list <const SMESHDS_Hypothesis * >&hyps = GetUsedHypothesis(aMesh, aShape);
- if (hyps.size() == 0)
+ if ( !theHyp )
{
aStatus = SMESH_Hypothesis::HYP_MISSING;
return false; // can't work without a hypothesis
}
- // use only the first hypothesis
- const SMESHDS_Hypothesis *theHyp = hyps.front();
-
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 <const StdMeshers_LocalLength * >(theHyp);
ASSERT(hyp);
- _value[ BEG_LENGTH_IND ] = _value[ END_LENGTH_IND ] = hyp->GetLength();
+ _value[ BEG_LENGTH_IND ] = hyp->GetLength();
+ _value[ PRECISION_IND ] = hyp->GetPrecision();
ASSERT( _value[ BEG_LENGTH_IND ] > 0 );
_hypType = LOCAL_LENGTH;
aStatus = SMESH_Hypothesis::HYP_OK;
}
- else if (hypName == "NumberOfSegments")
+ else if ( hypName == "MaxLength" )
+ {
+ const StdMeshers_MaxLength * hyp =
+ dynamic_cast <const StdMeshers_MaxLength * >(theHyp);
+ ASSERT(hyp);
+ _value[ BEG_LENGTH_IND ] = hyp->GetLength();
+ if ( hyp->GetUsePreestimatedLength() ) {
+ if ( int nbSeg = aMesh.GetGen()->GetBoundaryBoxSegmentation() )
+ _value[ BEG_LENGTH_IND ] = aMesh.GetShapeDiagonalSize() / nbSeg;
+ }
+ ASSERT( _value[ BEG_LENGTH_IND ] > 0 );
+ _hypType = MAX_LENGTH;
+ aStatus = SMESH_Hypothesis::HYP_OK;
+ }
+
+ else if ( hypName == "NumberOfSegments" )
{
const StdMeshers_NumberOfSegments * hyp =
dynamic_cast <const StdMeshers_NumberOfSegments * >(theHyp);
{
case StdMeshers_NumberOfSegments::DT_Scale:
_value[ SCALE_FACTOR_IND ] = hyp->GetScaleFactor();
+ _revEdgesIDs = hyp->GetReversedEdges();
break;
case StdMeshers_NumberOfSegments::DT_TabFunc:
_vvalue[ TAB_FUNC_IND ] = hyp->GetTableFunction();
+ _revEdgesIDs = hyp->GetReversedEdges();
break;
case StdMeshers_NumberOfSegments::DT_ExprFunc:
_svalue[ EXPR_FUNC_IND ] = hyp->GetExpressionFunction();
+ _revEdgesIDs = hyp->GetReversedEdges();
break;
case StdMeshers_NumberOfSegments::DT_Regular:
break;
}
if (_ivalue[ DISTR_TYPE_IND ] == StdMeshers_NumberOfSegments::DT_TabFunc ||
_ivalue[ DISTR_TYPE_IND ] == StdMeshers_NumberOfSegments::DT_ExprFunc)
- _ivalue[ EXP_MODE_IND ] = (int) hyp->IsExponentMode();
+ _ivalue[ CONV_MODE_IND ] = hyp->ConversionMode();
_hypType = NB_SEGMENTS;
aStatus = SMESH_Hypothesis::HYP_OK;
}
- else if (hypName == "Arithmetic1D")
+ else if ( hypName == "Arithmetic1D" )
{
const StdMeshers_Arithmetic1D * hyp =
dynamic_cast <const StdMeshers_Arithmetic1D * >(theHyp);
_value[ END_LENGTH_IND ] = hyp->GetLength( false );
ASSERT( _value[ BEG_LENGTH_IND ] > 0 && _value[ END_LENGTH_IND ] > 0 );
_hypType = ARITHMETIC_1D;
+
+ _revEdgesIDs = hyp->GetReversedEdges();
+
aStatus = SMESH_Hypothesis::HYP_OK;
}
- else if (hypName == "StartEndLength")
+ else if ( hypName == "GeometricProgression" )
+ {
+ const StdMeshers_Geometric1D * hyp =
+ dynamic_cast <const StdMeshers_Geometric1D * >(theHyp);
+ ASSERT(hyp);
+ _value[ BEG_LENGTH_IND ] = hyp->GetStartLength();
+ _value[ END_LENGTH_IND ] = hyp->GetCommonRatio();
+ ASSERT( _value[ BEG_LENGTH_IND ] > 0 && _value[ END_LENGTH_IND ] > 0 );
+ _hypType = GEOMETRIC_1D;
+
+ _revEdgesIDs = hyp->GetReversedEdges();
+
+ aStatus = SMESH_Hypothesis::HYP_OK;
+ }
+
+ else if ( hypName == "FixedPoints1D" ) {
+ _fpHyp = dynamic_cast <const StdMeshers_FixedPoints1D*>(theHyp);
+ ASSERT(_fpHyp);
+ _hypType = FIXED_POINTS_1D;
+
+ _revEdgesIDs = _fpHyp->GetReversedEdges();
+
+ aStatus = SMESH_Hypothesis::HYP_OK;
+ }
+
+ else if ( hypName == "StartEndLength" )
{
const StdMeshers_StartEndLength * hyp =
dynamic_cast <const StdMeshers_StartEndLength * >(theHyp);
_value[ END_LENGTH_IND ] = hyp->GetLength( false );
ASSERT( _value[ BEG_LENGTH_IND ] > 0 && _value[ END_LENGTH_IND ] > 0 );
_hypType = BEG_END_LENGTH;
+
+ _revEdgesIDs = hyp->GetReversedEdges();
+
aStatus = SMESH_Hypothesis::HYP_OK;
}
- else if (hypName == "Deflection1D")
+ else if ( hypName == "Deflection1D" )
{
const StdMeshers_Deflection1D * hyp =
dynamic_cast <const StdMeshers_Deflection1D * >(theHyp);
aStatus = SMESH_Hypothesis::HYP_OK;
}
- else if (hypName == "AutomaticLength")
+ else if ( hypName == "AutomaticLength" )
{
StdMeshers_AutomaticLength * hyp = const_cast<StdMeshers_AutomaticLength *>
(dynamic_cast <const StdMeshers_AutomaticLength * >(theHyp));
ASSERT(hyp);
_value[ BEG_LENGTH_IND ] = _value[ END_LENGTH_IND ] = hyp->GetLength( &aMesh, aShape );
ASSERT( _value[ BEG_LENGTH_IND ] > 0 );
- _hypType = LOCAL_LENGTH;
+ _hypType = MAX_LENGTH;
+ aStatus = SMESH_Hypothesis::HYP_OK;
+ }
+ else if ( hypName == "Adaptive1D" )
+ {
+ _adaptiveHyp = dynamic_cast < const StdMeshers_Adaptive1D* >(theHyp);
+ ASSERT(_adaptiveHyp);
+ _hypType = ADAPTIVE;
+ _onlyUnaryInput = false;
aStatus = SMESH_Hypothesis::HYP_OK;
}
else
+ {
aStatus = SMESH_Hypothesis::HYP_INCOMPATIBLE;
+ }
- return ( _hypType != NONE );
+ if ( propagTypes.size() > 1 && aStatus == HYP_OK )
+ {
+ // detect concurrent Propagation hyps
+ _usedHypList.clear();
+ list< TopoDS_Shape > assignedTo;
+ if ( aMesh.GetHypotheses( aShape, propagFilter, _usedHypList, true, &assignedTo ) > 1 )
+ {
+ // find most simple shape and a hyp on it
+ int simpleShape = TopAbs_COMPOUND;
+ const SMESHDS_Hypothesis* localHyp = 0;
+ list< TopoDS_Shape >::iterator shape = assignedTo.begin();
+ list< const SMESHDS_Hypothesis *>::iterator hyp = _usedHypList.begin();
+ for ( ; shape != assignedTo.end(); ++shape )
+ if ( shape->ShapeType() > simpleShape )
+ {
+ simpleShape = shape->ShapeType();
+ localHyp = (*hyp);
+ }
+ // check if there a different hyp on simpleShape
+ shape = assignedTo.begin();
+ hyp = _usedHypList.begin();
+ for ( ; hyp != _usedHypList.end(); ++hyp, ++shape )
+ if ( shape->ShapeType() == simpleShape &&
+ !localHyp->IsSameName( **hyp ))
+ {
+ aStatus = HYP_INCOMPAT_HYPS;
+ return error( SMESH_Comment("Hypotheses of both \"")
+ << StdMeshers_Propagation::GetName() << "\" and \""
+ << StdMeshers_PropagOfDistribution::GetName()
+ << "\" types can't be applied to the same edge");
+ }
+ }
+ }
+
+ return ( aStatus == SMESH_Hypothesis::HYP_OK );
}
-//=======================================================================
-//function : compensateError
-//purpose : adjust theParams so that the last segment length == an
-//=======================================================================
+static bool computeParamByFunc(Adaptor3d_Curve& C3d,
+ double first, double last, double length,
+ bool theReverse, int nbSeg, Function& func,
+ list<double>& theParams)
+{
+ // never do this way
+ //OSD::SetSignal( true );
+
+ if ( nbSeg <= 0 )
+ return false;
+
+ int nbPnt = 1 + nbSeg;
+ vector<double> x( nbPnt, 0. );
+
+ if ( !buildDistribution( func, 0.0, 1.0, nbSeg, x, 1E-4 ))
+ return false;
+
+ // apply parameters in range [0,1] to the space of the curve
+ double prevU = first;
+ double sign = 1.;
+ if ( theReverse )
+ {
+ prevU = last;
+ sign = -1.;
+ }
+
+ for ( int i = 1; i < nbSeg; i++ )
+ {
+ double curvLength = length * (x[i] - x[i-1]) * sign;
+ double tol = Min( Precision::Confusion(), curvLength / 100. );
+ GCPnts_AbscissaPoint Discret( tol, C3d, curvLength, prevU );
+ if ( !Discret.IsDone() )
+ return false;
+ double U = Discret.Parameter();
+ if ( U > first && U < last )
+ theParams.push_back( U );
+ else
+ return false;
+ prevU = U;
+ }
+ if ( theReverse )
+ theParams.reverse();
+
+ return true;
+}
+
+
+//================================================================================
+/*!
+ * \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
+ */
+//================================================================================
static void compensateError(double a1, double an,
double U1, double Un,
- double length,
- GeomAdaptor_Curve& C3d,
- list<double> & theParams)
+ double length,
+ Adaptor3d_Curve& C3d,
+ list<double> & theParams,
+ bool adjustNeighbors2an = false)
{
int i, nPar = theParams.size();
- if ( a1 + an < length && nPar > 1 )
+ if ( a1 + an <= length && nPar > 1 )
{
- list<double>::reverse_iterator itU = theParams.rbegin();
- double Ul = *itU++;
- // dist from the last point to the edge end <Un>, it should be equal <an>
- double Ln = GCPnts_AbscissaPoint::Length( C3d, Ul, Un );
- double dLn = an - Ln; // error of <an>
- if ( Abs( dLn ) <= Precision::Confusion() )
+ bool reverse = ( U1 > 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<double>::reverse_iterator itU = theParams.rbegin();
+ double Ul = *itU++; // real value of the last parameter
+ double dUn = Utgt - Ul; // parametric error of <an>
double dU = Abs( Ul - *itU ); // parametric length of the last but one segment
- double dUn = dLn * Abs( Un - U1 ) / length; // parametric error of <an>
- if ( dUn < 0.5 * dU ) { // last segment is a bit shorter than it should
- dUn = -dUn; // move the last parameter to the edge beginning
+ 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
}
else { // last segment is much shorter than it should -> remove the last param and
theParams.pop_back(); nPar--; // move the rest points toward the edge end
- Ln = GCPnts_AbscissaPoint::Length( C3d, theParams.back(), Un );
- dUn = ( an - Ln ) * Abs( Un - U1 ) / length;
- if ( dUn < 0.5 * dU )
- dUn = -dUn;
+ dUn = Utgt - theParams.back();
}
- if ( U1 > Un )
- dUn = -dUn;
- double q = dUn / ( nPar - 1 );
- for ( itU = theParams.rbegin(), i = 1; i < nPar; itU++, i++ ) {
- (*itU) += dUn;
- dUn -= q;
+
+ if ( !adjustNeighbors2an )
+ {
+ double q = dUn / ( Utgt - Un ); // (signed) factor of segment length change
+ for ( itU = theParams.rbegin(), i = 1; i < nPar; i++ ) {
+ double prevU = *itU;
+ (*itU) += dUn;
+ ++itU;
+ dUn = q * (*itU - prevU) * (prevU-U1)/(Un-U1);
+ }
+ }
+ else if ( nPar == 1 )
+ {
+ theParams.back() += dUn;
+ }
+ else
+ {
+ double q = dUn / ( nPar - 1 );
+ theParams.back() += dUn;
+ double sign = reverse ? -1 : 1;
+ double prevU = theParams.back();
+ itU = theParams.rbegin();
+ for ( ++itU, i = 2; i < nPar; ++itU, i++ ) {
+ double newU = *itU + dUn;
+ if ( newU*sign < prevU*sign ) {
+ prevU = *itU = newU;
+ dUn -= q;
+ }
+ else { // set U between prevU and next valid param
+ list<double>::reverse_iterator itU2 = itU;
+ ++itU2;
+ int nb = 2;
+ while ( (*itU2)*sign > prevU*sign ) {
+ ++itU2; ++nb;
+ }
+ dU = ( *itU2 - prevU ) / nb;
+ while ( itU != itU2 ) {
+ *itU += dU; ++itU;
+ }
+ break;
+ }
+ }
}
}
}
+//================================================================================
/*!
- * \brief This class provides interface for a density function
+ * \brief Class used to clean mesh on edges when 0D hyp modified.
+ * Common approach doesn't work when 0D algo is missing because the 0D hyp is
+ * considered as not participating in computation whereas it is used by 1D algo.
*/
-class Function
-{
-public:
- Function(bool expMode) : _expMode(expMode) {}
- double operator() (double t) const;
- virtual bool IsReady() const = 0;
-protected:
- virtual double compute(double t) const = 0;
-private:
- bool _expMode;
-};
+//================================================================================
-/*!
- * \brief This class provides computation of density function given by a table
- */
-class TabFunction: public Function
-{
-public:
- TabFunction(const vector<double>& table, bool expMode);
- virtual bool IsReady() const;
-protected:
- virtual double compute(double t) const;
-private:
- const vector<double>& _table;
-};
+// struct VertexEventListener : public SMESH_subMeshEventListener
+// {
+// VertexEventListener():SMESH_subMeshEventListener(0) // won't be deleted by submesh
+// {}
+// /*!
+// * \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 occurs
+// */
+// void ProcessEvent(const int event, const int eventType, SMESH_subMesh* subMesh,
+// EventListenerData*, const SMESH_Hypothesis*)
+// {
+// if ( eventType == SMESH_subMesh::ALGO_EVENT) // all algo events
+// {
+// subMesh->ComputeStateEngine( SMESH_subMesh::MODIF_ALGO_STATE );
+// }
+// }
+// }; // struct VertexEventListener
+//=============================================================================
/*!
- * \brief This class provides computation of density function given by an expression
+ * \brief Sets event listener to vertex submeshes
+ * \param subMesh - submesh where algo is set
+ *
+ * This method is called when a submesh gets HYP_OK algo_state.
+ * After being set, event listener is notified on each event of a submesh.
*/
-class ExprFunction: public Function
-{
-public:
- ExprFunction(const char* expr, bool expMode);
- virtual bool IsReady() const;
-protected:
- virtual double compute(double t) const;
-private:
- Handle(Expr_GeneralExpression) _expression;
- Expr_Array1OfNamedUnknown _var;
- mutable TColStd_Array1OfReal _val;
-};
-
-double Function::operator() (double t) const
-{
- double res = compute(t);
- if (_expMode)
- res = pow(10, res);
- return res;
-}
-
-TabFunction::TabFunction(const vector<double>& table, bool expMode)
- : Function(expMode),
- _table(table)
-{
-}
-
-bool TabFunction::IsReady() const
-{
- return true;
-}
-
-double TabFunction::compute (double t) const
-{
- //find place of <t> in table
- int i;
- for (i=0; i < _table.size()/2; i++)
- if (_table[i*2] > t)
- break;
- if (i >= _table.size()/2)
- i = _table.size()/2 - 1;
-
- if (i == 0)
- return _table[1];
-
- // interpolate function value on found interval
- // (t - x[i-1]) / (x[i] - x[i-1]) = (y - f[i-1]) / (f[i] - f[i-1])
- // => y = f[i-1] + (f[i] - f[i-1]) * (t - x[i-1]) / (x[i] - x[i-1])
- double x1 = _table[(i-1)*2];
- double x2 = _table[i*2];
- double y1 = _table[(i-1)*2+1];
- double y2 = _table[i*2+1];
- if (x2 - x1 < Precision::Confusion())
- throw SALOME_Exception("TabFunction::compute : confused points");
- return y1 + (y2 - y1) * ((t - x1) / (x2 - x1));
-}
+//=============================================================================
-ExprFunction::ExprFunction(const char* expr, bool expMode)
- : Function(expMode),
- _var(1,1),
- _val(1,1)
+void StdMeshers_Regular_1D::SetEventListener(SMESH_subMesh* subMesh)
{
- Handle( ExprIntrp_GenExp ) gen = ExprIntrp_GenExp::Create();
- gen->Process(TCollection_AsciiString((char*)expr));
- if (gen->IsDone())
- {
- _expression = gen->Expression();
- _var(1) = new Expr_NamedUnknown("t");
- }
+ StdMeshers_Propagation::SetPropagationMgr( subMesh );
}
-bool ExprFunction::IsReady() const
-{
- return !_expression.IsNull();
-}
+//=============================================================================
+/*!
+ * \brief Do nothing
+ * \param subMesh - restored submesh
+ *
+ * This method is called only if a submesh has HYP_OK algo_state.
+ */
+//=============================================================================
-double ExprFunction::compute (double t) const
+void StdMeshers_Regular_1D::SubmeshRestored(SMESH_subMesh* subMesh)
{
- ASSERT(!_expression.IsNull());
- _val(1) = t;
- return _expression->Evaluate(_var, _val);
}
-//================================================================================
+//=============================================================================
/*!
- * \brief Compute next abscissa when two previous ones are given
- * \param sm2 - before previous abscissa
- * \param sm1 - previous abscissa
- * \param func - function of density
- * \param reverse - the direction of next abscissa, increase (0) or decrease (1)
- * \retval double - the new abscissa
- *
- * The abscissa s is given by the formulae
- *
- * ....|--------|----------------|.....
- * sm2 sm1 s
- *
- * func(sm2) / func(sm1) = (sm1-sm2) / (s-sm1)
- * => (s-sm1) * func(sm2) = (sm1-sm2) * func(sm1)
- * => s = sm1 + (sm1-sm2) * func(sm1) / func(sm2)
+ * \brief Return StdMeshers_SegmentLengthAroundVertex assigned to vertex
*/
-//================================================================================
+//=============================================================================
-static double nextAbscissa(double sm2, double sm1, const Function& func, int reverse)
+const StdMeshers_SegmentLengthAroundVertex*
+StdMeshers_Regular_1D::getVertexHyp(SMESH_Mesh & theMesh,
+ const TopoDS_Vertex & theV)
{
- if (reverse)
+ static SMESH_HypoFilter filter( SMESH_HypoFilter::HasName("SegmentAroundVertex_0D"));
+ if ( const SMESH_Hypothesis * h = theMesh.GetHypothesis( theV, filter, true ))
{
- sm1 = 1.0 - sm1;
- sm2 = 1.0 - sm2;
+ SMESH_Algo* algo = const_cast< SMESH_Algo* >( static_cast< const SMESH_Algo* > ( h ));
+ const list <const SMESHDS_Hypothesis *> & hypList = algo->GetUsedHypothesis( theMesh, theV, 0 );
+ if ( !hypList.empty() && string("SegmentLengthAroundVertex") == hypList.front()->GetName() )
+ return static_cast<const StdMeshers_SegmentLengthAroundVertex*>( hypList.front() );
}
- return sm1 + (sm1-sm2) * func(sm1) / func(sm2);
+ return 0;
}
//================================================================================
/*!
- * \brief Compute distribution of points on a curve following the law of a function
- * \param C3d - the curve to discretize
- * \param first - the first parameter on the curve
- * \param last - the last parameter on the curve
- * \param theReverse - flag indicating that the curve must be reversed
- * \param nbSeg - number of output segments
- * \param func - the function f(t)
- * \param theParams - output points
- * \retval bool - true if success
+ * \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
*/
//================================================================================
-static bool computeParamByFunc(Adaptor3d_Curve& C3d, double first, double last,
- double length, bool theReverse,
- int nbSeg, const Function& func,
- list<double>& theParams)
+void StdMeshers_Regular_1D::redistributeNearVertices (SMESH_Mesh & theMesh,
+ Adaptor3d_Curve & theC3d,
+ double theLength,
+ std::list< double > & theParameters,
+ const TopoDS_Vertex & theVf,
+ const TopoDS_Vertex & theVl)
{
- if (!func.IsReady())
- return false;
-
- // ########## TMP until pb division by zero when func(0.0)==0 is fixed #########
- if (::Abs(func(0.0)) <= ::RealSmall() ) return false;
- // ########## TMP until pb division by zero when func(0.0)==0 is fixed #########
-
- vector<double> xxx[2];
- int nbPnt = 1 + nbSeg;
- int rev, i;
- for (rev=0; rev < 2; rev++)
+ double f = theC3d.FirstParameter(), l = theC3d.LastParameter();
+ int nPar = theParameters.size();
+ for ( int isEnd1 = 0; isEnd1 < 2; ++isEnd1 )
{
- // curv abscisses initialisation
- vector<double> x(nbPnt, 0.);
- // the first abscissa is 0.0
-
- // The aim of the algorithm is to find a second abscisse x[1] such as the last
- // one x[nbSeg] is very close to 1.0 with the epsilon precision
-
- double x1_too_small = 0.0;
- double x1_too_large = RealLast();
- double x1 = 1.0/nbSeg;
- while (1)
- {
- x[1] = x1;
-
- // Check if the abscissa of the point 2 to N-1
- // are in the segment ...
-
- bool ok = true;
- for (i=2; i <= nbSeg; i++)
+ const TopoDS_Vertex & V = isEnd1 ? theVf : theVl;
+ const StdMeshers_SegmentLengthAroundVertex* hyp = getVertexHyp (theMesh, V );
+ if ( hyp ) {
+ double vertexLength = hyp->GetLength();
+ if ( vertexLength > theLength / 2.0 )
+ continue;
+ if ( isEnd1 ) { // to have a segment of interest at end of theParameters
+ theParameters.reverse();
+ std::swap( f, l );
+ }
+ if ( _hypType == NB_SEGMENTS )
{
- x[i] = nextAbscissa(x[i-2], x[i-1], func, rev);
- if (x[i] - 1.0 > Precision::Confusion())
- {
- x[nbSeg] = x[i];
- ok = false;
- break;
- }
+ compensateError(0, vertexLength, f, l, theLength, theC3d, theParameters, true );
}
- if (!ok)
+ else if ( nPar <= 3 )
{
- // The segments are to large
- // Decrease x1 ...
- x1_too_large = x1;
- x1 = (x1_too_small+x1_too_large)/2;
- if ( x1 <= ::RealSmall() )
- return false; // break infinite loop
- continue;
+ if ( !isEnd1 )
+ vertexLength = -vertexLength;
+ 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());
+ else {
+ double L = GCPnts_AbscissaPoint::Length( theC3d, theParameters.back(), l);
+ if ( vertexLength < L / 2.0 )
+ theParameters.push_back( Discret.Parameter());
+ else
+ compensateError(0, vertexLength, f, l, theLength, theC3d, theParameters, true );
+ }
+ }
}
-
- // Look at the abscissa of the point N
- // which is to be close to 1.0
-
- // break condition --> algo converged !!
-
- if (1.0 - x[nbSeg] < Precision::Confusion())
- break;
-
- // not ok ...
-
- x1_too_small = x1;
-
- // Modify x1 value
-
- if (x1_too_large > 1e100)
- x1 = 2*x1;
else
- x1 = (x1_too_small+x1_too_large)/2;
+ {
+ // recompute params between the last segment and a middle one.
+ // find size of a middle segment
+ int nHalf = ( nPar-1 ) / 2;
+ list< double >::reverse_iterator itU = theParameters.rbegin();
+ std::advance( itU, nHalf );
+ double Um = *itU++;
+ double Lm = GCPnts_AbscissaPoint::Length( theC3d, Um, *itU);
+ 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->_hypType = BEG_END_LENGTH;
+ }
+ auxAlgo->_value[ BEG_LENGTH_IND ] = Lm;
+ auxAlgo->_value[ END_LENGTH_IND ] = vertexLength;
+ double from = *itU, to = l;
+ if ( isEnd1 ) {
+ std::swap( from, to );
+ std::swap( auxAlgo->_value[ BEG_LENGTH_IND ], auxAlgo->_value[ END_LENGTH_IND ]);
+ }
+ list<double> params;
+ if ( auxAlgo->computeInternalParameters( theMesh, theC3d, L, from, to, params, false ))
+ {
+ if ( isEnd1 ) params.reverse();
+ while ( 1 + nHalf-- )
+ theParameters.pop_back();
+ theParameters.splice( theParameters.end(), params );
+ }
+ else
+ {
+ compensateError(0, vertexLength, f, l, theLength, theC3d, theParameters, true );
+ }
+ }
+ if ( isEnd1 )
+ theParameters.reverse();
}
- xxx[rev] = x;
}
-
- // average
- vector<double> x(nbPnt, 0.);
- for (i=0; i < nbPnt; i++)
- x[i] = (xxx[0][i] + (1.0 - xxx[1][nbPnt-i])) / 2;
-
- // apply parameters in range [0,1] to the space of the curve
- double prevU = first;
- double sign = 1.;
- if (theReverse)
- {
- prevU = last;
- sign = -1.;
- }
- for (i = 1; i < nbSeg; i++)
- {
- double curvLength = length * (x[i] - x[i-1]) * sign;
- GCPnts_AbscissaPoint Discret( C3d, curvLength, prevU );
- if ( !Discret.IsDone() )
- return false;
- double U = Discret.Parameter();
- if ( U > first && U < last )
- theParams.push_back( U );
- else
- return false;
- prevU = U;
- }
- return true;
}
//=============================================================================
*
*/
//=============================================================================
-bool StdMeshers_Regular_1D::computeInternalParameters(const TopoDS_Edge& theEdge,
- list<double> & theParams,
- const bool theReverse) const
+bool StdMeshers_Regular_1D::computeInternalParameters(SMESH_Mesh & theMesh,
+ Adaptor3d_Curve& theC3d,
+ double theLength,
+ double theFirstU,
+ double theLastU,
+ list<double> & theParams,
+ const bool theReverse,
+ bool theConsiderPropagation)
{
theParams.clear();
- double f, l;
- Handle(Geom_Curve) Curve = BRep_Tool::Curve(theEdge, f, l);
- GeomAdaptor_Curve C3d(Curve);
+ double f = theFirstU, l = theLastU;
+
+ // Propagation Of Distribution
+ //
+ if ( !_mainEdge.IsNull() && _hypType == DISTRIB_PROPAGATION )
+ {
+ TopoDS_Edge mainEdge = TopoDS::Edge( _mainEdge ); // should not be a reference!
+ _gen->Compute( theMesh, mainEdge, SMESH_Gen::SHAPE_ONLY_UPWARD );
+
+ SMESHDS_SubMesh* smDS = theMesh.GetMeshDS()->MeshElements( mainEdge );
+ if ( !smDS )
+ return error("No mesh on the source edge of Propagation Of Distribution");
+ if ( smDS->NbNodes() < 1 )
+ return true; // 1 segment
+
+ map< double, const SMDS_MeshNode* > mainEdgeParamsOfNodes;
+ if ( ! SMESH_Algo::GetSortedNodesOnEdge( theMesh.GetMeshDS(), mainEdge, _quadraticMesh,
+ mainEdgeParamsOfNodes, SMDSAbs_Edge ))
+ return error("Bad node parameters on the source edge of Propagation Of Distribution");
+ vector< double > segLen( mainEdgeParamsOfNodes.size() - 1 );
+ double totalLen = 0;
+ BRepAdaptor_Curve mainEdgeCurve( mainEdge );
+ map< double, const SMDS_MeshNode* >::iterator
+ u_n2 = mainEdgeParamsOfNodes.begin(), u_n1 = u_n2++;
+ for ( size_t i = 1; i < mainEdgeParamsOfNodes.size(); ++i, ++u_n1, ++u_n2 )
+ {
+ segLen[ i-1 ] = GCPnts_AbscissaPoint::Length( mainEdgeCurve,
+ u_n1->first,
+ u_n2->first);
+ totalLen += segLen[ i-1 ];
+ }
+ for ( size_t i = 0; i < segLen.size(); ++i )
+ segLen[ i ] *= theLength / totalLen;
+
+ size_t iSeg = theReverse ? segLen.size()-1 : 0;
+ 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 )
+ {
+ 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 );
+ ++nbParams;
+ }
+ if ( nbParams != segLen.size()-1 )
+ return error( SMESH_Comment("Can't divide into ") << segLen.size() << " segments");
+
+ compensateError( segLen[ theReverse ? segLen.size()-1 : 0 ],
+ segLen[ theReverse ? 0 : segLen.size()-1 ],
+ f, l, theLength, theC3d, theParams, true );
+ return true;
+ }
- double length = EdgeLength(theEdge);
switch( _hypType )
{
case LOCAL_LENGTH:
- case NB_SEGMENTS: {
-
+ case MAX_LENGTH:
+ case NB_SEGMENTS:
+ {
double eltSize = 1;
- if ( _hypType == LOCAL_LENGTH )
+ 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 * ( 1. - 1e-9 );
+ nbSegments = (int) nbseg;
+ }
+ else if ( _hypType == LOCAL_LENGTH )
{
// Local Length hypothesis
- double nbseg = ceil(length / _value[ BEG_LENGTH_IND ]); // integer sup
+ double nbseg = ceil(theLength / _value[ BEG_LENGTH_IND ]); // integer sup
+
+ // NPAL17873:
+ bool isFound = false;
+ if (theConsiderPropagation && !_mainEdge.IsNull()) // propagated from some other edge
+ {
+ // Advanced processing to assure equal number of segments in case of Propagation
+ SMESH_subMesh* sm = theMesh.GetSubMeshContaining(_mainEdge);
+ if (sm) {
+ bool computed = sm->IsMeshComputed();
+ if (!computed) {
+ if (sm->GetComputeState() == SMESH_subMesh::READY_TO_COMPUTE) {
+ _gen->Compute( theMesh, _mainEdge, /*anUpward=*/true);
+ computed = sm->IsMeshComputed();
+ }
+ }
+ if (computed) {
+ SMESHDS_SubMesh* smds = sm->GetSubMeshDS();
+ int nb_segments = smds->NbElements();
+ if (nbseg - 1 <= nb_segments && nb_segments <= nbseg + 1) {
+ isFound = true;
+ nbseg = nb_segments;
+ }
+ }
+ }
+ }
+ if (!isFound) // not found by meshed edge in the propagation chain, use precision
+ {
+ double aPrecision = _value[ PRECISION_IND ];
+ double nbseg_prec = ceil((theLength / _value[ BEG_LENGTH_IND ]) - aPrecision);
+ if (nbseg_prec == (nbseg - 1)) nbseg--;
+ }
+
if (nbseg <= 0)
nbseg = 1; // degenerated edge
- eltSize = length / nbseg;
+ eltSize = theLength / nbseg;
+ nbSegments = (int) nbseg;
}
else
{
// Number Of Segments hypothesis
+ nbSegments = _ivalue[ NB_SEGMENTS_IND ];
+ if ( nbSegments < 1 ) return false;
+ if ( nbSegments == 1 ) return true;
+
switch (_ivalue[ DISTR_TYPE_IND ])
{
case StdMeshers_NumberOfSegments::DT_Scale:
{
double scale = _value[ SCALE_FACTOR_IND ];
- if ( theReverse )
- scale = 1. / scale;
- double alpha = pow( scale , 1.0 / (_ivalue[ NB_SEGMENTS_IND ] - 1));
- double factor = (l - f) / (1 - pow( alpha,_ivalue[ NB_SEGMENTS_IND ]));
- int i, NbPoints = 1 + _ivalue[ NB_SEGMENTS_IND ];
- for ( i = 2; i < NbPoints; i++ )
+ 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;
+ theParams.push_back( param );
+ }
+ } else {
+ // general case of scale distribution
+ if ( theReverse )
+ scale = 1.0 / scale;
+
+ double alpha = pow(scale, 1.0 / (nbSegments - 1));
+ double factor = (l - f) / (1.0 - pow(alpha, nbSegments));
+
+ for (int i = 1; i < nbSegments; i++) {
+ double param = f + factor * (1.0 - pow(alpha, i));
+ theParams.push_back( param );
+ }
+ }
+ 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<double>::iterator u = theParams.begin(), uEnd = theParams.end();
+ for ( ; u != uEnd; ++u )
{
- double param = f + factor * (1 - pow(alpha, i - 1));
- theParams.push_back( param );
+ GCPnts_AbscissaPoint Discret( tol, theC3d, ((*u)-f) * lenFactor, f );
+ if ( Discret.IsDone() )
+ *u = Discret.Parameter();
}
return true;
}
break;
case StdMeshers_NumberOfSegments::DT_TabFunc:
{
- TabFunction func(_vvalue[ TAB_FUNC_IND ], (bool)_ivalue[ EXP_MODE_IND ]);
- return computeParamByFunc(C3d, f, l, length, theReverse,
+ FunctionTable func(_vvalue[ TAB_FUNC_IND ], _ivalue[ CONV_MODE_IND ]);
+ return computeParamByFunc(theC3d, f, l, theLength, theReverse,
_ivalue[ NB_SEGMENTS_IND ], func,
theParams);
}
break;
case StdMeshers_NumberOfSegments::DT_ExprFunc:
{
- ExprFunction func(_svalue[ EXPR_FUNC_IND ].c_str(), (bool)_ivalue[ EXP_MODE_IND ]);
- return computeParamByFunc(C3d, f, l, length, theReverse,
+ FunctionExpr func(_svalue[ EXPR_FUNC_IND ].c_str(), _ivalue[ CONV_MODE_IND ]);
+ return computeParamByFunc(theC3d, f, l, theLength, theReverse,
_ivalue[ NB_SEGMENTS_IND ], func,
theParams);
}
break;
case StdMeshers_NumberOfSegments::DT_Regular:
- eltSize = length / _ivalue[ NB_SEGMENTS_IND ];
+ eltSize = theLength / nbSegments;
break;
default:
return false;
}
}
- GCPnts_UniformAbscissa Discret(C3d, eltSize, f, l);
+ double tol = Min( Precision::Confusion(), 0.01 * eltSize );
+ GCPnts_UniformAbscissa Discret(theC3d, nbSegments + 1, f, l, tol );
if ( !Discret.IsDone() )
- return false;
+ return error( "GCPnts_UniformAbscissa failed");
+ if ( Discret.NbPoints() < nbSegments + 1 )
+ Discret.Initialize(theC3d, nbSegments + 2, f, l, tol );
- int NbPoints = Discret.NbPoints();
- for ( int i = 2; i < NbPoints; i++ )
+ 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;
}
+
case BEG_END_LENGTH: {
- // geometric progression: SUM(n) = ( a1 - an * q ) / ( 1 - q ) = length
+ // geometric progression: SUM(n) = ( a1 - an * q ) / ( 1 - q ) = theLength
double a1 = _value[ BEG_LENGTH_IND ];
double an = _value[ END_LENGTH_IND ];
- double q = ( length - a1 ) / ( length - an );
-
- double U1 = theReverse ? l : f;
- double Un = theReverse ? f : l;
- double param = U1;
+ double q = ( theLength - a1 ) / ( theLength - an );
+ if ( q < theLength/1e6 || 1.01*theLength < a1 + an)
+ return error ( SMESH_Comment("Invalid segment lengths (")<<a1<<" and "<<an<<") "<<
+ "for an edge of length "<<theLength);
+
+ double U1 = theReverse ? l : f;
+ double Un = theReverse ? f : l;
+ double param = U1;
double eltSize = theReverse ? -a1 : a1;
+ double tol = Min( Precision::Confusion(), 0.01 * Min( a1, an ));
while ( 1 ) {
- // computes a point on a curve <C3d> at the distance <eltSize>
+ // computes a point on a curve <theC3d> at the distance <eltSize>
// from the point of parameter <param>.
- GCPnts_AbscissaPoint Discret( C3d, eltSize, param );
+ GCPnts_AbscissaPoint Discret( tol, theC3d, eltSize, param );
if ( !Discret.IsDone() ) break;
param = Discret.Parameter();
- if ( param > f && param < l )
+ if ( f < param && param < l )
theParams.push_back( param );
else
break;
eltSize *= q;
}
- compensateError( a1, an, U1, Un, length, C3d, theParams );
+ compensateError( a1, an, U1, Un, theLength, theC3d, theParams );
+ if (theReverse) theParams.reverse(); // NPAL18025
return true;
}
- case ARITHMETIC_1D: {
-
- // arithmetic progression: SUM(n) = ( an - a1 + q ) * ( a1 + an ) / ( 2 * q ) = length
+ 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 )
+ return error ( SMESH_Comment("Invalid segment lengths (")<<a1<<" and "<<an<<") "<<
+ "for an edge of length "<<theLength);
- double q = ( an - a1 ) / ( 2 *length/( a1 + an ) - 1 );
- int n = int( 1 + ( an - a1 ) / q );
+ double q = ( an - a1 ) / ( 2 *theLength/( a1 + an ) - 1 );
+ int n = int(fabs(q) > numeric_limits<double>::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;
}
while ( n-- > 0 && eltSize * ( Un - U1 ) > 0 ) {
- // computes a point on a curve <C3d> at the distance <eltSize>
+ // computes a point on a curve <theC3d> at the distance <eltSize>
// from the point of parameter <param>.
- GCPnts_AbscissaPoint Discret( C3d, eltSize, param );
+ GCPnts_AbscissaPoint Discret( tol, theC3d, eltSize, param );
if ( !Discret.IsDone() ) break;
param = Discret.Parameter();
if ( param > f && param < l )
break;
eltSize += q;
}
- compensateError( a1, an, U1, Un, length, C3d, theParams );
+ compensateError( a1, an, U1, Un, theLength, theC3d, theParams );
+ if ( theReverse ) theParams.reverse(); // NPAL18025
+
+ return true;
+ }
+
+ case GEOMETRIC_1D:
+ {
+ double a1 = _value[ BEG_LENGTH_IND ], an = 0;
+ double q = _value[ END_LENGTH_IND ];
+
+ double U1 = theReverse ? l : f;
+ double Un = theReverse ? f : l;
+ double param = U1;
+ double eltSize = a1;
+ if ( theReverse )
+ eltSize = -eltSize;
+
+ int nbParams = 0;
+ while ( true ) {
+ // computes a point on a curve <theC3d> at the distance <eltSize>
+ // from the point of parameter <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 )
+ theParams.push_back( param );
+ else
+ break;
+ an = eltSize;
+ eltSize *= q;
+ ++nbParams;
+ }
+ if ( nbParams > 1 )
+ {
+ if ( Abs( param - Un ) < 0.2 * Abs( param - theParams.back() ))
+ {
+ compensateError( a1, Abs(eltSize), U1, Un, theLength, theC3d, theParams );
+ }
+ else if ( Abs( Un - theParams.back() ) <
+ 0.2 * Abs( theParams.back() - *(++theParams.rbegin())))
+ {
+ theParams.pop_back();
+ compensateError( a1, Abs(an), U1, Un, theLength, theC3d, theParams );
+ }
+ }
+ if (theReverse) theParams.reverse(); // NPAL18025
return true;
}
- case DEFLECTION: {
+ case FIXED_POINTS_1D:
+ {
+ const std::vector<double>& aPnts = _fpHyp->GetPoints();
+ std::vector<int> nbsegs = _fpHyp->GetNbSegments();
- GCPnts_UniformDeflection Discret(C3d, _value[ DEFLECTION_IND ], true);
+ // 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] < 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( u - Params.Value(j) ) < tol ) {
+ IsExist = true;
+ break;
+ }
+ if ( u < Params.Value(j) ) break;
+ }
+ if ( !IsExist ) Params.InsertBefore( j, u );
+ }
+
+ // transform normalized Params into real ones
+ std::vector< double > uVec( Params.Length() + 2 );
+ uVec[ 0 ] = theFirstU;
+ double abscissa;
+ for ( int i = 1; 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.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++ )
+ {
+ 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.pop_back();
+
+ return true;
+ }
+
+ case DEFLECTION:
+ {
+ GCPnts_UniformDeflection Discret( theC3d, _value[ DEFLECTION_IND ], f, l, true );
if ( !Discret.IsDone() )
return false;
theParams.push_back( param );
}
return true;
-
}
default:;
*/
//=============================================================================
-bool StdMeshers_Regular_1D::Compute(SMESH_Mesh & aMesh, const TopoDS_Shape & aShape)
+bool StdMeshers_Regular_1D::Compute(SMESH_Mesh & theMesh, const TopoDS_Shape & theShape)
{
- MESSAGE("StdMeshers_Regular_1D::Compute");
-
if ( _hypType == NONE )
return false;
- SMESHDS_Mesh * meshDS = aMesh.GetMeshDS();
- aMesh.GetSubMesh(aShape);
+ if ( _hypType == ADAPTIVE )
+ {
+ _adaptiveHyp->GetAlgo()->InitComputeError();
+ _adaptiveHyp->GetAlgo()->Compute( theMesh, theShape );
+ return error( _adaptiveHyp->GetAlgo()->GetComputeError() );
+ }
+
+ SMESHDS_Mesh * meshDS = theMesh.GetMeshDS();
- const TopoDS_Edge & EE = TopoDS::Edge(aShape);
+ const TopoDS_Edge & EE = TopoDS::Edge(theShape);
TopoDS_Edge E = TopoDS::Edge(EE.Oriented(TopAbs_FORWARD));
int shapeID = meshDS->ShapeToIndex( E );
TopExp::Vertices(E, VFirst, VLast); // Vfirst corresponds to f and Vlast to l
ASSERT(!VFirst.IsNull());
- SMDS_NodeIteratorPtr lid= aMesh.GetSubMesh(VFirst)->GetSubMeshDS()->GetNodes();
- if (!lid->more())
- {
- MESSAGE (" NO NODE BUILT ON VERTEX ");
- return false;
- }
- const SMDS_MeshNode * idFirst = lid->next();
-
ASSERT(!VLast.IsNull());
- lid=aMesh.GetSubMesh(VLast)->GetSubMeshDS()->GetNodes();
- if (!lid->more())
+ 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)
+ // 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))
{
- MESSAGE (" NO NODE BUILT ON VERTEX ");
- return false;
+ SMDS_ElemIteratorPtr ite = subMeshDS->GetElements();
+ while (ite->more())
+ meshDS->RemoveFreeElement(ite->next(), subMeshDS);
+ SMDS_NodeIteratorPtr itn = subMeshDS->GetNodes();
+ while (itn->more()) {
+ const SMDS_MeshNode * node = itn->next();
+ if ( node->NbInverseElements() == 0 )
+ meshDS->RemoveFreeNode(node, subMeshDS);
+ else
+ meshDS->RemoveNode(node);
+ }
}
- const SMDS_MeshNode * idLast = lid->next();
- if (!Curve.IsNull())
+ double length = EdgeLength( E );
+ if ( !Curve.IsNull() && length > 0 )
{
list< double > params;
bool reversed = false;
- if ( !_mainEdge.IsNull() )
- reversed = aMesh.IsReversedInChain( EE, _mainEdge );
- try {
- if ( ! computeInternalParameters( E, params, reversed ))
- return false;
+ if ( theMesh.GetShapeToMesh().ShapeType() >= TopAbs_WIRE && _revEdgesIDs.empty() ) {
+ // if the shape to mesh is WIRE or EDGE
+ reversed = ( EE.Orientation() == TopAbs_REVERSED );
}
- catch ( Standard_Failure ) {
+ if ( !_mainEdge.IsNull() ) {
+ // 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 ( _hypType != DISTRIB_PROPAGATION ) {
+ int mainID = meshDS->ShapeToIndex(_mainEdge);
+ if ( std::find( _revEdgesIDs.begin(), _revEdgesIDs.end(), mainID) != _revEdgesIDs.end())
+ reversed = !reversed;
+ }
+ }
+ // take into account this edge reversing
+ if ( std::find( _revEdgesIDs.begin(), _revEdgesIDs.end(), shapeID) != _revEdgesIDs.end())
+ reversed = !reversed;
+
+ BRepAdaptor_Curve C3d( E );
+ if ( ! computeInternalParameters( theMesh, C3d, length, f, l, params, reversed, true )) {
return false;
}
+ redistributeNearVertices( theMesh, C3d, length, params, VFirst, VLast );
// 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;
-
- for (list<double>::iterator itU = params.begin(); itU != params.end(); itU++)
- {
+ const SMDS_MeshNode * nPrev = nFirst;
+ double parPrev = f;
+ double parLast = l;
+
+ for (list<double>::iterator itU = params.begin(); itU != params.end(); itU++) {
double param = *itU;
gp_Pnt P = Curve->Value(param);
SMDS_MeshNode * node = meshDS->AddNode(P.X(), P.Y(), P.Z());
meshDS->SetNodeOnEdge(node, shapeID, param);
- SMDS_MeshEdge * edge = meshDS->AddEdge(idPrev, node);
+ if(_quadraticMesh) {
+ // create medium node
+ double prm = ( parPrev + param )/2;
+ 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(nPrev, node, NM);
+ meshDS->SetMeshElementOnShape(edge, shapeID);
+ }
+ else {
+ SMDS_MeshEdge * edge = meshDS->AddEdge(nPrev, node);
+ meshDS->SetMeshElementOnShape(edge, shapeID);
+ }
+
+ nPrev = node;
+ parPrev = param;
+ }
+ if(_quadraticMesh) {
+ double prm = ( parPrev + parLast )/2;
+ 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(nPrev, nLast, NM);
+ meshDS->SetMeshElementOnShape(edge, shapeID);
+ }
+ else {
+ SMDS_MeshEdge* edge = meshDS->AddEdge(nPrev, nLast);
meshDS->SetMeshElementOnShape(edge, shapeID);
- idPrev = node;
}
- SMDS_MeshEdge* edge = meshDS->AddEdge(idPrev, idLast);
- meshDS->SetMeshElementOnShape(edge, shapeID);
}
else
{
// Edge is a degenerated Edge : We put n = 5 points on the edge.
- int NbPoints = 5;
- BRep_Tool::Range(E, f, l);
+ const int NbPoints = 5;
+ BRep_Tool::Range( E, f, l ); // PAL15185
double du = (l - f) / (NbPoints - 1);
- //MESSAGE("************* Degenerated edge! *****************");
- TopoDS_Vertex V1, V2;
- TopExp::Vertices(E, V1, V2);
- gp_Pnt P = BRep_Tool::Pnt(V1);
+ gp_Pnt P = BRep_Tool::Pnt(VFirst);
- const SMDS_MeshNode * idPrev = idFirst;
- for (int i = 2; i < NbPoints; i++)
- {
+ 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());
+ if(_quadraticMesh) {
+ // create medium node
+ 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(nPrev, node, NM);
+ meshDS->SetMeshElementOnShape(edge, shapeID);
+ }
+ else {
+ SMDS_MeshEdge * edge = meshDS->AddEdge(nPrev, node);
+ meshDS->SetMeshElementOnShape(edge, shapeID);
+ }
meshDS->SetNodeOnEdge(node, shapeID, param);
-
- SMDS_MeshEdge * edge = meshDS->AddEdge(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(nPrev, nLast, NM);
+ meshDS->SetMeshElementOnShape(edge, shapeID);
+ }
+ else {
+ SMDS_MeshEdge * edge = meshDS->AddEdge(nPrev, nLast);
meshDS->SetMeshElementOnShape(edge, shapeID);
- idPrev = node;
}
- SMDS_MeshEdge * edge = meshDS->AddEdge(idPrev, idLast);
- meshDS->SetMeshElementOnShape(edge, shapeID);
}
return true;
}
+
//=============================================================================
/*!
- * See comments in SMESH_Algo.cxx
+ *
*/
//=============================================================================
-const list <const SMESHDS_Hypothesis *> & StdMeshers_Regular_1D::GetUsedHypothesis(
- SMESH_Mesh & aMesh, const TopoDS_Shape & aShape)
+bool StdMeshers_Regular_1D::Evaluate(SMESH_Mesh & theMesh,
+ const TopoDS_Shape & theShape,
+ MapShapeNbElems& theResMap)
{
- _usedHypList.clear();
- _usedHypList = GetAppliedHypothesis(aMesh, aShape); // copy
- int nbHyp = _usedHypList.size();
- _mainEdge.Nullify();
- if (nbHyp == 0)
+ if ( _hypType == NONE )
+ return false;
+
+ if ( _hypType == ADAPTIVE )
{
- // Check, if propagated from some other edge
- if (aShape.ShapeType() == TopAbs_EDGE &&
- aMesh.IsPropagatedHypothesis(aShape, _mainEdge))
- {
- // Propagation of 1D hypothesis from <aMainEdge> on this edge
- //_usedHypList = GetAppliedHypothesis(aMesh, _mainEdge); // copy
- // use a general method in order not to nullify _mainEdge
- _usedHypList = SMESH_Algo::GetUsedHypothesis(aMesh, _mainEdge); // copy
- nbHyp = _usedHypList.size();
- }
+ _adaptiveHyp->GetAlgo()->InitComputeError();
+ _adaptiveHyp->GetAlgo()->Evaluate( theMesh, theShape, theResMap );
+ return error( _adaptiveHyp->GetAlgo()->GetComputeError() );
}
- if (nbHyp == 0)
+
+ const TopoDS_Edge & EE = TopoDS::Edge(theShape);
+ TopoDS_Edge E = TopoDS::Edge(EE.Oriented(TopAbs_FORWARD));
+
+ double f, l;
+ Handle(Geom_Curve) Curve = BRep_Tool::Curve(E, f, l);
+
+ TopoDS_Vertex VFirst, VLast;
+ TopExp::Vertices(E, VFirst, VLast); // Vfirst corresponds to f and Vlast to l
+
+ ASSERT(!VFirst.IsNull());
+ ASSERT(!VLast.IsNull());
+
+ std::vector<int> aVec(SMDSEntity_Last,0);
+
+ double length = EdgeLength( E );
+ if ( !Curve.IsNull() && length > 0 )
{
- TopTools_ListIteratorOfListOfShape ancIt( aMesh.GetAncestors( aShape ));
- for (; ancIt.More(); ancIt.Next())
- {
- const TopoDS_Shape& ancestor = ancIt.Value();
- _usedHypList = GetAppliedHypothesis(aMesh, ancestor); // copy
- nbHyp = _usedHypList.size();
- if (nbHyp == 1)
- break;
+ list< double > params;
+ BRepAdaptor_Curve C3d( E );
+ if ( ! computeInternalParameters( theMesh, C3d, length, f, l, params, false, true )) {
+ SMESH_subMesh * sm = theMesh.GetSubMesh(theShape);
+ 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;
+ }
+ redistributeNearVertices( theMesh, C3d, length, params, VFirst, VLast );
+
+ if(_quadraticMesh) {
+ 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_Quad_Edge] = 6;
+ }
+ else {
+ aVec[SMDSEntity_Node] = 5;
+ aVec[SMDSEntity_Edge] = 6;
}
}
- if (nbHyp > 1)
- _usedHypList.clear(); //only one compatible hypothesis allowed
- return _usedHypList;
-}
-//=============================================================================
-/*!
- *
- */
-//=============================================================================
+ SMESH_subMesh * sm = theMesh.GetSubMesh( theShape );
+ theResMap.insert( std::make_pair( sm, aVec ));
-ostream & StdMeshers_Regular_1D::SaveTo(ostream & save)
-{
- return save;
+ return true;
}
+
//=============================================================================
/*!
- *
+ * See comments in SMESH_Algo.cxx
*/
//=============================================================================
-istream & StdMeshers_Regular_1D::LoadFrom(istream & load)
+const list <const SMESHDS_Hypothesis *> &
+StdMeshers_Regular_1D::GetUsedHypothesis(SMESH_Mesh & aMesh,
+ const TopoDS_Shape & aShape,
+ const bool ignoreAuxiliary)
{
- return load;
-}
+ _usedHypList.clear();
+ _mainEdge.Nullify();
-//=============================================================================
-/*!
- *
- */
-//=============================================================================
+ SMESH_HypoFilter auxiliaryFilter( SMESH_HypoFilter::IsAuxiliary() );
+ const SMESH_HypoFilter* compatibleFilter = GetCompatibleHypoFilter(/*ignoreAux=*/true );
-ostream & operator <<(ostream & save, StdMeshers_Regular_1D & hyp)
-{
- return hyp.SaveTo( save );
+ // get non-auxiliary assigned directly to aShape
+ int nbHyp = aMesh.GetHypotheses( aShape, *compatibleFilter, _usedHypList, false );
+
+ if (nbHyp == 0 && aShape.ShapeType() == TopAbs_EDGE)
+ {
+ // Check, if propagated from some other edge
+ bool isPropagOfDistribution = false;
+ _mainEdge = StdMeshers_Propagation::GetPropagationSource( aMesh, aShape,
+ isPropagOfDistribution );
+ if ( !_mainEdge.IsNull() )
+ {
+ if ( isPropagOfDistribution )
+ _hypType = DISTRIB_PROPAGATION;
+ // Propagation of 1D hypothesis from <aMainEdge> on this edge;
+ // get non-auxiliary assigned to _mainEdge
+ nbHyp = aMesh.GetHypotheses( _mainEdge, *compatibleFilter, _usedHypList, true );
+ }
+ }
+
+ if (nbHyp == 0) // nothing propagated nor assigned to aShape
+ {
+ SMESH_Algo::GetUsedHypothesis( aMesh, aShape, ignoreAuxiliary );
+ nbHyp = _usedHypList.size();
+ }
+ else
+ {
+ // get auxiliary hyps from aShape
+ aMesh.GetHypotheses( aShape, auxiliaryFilter, _usedHypList, true );
+ }
+ if ( nbHyp > 1 && ignoreAuxiliary )
+ _usedHypList.clear(); //only one compatible non-auxiliary hypothesis allowed
+
+ return _usedHypList;
}
-//=============================================================================
+//================================================================================
/*!
- *
+ * \brief Pass CancelCompute() to a child algorithm
*/
-//=============================================================================
+//================================================================================
-istream & operator >>(istream & load, StdMeshers_Regular_1D & hyp)
+void StdMeshers_Regular_1D::CancelCompute()
{
- return hyp.LoadFrom( load );
+ SMESH_Algo::CancelCompute();
+ if ( _hypType == ADAPTIVE )
+ _adaptiveHyp->GetAlgo()->CancelCompute();
}
