diff options
| author | Daniel Genrich <daniel.genrich@gmx.net> | 2007-11-26 00:14:52 +0300 |
|---|---|---|
| committer | Daniel Genrich <daniel.genrich@gmx.net> | 2007-11-26 00:14:52 +0300 |
| commit | c8a412cdcb4059990c2e23f42ee54691daedf13a (patch) | |
| tree | 93c52df86d002143c443321de726c74334d3bcbe /intern/elbeem | |
| parent | b5974a058610f9d1f799618724d9fb890fc0be26 (diff) | |
Commit of fluid fix for 32/64bit and max 2.5gb ram issue
Diffstat (limited to 'intern/elbeem')
| -rw-r--r-- | intern/elbeem/intern/loop_tools.h | 2 | ||||
| -rw-r--r-- | intern/elbeem/intern/solver_init.cpp | 5 | ||||
| -rw-r--r-- | intern/elbeem/intern/solver_main.cpp | 5 |
3 files changed, 5 insertions, 7 deletions
diff --git a/intern/elbeem/intern/loop_tools.h b/intern/elbeem/intern/loop_tools.h index 70ecb9ce3e0..8ff51039bf2 100644 --- a/intern/elbeem/intern/loop_tools.h +++ b/intern/elbeem/intern/loop_tools.h @@ -91,7 +91,7 @@ calcListEmpty.reserve(mListEmpty.capacity() / omp_get_num_threads() ); \ calcListFull.reserve( mListFull.capacity() / omp_get_num_threads() ); \ calcListParts.reserve(mSizex); \ - \ + printf("omp_get_num_threads: %d\n", omp_get_num_threads()); \ \ const int id = omp_get_thread_num(); \ const int Nthrds = omp_get_num_threads(); \ diff --git a/intern/elbeem/intern/solver_init.cpp b/intern/elbeem/intern/solver_init.cpp index b0ce130c136..105c8ff3094 100644 --- a/intern/elbeem/intern/solver_init.cpp +++ b/intern/elbeem/intern/solver_init.cpp @@ -703,11 +703,12 @@ bool LbmFsgrSolver::initializeSolverMemory() memBlockAllocProblem = true; } #endif // Mac - if(sizeof(int)==4 && memEstFine>maxDefaultMemChunk) { + if(sizeof(void *)==4 && memEstFine>maxDefaultMemChunk) { // max memory chunk for 32bit systems 2gig memBlockAllocProblem = true; + } - + if(memEstFromFunc>memLimit || memBlockAllocProblem) { sizeReduction *= 0.9; mSizex = (int)(orgSx * sizeReduction); diff --git a/intern/elbeem/intern/solver_main.cpp b/intern/elbeem/intern/solver_main.cpp index 8ec667b8cb6..0f788af7955 100644 --- a/intern/elbeem/intern/solver_main.cpp +++ b/intern/elbeem/intern/solver_main.cpp @@ -363,10 +363,7 @@ LbmFsgrSolver::mainLoop(int lev) const int cutMin = 1; const int cutConst = mCutoff+2; -#if PARALLEL==1 - printf("omp_get_num_threads: %d\n", omp_get_num_threads()); -#endif - + # if LBM_INCLUDE_TESTSOLVERS==1 // 3d region off... quit if((mUseTestdata)&&(mpTest->mFarfMode>0)) { return; } |