ForkMaster/smesh
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/smesh.git synced 2024-12-25 08:50:35 +05:00
Code Issues Packages Projects Releases Wiki Activity

Back to WIN32

Browse Source
This commit is contained in:
Yoann Audouin 2023-03-28 08:46:24 +02:00
parent 9afcd890f5
commit 3802af1251
5 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/SMESH/SMESH_DriverShape.cxx
View File

@ -40,7 +40,7 @@
//Occ include //Occ include
#include <TopoDS.hxx> #include <TopoDS.hxx>
#ifndef DISABLE_PSMESH #ifndef WIN32
#include <boost/filesystem.hpp> #include <boost/filesystem.hpp>
#include <boost/algorithm/string.hpp> #include <boost/algorithm/string.hpp>
namespace fs = boost::filesystem; namespace fs = boost::filesystem;
@ -148,7 +148,7 @@ int exportBREPShape(const std::string shape_file, const TopoDS_Shape& aShape){
* @return error code * @return error code
*/ */
int SMESH_DriverShape::importShape(const std::string shape_file, TopoDS_Shape& aShape){ int SMESH_DriverShape::importShape(const std::string shape_file, TopoDS_Shape& aShape){
#ifndef DISABLE_PSMESH #ifndef WIN32
std::string type = fs::path(shape_file).extension().string(); std::string type = fs::path(shape_file).extension().string();
boost::algorithm::to_lower(type); boost::algorithm::to_lower(type);
if (type == ".brep"){ if (type == ".brep"){
@ -172,7 +172,7 @@ int SMESH_DriverShape::importShape(const std::string shape_file, TopoDS_Shape& a
* @return error code * @return error code
*/ */
int SMESH_DriverShape::exportShape(const std::string shape_file, const TopoDS_Shape& aShape){ int SMESH_DriverShape::exportShape(const std::string shape_file, const TopoDS_Shape& aShape){
#ifndef DISABLE_PSMESH #ifndef WIN32
std::string type = fs::path(shape_file).extension().string(); std::string type = fs::path(shape_file).extension().string();
boost::algorithm::to_lower(type); boost::algorithm::to_lower(type);
if (type == ".brep"){ if (type == ".brep"){

6
src/SMESH/SMESH_Gen.cxx
View File

@ -57,12 +57,12 @@
#include <Basics_Utils.hxx> #include <Basics_Utils.hxx>
#ifndef DISABLE_PSMESH #ifndef WIN32
#include <boost/asio.hpp> #include <boost/asio.hpp>
#endif #endif
using namespace std; using namespace std;
#ifndef DISABLE_PSMESH #ifndef WIN32
#include <boost/filesystem.hpp> #include <boost/filesystem.hpp>
namespace fs = boost::filesystem; namespace fs = boost::filesystem;
#endif #endif
@ -307,7 +307,7 @@ bool SMESH_Gen::parallelComputeSubMeshes(
const bool complexShapeFirst, const bool complexShapeFirst,
const bool aShapeOnly) const bool aShapeOnly)
{ {
#ifdef DISABLE_PSMESH #ifdef WIN32
throw SALOME_Exception("ParallelMesh is not working on Windows"); throw SALOME_Exception("ParallelMesh is not working on Windows");
#else #else

6
src/SMESH/SMESH_Mesh.hxx
View File

@ -49,7 +49,7 @@
#include <vector> #include <vector>
#include <ostream> #include <ostream>
#ifndef DISABLE_PSMESH #ifndef WIN32
#include <boost/filesystem.hpp> #include <boost/filesystem.hpp>
#include <boost/asio/thread_pool.hpp> #include <boost/asio/thread_pool.hpp>
#endif #endif
@ -404,7 +404,7 @@ class SMESH_EXPORT SMESH_Mesh
virtual bool IsParallel(){std::cout << "Should not pass here: IsParallel" << std::endl;return false;}; virtual bool IsParallel(){std::cout << "Should not pass here: IsParallel" << std::endl;return false;};
#ifndef DISABLE_PSMESH #ifndef WIN32
virtual boost::filesystem::path GetTmpFolder() {return "";}; virtual boost::filesystem::path GetTmpFolder() {return "";};
virtual boost::asio::thread_pool* GetPool() {return NULL;}; virtual boost::asio::thread_pool* GetPool() {return NULL;};
#endif #endif
@ -468,7 +468,7 @@ protected:
TCallUp* _callUp; TCallUp* _callUp;
// Mutex for multhitreading write in SMESH_Mesh // Mutex for multhitreading write in SMESH_Mesh
#ifndef DISABLE_PSMESH #ifndef WIN32
boost::mutex _my_lock; boost::mutex _my_lock;
#endif #endif
int _NbThreads=-1; int _NbThreads=-1;

10
src/SMESH/SMESH_ParallelMesh.cxx
View File

@ -32,12 +32,12 @@
#include <windows.h> #include <windows.h>
#endif #endif
#ifndef DISABLE_PSMESH #ifndef WIN32
#include <boost/filesystem.hpp> #include <boost/filesystem.hpp>
namespace fs=boost::filesystem; namespace fs=boost::filesystem;
#endif #endif
#ifndef DISABLE_PSMESH #ifndef WIN32
#include <boost/asio.hpp> #include <boost/asio.hpp>
#endif #endif
@ -58,7 +58,7 @@ SMESH_ParallelMesh::SMESH_ParallelMesh(int theLocalId,
theDocument) theDocument)
{ {
MESSAGE("SMESH_ParallelMesh::SMESH_ParallelMesh(int localId)"); MESSAGE("SMESH_ParallelMesh::SMESH_ParallelMesh(int localId)");
#ifndef DISABLE_PSMESH #ifndef WIN32
_NbThreads = std::thread::hardware_concurrency(); _NbThreads = std::thread::hardware_concurrency();
#else #else
_NbThreads = 0; _NbThreads = 0;
@ -82,7 +82,7 @@ SMESH_ParallelMesh::~SMESH_ParallelMesh()
//============================================================================= //=============================================================================
void SMESH_ParallelMesh::CreateTmpFolder() void SMESH_ParallelMesh::CreateTmpFolder()
{ {
#ifndef DISABLE_PSMESH #ifndef WIN32
// Temporary folder that will be used by parallel computation // Temporary folder that will be used by parallel computation
tmp_folder = fs::temp_directory_path()/fs::unique_path(fs::path("SMESH_%%%%-%%%%")); tmp_folder = fs::temp_directory_path()/fs::unique_path(fs::path("SMESH_%%%%-%%%%"));
fs::create_directories(tmp_folder); fs::create_directories(tmp_folder);
@ -96,7 +96,7 @@ void SMESH_ParallelMesh::CreateTmpFolder()
//============================================================================= //=============================================================================
void SMESH_ParallelMesh::DeleteTmpFolder() void SMESH_ParallelMesh::DeleteTmpFolder()
{ {
#ifndef DISABLE_PSMESH #ifndef WIN32
fs::remove_all(tmp_folder); fs::remove_all(tmp_folder);
#endif #endif
} }

4
src/SMESH/SMESH_ParallelMesh.hxx
View File

@ -42,7 +42,7 @@ class SMESH_EXPORT SMESH_ParallelMesh: public SMESH_Mesh
virtual ~SMESH_ParallelMesh(); virtual ~SMESH_ParallelMesh();
#ifndef DISABLE_PSMESH #ifndef WIN32
void Lock() override {_my_lock.lock();}; void Lock() override {_my_lock.lock();};
void Unlock() override {_my_lock.unlock();}; void Unlock() override {_my_lock.unlock();};
@ -94,7 +94,7 @@ class SMESH_EXPORT SMESH_ParallelMesh: public SMESH_Mesh
SMESH_ParallelMesh():SMESH_Mesh() {}; SMESH_ParallelMesh():SMESH_Mesh() {};
SMESH_ParallelMesh(const SMESH_ParallelMesh& aMesh):SMESH_Mesh(aMesh) {}; SMESH_ParallelMesh(const SMESH_ParallelMesh& aMesh):SMESH_Mesh(aMesh) {};
private: private:
#ifndef DISABLE_PSMESH #ifndef WIN32
boost::filesystem::path tmp_folder; boost::filesystem::path tmp_folder;
boost::asio::thread_pool * _pool = nullptr; //thread pool for computation boost::asio::thread_pool * _pool = nullptr; //thread pool for computation
#endif #endif