Adding Multinode method for smesh parallelism (with windows fixed)

[modules/smesh.git] / src / SMESH / SMESH_Mesh.hxx

diff --git a/src/SMESH/SMESH_Mesh.hxx b/src/SMESH/SMESH_Mesh.hxx
index e01595ae17010d7fd07e890da9cbba0489f9f1b8..4fa3a355d4626bb0150768b32c40a7b0ede1dc2b 100644 (file)
--- a/src/SMESH/SMESH_Mesh.hxx
+++ b/src/SMESH/SMESH_Mesh.hxx
@@ -51,7 +51,6 @@
 
 #ifndef WIN32
 #include <boost/filesystem.hpp>
-#include <boost/asio/thread_pool.hpp>
 #endif
 #include <boost/thread.hpp>
 
@@ -395,19 +394,9 @@ class SMESH_EXPORT SMESH_Mesh
   virtual void Lock(){};
   virtual void Unlock(){};
 
-  virtual int GetNbThreads(){return 0;};
-  virtual void SetNbThreads(long nbThreads){(void) nbThreads;};
+  virtual void wait(){};
 
-  virtual void InitPoolThreads(){std::cout << "Should not pass here: InitPoolThread" << std::endl;};
-  virtual void DeletePoolThreads(){std::cout << "Should not pass here: DeletePoolThread" << std::endl;};
-  virtual void wait(){std::cout << "Should not pass here: wait" << std::endl;};
-
-  virtual bool IsParallel(){std::cout << "Should not pass here: IsParallel" << std::endl;return false;};
-
-#ifndef WIN32
-  virtual boost::filesystem::path GetTmpFolder() {return "";};
-  virtual boost::asio::thread_pool* GetPool() {return NULL;};
-#endif
+  virtual bool IsParallel(){throw SALOME_Exception("Calling SMESH_Mesh::IsParallel");return false;};
 
   virtual bool ComputeSubMeshes(
             SMESH_Gen* gen,
@@ -419,7 +408,7 @@ class SMESH_EXPORT SMESH_Mesh
             SMESH_subMesh::compute_event &computeEvent,
             const bool includeSelf,
             const bool complexShapeFirst,
-            const bool aShapeOnly){(void) gen;(void) aMesh;(void) aShape;(void) aDim;(void) aShapesId;(void) allowedSubShapes;(void) computeEvent;(void) includeSelf;(void) complexShapeFirst;(void) aShapeOnly;std::cout << "Should not pass here: computesubmesh" << std::endl;return false;};
+            const bool aShapeOnly){(void) gen;(void) aMesh;(void) aShape;(void) aDim;(void) aShapesId;(void) allowedSubShapes;(void) computeEvent;(void) includeSelf;(void) complexShapeFirst;(void) aShapeOnly;throw SALOME_Exception("Calling SMESH_Mesh::ComputeSubMeshes");return false;};
 
 private:
 
@@ -467,12 +456,6 @@ protected:
   // 2) to forget not loaded mesh data at hyp modification
   TCallUp*                    _callUp;
 
-  // Mutex for multhitreading write in SMESH_Mesh
-#ifndef WIN32
-  boost::mutex _my_lock;
-#endif
-  int _NbThreads=-1;
-
 protected:
   SMESH_Mesh();
   SMESH_Mesh(const SMESH_Mesh&) {};