X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FStdMeshers%2FStdMeshers_Adaptive1D.cxx;h=6b30e8fa4b8bbce2a7b941d67b9fa4f7105dfe3b;hb=refs%2Ftags%2FV9_7_0b1;hp=bd3274d221228de247fe6481b614e05a7342d324;hpb=a17b36970bc61da1d664453c615754997c925b18;p=modules%2Fsmesh.git

diff --git a/src/StdMeshers/StdMeshers_Adaptive1D.cxx b/src/StdMeshers/StdMeshers_Adaptive1D.cxx
index bd3274d22..6b30e8fa4 100644
--- a/src/StdMeshers/StdMeshers_Adaptive1D.cxx
+++ b/src/StdMeshers/StdMeshers_Adaptive1D.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2016  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2021  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
@@ -24,12 +24,13 @@
 //
 #include "StdMeshers_Adaptive1D.hxx"
 
+#include "SMESHDS_Mesh.hxx"
 #include "SMESH_Gen.hxx"
+#include "SMESH_HypoFilter.hxx"
 #include "SMESH_Mesh.hxx"
 #include "SMESH_MesherHelper.hxx"
 #include "SMESH_Octree.hxx"
 #include "SMESH_subMesh.hxx"
-#include "SMESH_HypoFilter.hxx"
 
 #include <Utils_SALOME_Exception.hxx>
 
@@ -154,7 +155,7 @@ namespace // internal utils
   class AdaptiveAlgo : public StdMeshers_Regular_1D
   {
   public:
-    AdaptiveAlgo(int hypId, int studyId, SMESH_Gen* gen);
+    AdaptiveAlgo(int hypId, SMESH_Gen* gen);
     virtual bool Compute(SMESH_Mesh & aMesh, const TopoDS_Shape & aShape );
     virtual bool Evaluate(SMESH_Mesh &         theMesh,
                           const TopoDS_Shape & theShape,
@@ -442,7 +443,7 @@ namespace // internal utils
     double a[3];
     bool   isDone[3];
     double size = -1., maxLinkLen;
-    int    jLongest;
+    int    jLongest = 0;
 
     //int nbLinks = 0;
     for ( int i = 1; i <= myPolyTrias->Upper(); ++i )
@@ -653,7 +654,7 @@ namespace // internal utils
 
   //================================================================================
   /*!
-   * \brief Consturct ElementBndBoxTree of Poly_Triangulation of a FACE
+   * \brief Construct ElementBndBoxTree of Poly_Triangulation of a FACE
    */
   //================================================================================
 
@@ -915,9 +916,8 @@ namespace // internal utils
 //function : StdMeshers_Adaptive1D
 //purpose  : Constructor
 StdMeshers_Adaptive1D::StdMeshers_Adaptive1D(int         hypId,
-                                             int         studyId,
                                              SMESH_Gen * gen)
-  :SMESH_Hypothesis(hypId, studyId, gen)
+  :SMESH_Hypothesis(hypId, gen)
 {
   myMinSize       = 1e-10;
   myMaxSize       = 1e+10;
@@ -937,7 +937,6 @@ StdMeshers_Adaptive1D::~StdMeshers_Adaptive1D()
 //function : SetDeflection
 //purpose  : 
 void StdMeshers_Adaptive1D::SetDeflection(double value)
-  throw(SALOME_Exception)
 {
   if (value <= std::numeric_limits<double>::min() )
     throw SALOME_Exception("Deflection must be greater that zero");
@@ -951,7 +950,6 @@ void StdMeshers_Adaptive1D::SetDeflection(double value)
 //function : SetMinSize
 //purpose  : Sets minimal allowed segment length
 void StdMeshers_Adaptive1D::SetMinSize(double minSize)
-  throw(SALOME_Exception)
 {
   if (minSize <= std::numeric_limits<double>::min() )
     throw SALOME_Exception("Min size must be greater that zero");
@@ -966,7 +964,6 @@ void StdMeshers_Adaptive1D::SetMinSize(double minSize)
 //function : SetMaxSize
 //purpose  : Sets maximal allowed segment length
 void StdMeshers_Adaptive1D::SetMaxSize(double maxSize)
-  throw(SALOME_Exception)
 {
   if (maxSize <= std::numeric_limits<double>::min() )
     throw SALOME_Exception("Max size must be greater that zero");
@@ -1075,7 +1072,7 @@ SMESH_Algo* StdMeshers_Adaptive1D::GetAlgo() const
   if ( !myAlgo )
   {
     AdaptiveAlgo* newAlgo = 
-      new AdaptiveAlgo( _gen->GetANewId(), _studyId, _gen );
+      new AdaptiveAlgo( _gen->GetANewId(), _gen );
     newAlgo->SetHypothesis( this );
 
     ((StdMeshers_Adaptive1D*) this)->myAlgo = newAlgo;
@@ -1090,9 +1087,8 @@ SMESH_Algo* StdMeshers_Adaptive1D::GetAlgo() const
 //================================================================================
 
 AdaptiveAlgo::AdaptiveAlgo(int        hypId,
-                           int        studyId,
                            SMESH_Gen* gen)
-  : StdMeshers_Regular_1D( hypId, studyId, gen ),
+  : StdMeshers_Regular_1D( hypId, gen ),
     myHyp(NULL)
 {
   _name = "AdaptiveAlgo_1D";