[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [55945] trunk/blender/intern/elbeem/intern /simulation_object.cpp: Fluid threads: add a restore to former omp threadcount when baking is done, todo: default should be logical corecount

[jens verwiebe]

Revision: 55945
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=55945
Author:   jensverwiebe
Date:     2013-04-10 23:10:25 +0000 (Wed, 10 Apr 2013)
Log Message:
-----------
Fluid threads: add a restore to former omp threadcount when baking is done, todo: default should be logical corecount

Modified Paths:
--------------
    trunk/blender/intern/elbeem/intern/simulation_object.cpp

Modified: trunk/blender/intern/elbeem/intern/simulation_object.cpp
===================================================================
--- trunk/blender/intern/elbeem/intern/simulation_object.cpp	2013-04-10 23:05:35 UTC (rev 55944)
+++ trunk/blender/intern/elbeem/intern/simulation_object.cpp	2013-04-10 23:10:25 UTC (rev 55945)
@@ -32,6 +32,9 @@
 //! lbm factory functions
 LbmSolverInterface* createSolver();
 
+#if PARALLEL==1
+int omp_threadcache;
+#endif
 
 /******************************************************************************
  * Constructor
@@ -68,6 +71,10 @@
   	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 @@
 		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);