From b9b23d697bf2682b027e9f4cc5a89a6716cf1edf Mon Sep 17 00:00:00 2001 From: Jens Verwiebe Date: Wed, 10 Apr 2013 23:19:57 +0000 Subject: Fluid threads: re-add an erratically forgotten line, fix typo, set default threadcount to logical threadcount of machine --- intern/elbeem/intern/simulation_object.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'intern/elbeem') 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 -- cgit v1.2.3