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
23092: EDF 10836 SMESH: UseExisting2DElements fails when geometry contains more than...
[modules/smesh.git]
/
src
/
SMESH
/
SMESH_Gen.hxx
diff --git
a/src/SMESH/SMESH_Gen.hxx
b/src/SMESH/SMESH_Gen.hxx
index 5462eacab103d169f65f131890a996a258b58df7..52877fda9fd529957507b1e5347f84e2dfba2380 100644
(file)
--- a/
src/SMESH/SMESH_Gen.hxx
+++ b/
src/SMESH/SMESH_Gen.hxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-201
4
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-201
5
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
@@
-37,8
+37,6
@@
#include "SMESH_Algo.hxx"
#include "SMESH_Mesh.hxx"
#include "SMESH_Algo.hxx"
#include "SMESH_Mesh.hxx"
-#include "chrono.hxx"
-
#include <TopoDS_Shape.hxx>
#include <map>
#include <TopoDS_Shape.hxx>
#include <map>
@@
-147,6
+145,7
@@
public:
{ return GetShapeDim( aShape.ShapeType() ); }
SMESH_Algo* GetAlgo(SMESH_Mesh & aMesh, const TopoDS_Shape & aShape, TopoDS_Shape* assignedTo=0);
{ return GetShapeDim( aShape.ShapeType() ); }
SMESH_Algo* GetAlgo(SMESH_Mesh & aMesh, const TopoDS_Shape & aShape, TopoDS_Shape* assignedTo=0);
+ SMESH_Algo* GetAlgo(SMESH_subMesh * aSubMesh, TopoDS_Shape* assignedTo=0);
static bool IsGlobalHypothesis(const SMESH_Hypothesis* theHyp, SMESH_Mesh& aMesh);
static bool IsGlobalHypothesis(const SMESH_Hypothesis* theHyp, SMESH_Mesh& aMesh);
@@
-174,8
+173,6
@@
private:
// default number of segments
int _nbSegments;
// default number of segments
int _nbSegments;
- counters *_counters;
-
volatile bool _compute_canceled;
SMESH_subMesh* _sm_current;
};
volatile bool _compute_canceled;
SMESH_subMesh* _sm_current;
};