diff options
| author | Jens Verwiebe <info@jensverwiebe.de> | 2013-04-11 03:19:57 +0400 |
|---|---|---|
| committer | Jens Verwiebe <info@jensverwiebe.de> | 2013-04-11 03:19:57 +0400 |
| commit | b9b23d697bf2682b027e9f4cc5a89a6716cf1edf (patch) | |
| tree | 2e15a63b7c7e7e8f9112d62f4c4d35eec56f4af8 /intern/elbeem | |
| parent | 5ac66ee378e418adf8029a8f5c16f2db3a253c76 (diff) | |
Fluid threads: re-add an erratically forgotten line, fix typo, set default threadcount to logical threadcount of machine
Diffstat (limited to 'intern/elbeem')
| -rw-r--r-- | intern/elbeem/intern/simulation_object.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/intern/elbeem/intern/simulation_object.cpp b/intern/elbeem/intern/simulation_object.cpp index 4227351f988..d89b28bbf7a 100644 --- a/intern/elbeem/intern/simulation_object.cpp +++ b/intern/elbeem/intern/simulation_object.cpp @@ -73,7 +73,7 @@ SimulationObject::~SimulationObject() 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); + printf("Resetting omp_threads to cached value %d \n", omp_threadcache); #endif } @@ -185,6 +185,7 @@ int SimulationObject::initializeLbmSimulation(ntlRenderGlobals *glob) mpLbm->setSmoothing(1.0 * mpElbeemSettings->surfaceSmoothing, 1.0 * mpElbeemSettings->surfaceSmoothing); mpLbm->setIsoSubdivs(mpElbeemSettings->surfaceSubdivs); #if PARALLEL==1 + omp_threadcache = omp_get_max_threads(); omp_set_num_threads(mpElbeemSettings->threads); printf("Setting omp_threads to usersetting %d \n", mpElbeemSettings->threads); #endif |