Salome HOME
projects
/
modules
/
smesh.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix for parallel compilation with CMake 3.12.1
[modules/smesh.git]
/
src
/
StdMeshers
/
StdMeshers_Adaptive1D.cxx
diff --git
a/src/StdMeshers/StdMeshers_Adaptive1D.cxx
b/src/StdMeshers/StdMeshers_Adaptive1D.cxx
index 2fc76a7b3d555c566c08102b30fce5ffa19a4580..eee26d9726f729eb4f44e1ab0c14ce3e6e397ec1 100644
(file)
--- a/
src/StdMeshers/StdMeshers_Adaptive1D.cxx
+++ b/
src/StdMeshers/StdMeshers_Adaptive1D.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-201
5
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-201
6
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
//
// 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 "StdMeshers_Adaptive1D.hxx"
+#include "SMESHDS_Mesh.hxx"
#include "SMESH_Gen.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_Mesh.hxx"
#include "SMESH_MesherHelper.hxx"
#include "SMESH_Octree.hxx"
#include "SMESH_subMesh.hxx"
-#include "SMESH_HypoFilter.hxx"
#include <Utils_SALOME_Exception.hxx>
#include <Utils_SALOME_Exception.hxx>
@@
-154,7
+155,7
@@
namespace // internal utils
class AdaptiveAlgo : public StdMeshers_Regular_1D
{
public:
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,
virtual bool Compute(SMESH_Mesh & aMesh, const TopoDS_Shape & aShape );
virtual bool Evaluate(SMESH_Mesh & theMesh,
const TopoDS_Shape & theShape,
@@
-653,7
+654,7
@@
namespace // internal utils
//================================================================================
/*!
//================================================================================
/*!
- * \brief Const
ur
ct ElementBndBoxTree of Poly_Triangulation of a FACE
+ * \brief Const
ru
ct 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,
//function : StdMeshers_Adaptive1D
//purpose : Constructor
StdMeshers_Adaptive1D::StdMeshers_Adaptive1D(int hypId,
- int studyId,
SMESH_Gen * gen)
SMESH_Gen * gen)
- :SMESH_Hypothesis(hypId,
studyId,
gen)
+ :SMESH_Hypothesis(hypId, gen)
{
myMinSize = 1e-10;
myMaxSize = 1e+10;
{
myMinSize = 1e-10;
myMaxSize = 1e+10;
@@
-992,7
+992,7
@@
ostream & StdMeshers_Adaptive1D::SaveTo(ostream & save)
istream & StdMeshers_Adaptive1D::LoadFrom(istream & load)
{
int dummyParam;
istream & StdMeshers_Adaptive1D::LoadFrom(istream & load)
{
int dummyParam;
- bool isOK = (load >> myMinSize >> myMaxSize >> myDeflection >> dummyParam >> dummyParam);
+ bool isOK =
static_cast<bool>
(load >> myMinSize >> myMaxSize >> myDeflection >> dummyParam >> dummyParam);
if (!isOK)
load.clear(ios::badbit | load.rdstate());
return load;
if (!isOK)
load.clear(ios::badbit | load.rdstate());
return load;
@@
-1075,7
+1075,7
@@
SMESH_Algo* StdMeshers_Adaptive1D::GetAlgo() const
if ( !myAlgo )
{
AdaptiveAlgo* newAlgo =
if ( !myAlgo )
{
AdaptiveAlgo* newAlgo =
- new AdaptiveAlgo( _gen->GetANewId(), _
studyId, _
gen );
+ new AdaptiveAlgo( _gen->GetANewId(), _gen );
newAlgo->SetHypothesis( this );
((StdMeshers_Adaptive1D*) this)->myAlgo = newAlgo;
newAlgo->SetHypothesis( this );
((StdMeshers_Adaptive1D*) this)->myAlgo = newAlgo;
@@
-1090,9
+1090,8
@@
SMESH_Algo* StdMeshers_Adaptive1D::GetAlgo() const
//================================================================================
AdaptiveAlgo::AdaptiveAlgo(int hypId,
//================================================================================
AdaptiveAlgo::AdaptiveAlgo(int hypId,
- int studyId,
SMESH_Gen* gen)
SMESH_Gen* gen)
- : StdMeshers_Regular_1D( hypId,
studyId,
gen ),
+ : StdMeshers_Regular_1D( hypId, gen ),
myHyp(NULL)
{
_name = "AdaptiveAlgo_1D";
myHyp(NULL)
{
_name = "AdaptiveAlgo_1D";