[Bf-blender-cvs] [6bb090f] master: Building elbeem without openmp failed

Campbell Barton noreply at git.blender.org
Wed Feb 5 16:27:14 CET 2014


Commit: 6bb090f4bb4e27885e509f5d3729722c913e512c
Author: Campbell Barton
Date:   Thu Feb 6 02:26:08 2014 +1100
https://developer.blender.org/rB6bb090f4bb4e27885e509f5d3729722c913e512c

Building elbeem without openmp failed

===================================================================

M	intern/elbeem/intern/solver_init.cpp

===================================================================

diff --git a/intern/elbeem/intern/solver_init.cpp b/intern/elbeem/intern/solver_init.cpp
index fcb9cbf..31372f1 100644
--- a/intern/elbeem/intern/solver_init.cpp
+++ b/intern/elbeem/intern/solver_init.cpp
@@ -799,6 +799,7 @@ bool LbmFsgrSolver::initializeSolverMemory()
 		mLevel[i].avgOmegaCnt = 0.0;
 	}
 
+#if PARALLEL == 1
 	/*
 	// DG: this would be the correct sanity check, not the "hack below" */
 	// if(( mSizey / mNumOMPThreads) * mNumOMPThreads != mSizey) {
@@ -807,6 +808,7 @@ bool LbmFsgrSolver::initializeSolverMemory()
 	if( mSizey < mNumOMPThreads ) {
 		setNumOMPThreads(mSizey);
 	}
+#endif
 
 	// init sizes
 	mLevel[mMaxRefine].lSizex = mSizex;




More information about the Bf-blender-cvs mailing list