[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [55678] trunk/blender/intern/elbeem/intern /solver_init.cpp: Elbeem fluid: Remove hardcoded 16GB RAM limit on 64bit systems

[Daniel Genrich]

Revision: 55678
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=55678
Author:   genscher
Date:     2013-03-30 20:50:28 +0000 (Sat, 30 Mar 2013)
Log Message:
-----------
Elbeem fluid: Remove hardcoded 16GB RAM limit on 64bit systems

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

Modified: trunk/blender/intern/elbeem/intern/solver_init.cpp
===================================================================
--- trunk/blender/intern/elbeem/intern/solver_init.cpp	2013-03-30 16:42:59 UTC (rev 55677)
+++ trunk/blender/intern/elbeem/intern/solver_init.cpp	2013-03-30 20:50:28 UTC (rev 55678)
@@ -691,7 +691,8 @@
 		calculateMemreqEstimate( mSizex, mSizey, mSizez, 
 				mMaxRefine, mFarFieldSize, &memEstFromFunc, &memEstFine, &memreqStr );
 		
-		double memLimit;
+		bool noLimit = false;
+		double memLimit = 0.;
 		string memLimStr("-");
 		if(sizeof(void*)==4) {
 			// 32bit system, limit to 2GB
@@ -699,8 +700,9 @@
 			memLimStr = string("2GB");
 		} else {
 			// 64bit, just take 16GB as limit for now...
-			memLimit = 16.0* 1024.0*1024.0*1024.0;
-			memLimStr = string("16GB");
+			// memLimit = 16.0* 1024.0*1024.0*1024.0;
+			// memLimStr = string("16GB");
+			noLimit = true;
 		}
 
 		// restrict max. chunk of 1 mem block to 1GB for windos
@@ -724,7 +726,7 @@
 			memBlockAllocProblem = true;
 		}
 
-		if(memEstFromFunc>memLimit || memBlockAllocProblem) {
+		if(!noLimit && (memEstFromFunc>memLimit || memBlockAllocProblem)) {
 			sizeReduction *= 0.9;
 			mSizex = (int)(orgSx * sizeReduction);
 			mSizey = (int)(orgSy * sizeReduction);