Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fluid threads: add a restore to former omp threadcount when baking is done, todo: default should be logical corecount

Browse Source
This commit is contained in:
Jens Verwiebe
2013-04-10 23:10:25 +00:00
parent 5eb37f9e5c
commit 5ac66ee378
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
intern/elbeem/intern/simulation_object.cpp
View File

@@ -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);