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
Corrections for compilation on other OS
[modules/smesh.git]
/
src
/
SMESH
/
SMESH_Gen.cxx
diff --git
a/src/SMESH/SMESH_Gen.cxx
b/src/SMESH/SMESH_Gen.cxx
index f977bce53378968d12889c85177806cd08f6365d..0d59428af2f569df698a11901a4806b462c633fd 100644
(file)
--- a/
src/SMESH/SMESH_Gen.cxx
+++ b/
src/SMESH/SMESH_Gen.cxx
@@
-28,6
+28,7
@@
//#define CHRONODEF
//#define CHRONODEF
+#include <boost/asio.hpp>
#include "SMESH_Gen.hxx"
#include "SMESH_DriverMesh.hxx"
#include "SMESH_Gen.hxx"
#include "SMESH_DriverMesh.hxx"
@@
-58,7
+59,6
@@
using namespace std;
#include <boost/filesystem.hpp>
using namespace std;
#include <boost/filesystem.hpp>
-#include <boost/asio.hpp>
namespace fs = boost::filesystem;
// Environment variable separator
namespace fs = boost::filesystem;
// Environment variable separator
@@
-161,6
+161,11
@@
SMESH_Mesh* SMESH_Gen::CreateMesh(bool theIsEmbeddedMode)
}
}
+//=============================================================================
+/*!
+ * Algo to run the computation of all the submeshes of a mesh in sequentila
+ */
+//=============================================================================
bool SMESH_Gen::sequentialComputeSubMeshes(
SMESH_Mesh & aMesh,
bool SMESH_Gen::sequentialComputeSubMeshes(
SMESH_Mesh & aMesh,
@@
-225,8
+230,8
@@
bool SMESH_Gen::sequentialComputeSubMeshes(
//=============================================================================
/*
//=============================================================================
/*
- *
Parallel
compute of a submesh
- * This function is
used to pass to thread_
pool
+ * compute of a submesh
+ * This function is
passed to the thread
pool
*/
//=============================================================================
const std::function<void(SMESH_subMesh*,
*/
//=============================================================================
const std::function<void(SMESH_subMesh*,
@@
-235,7
+240,7
@@
const std::function<void(SMESH_subMesh*,
bool,
TopTools_IndexedMapOfShape *,
TSetOfInt*)>
bool,
TopTools_IndexedMapOfShape *,
TSetOfInt*)>
- compute_function([
&
] (SMESH_subMesh* sm,
+ compute_function([] (SMESH_subMesh* sm,
SMESH_subMesh::compute_event event,
SMESH_subMesh *shapeSM,
bool aShapeOnly,
SMESH_subMesh::compute_event event,
SMESH_subMesh *shapeSM,
bool aShapeOnly,
@@
-256,6
+261,12
@@
const std::function<void(SMESH_subMesh*,
});
});
+//=============================================================================
+/*!
+ * Algo to run the computation of all the submeshes of a mesh in parallel
+ */
+//=============================================================================
+
bool SMESH_Gen::parallelComputeSubMeshes(
SMESH_Mesh & aMesh,
const TopoDS_Shape & aShape,
bool SMESH_Gen::parallelComputeSubMeshes(
SMESH_Mesh & aMesh,
const TopoDS_Shape & aShape,
@@
-279,7
+290,7
@@
bool SMESH_Gen::parallelComputeSubMeshes(
TopAbs_ShapeEnum previousShapeType = TopAbs_VERTEX;
int nbThreads = aMesh.GetNbThreads();
TopAbs_ShapeEnum previousShapeType = TopAbs_VERTEX;
int nbThreads = aMesh.GetNbThreads();
- MESSAGE("Compute submeshes with threads: " << nbThreads
<< " mesher: " << aMesh.GetMesherNbThreads()
);
+ MESSAGE("Compute submeshes with threads: " << nbThreads);
smIt = shapeSM->getDependsOnIterator(includeSelf, !complexShapeFirst);
smIt = shapeSM->getDependsOnIterator(includeSelf, !complexShapeFirst);