Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--intern/elbeem/intern/simulation_object.cpp8
1 files changed, 8 insertions, 0 deletions
diff --git a/intern/elbeem/intern/simulation_object.cpp b/intern/elbeem/intern/simulation_object.cpp
index d7b73a3cefb..4227351f988 100644
--- a/intern/elbeem/intern/simulation_object.cpp
+++ b/intern/elbeem/intern/simulation_object.cpp
@@ -32,6 +32,9 @@
//! lbm factory functions
LbmSolverInterface* createSolver();
+#if PARALLEL==1
+int omp_threadcache;
+#endif
/******************************************************************************
* Constructor
@@ -68,6 +71,10 @@ SimulationObject::~SimulationObject()
if(mpParam) delete mpParam;
if(mpParts) delete mpParts;
debMsgStd("SimulationObject",DM_MSG,"El'Beem Done!\n",10);
+#if PARALLEL==1
+ omp_set_num_threads(omp_threadcache);
+ printf("Resetting omp_threads to cached vakue %d \n", omp_threadcache);
+#endif
}
@@ -179,6 +186,7 @@ int SimulationObject::initializeLbmSimulation(ntlRenderGlobals *glob)
mpLbm->setIsoSubdivs(mpElbeemSettings->surfaceSubdivs);
#if PARALLEL==1
omp_set_num_threads(mpElbeemSettings->threads);
+ printf("Setting omp_threads to usersetting %d \n", mpElbeemSettings->threads);
#endif
mpLbm->setSizeX(mpElbeemSettings->resolutionxyz);
mpLbm->setSizeY(mpElbeemSettings->resolutionxyz);