diff options
| author | Jens Verwiebe <info@jensverwiebe.de> | 2013-04-11 03:10:25 +0400 |
|---|---|---|
| committer | Jens Verwiebe <info@jensverwiebe.de> | 2013-04-11 03:10:25 +0400 |
| commit | 5ac66ee378e418adf8029a8f5c16f2db3a253c76 (patch) | |
| tree | cd9dc7c91fc6b11225cf59c96995695954b92606 /intern/elbeem | |
| parent | 5eb37f9e5cd07dde10cc84b83c0d2ed8c4014631 (diff) | |
Fluid threads: add a restore to former omp threadcount when baking is done, todo: default should be logical corecount
Diffstat (limited to 'intern/elbeem')
| -rw-r--r-- | intern/elbeem/intern/simulation_object.cpp | 8 |
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); |