[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [12672] branches/cloth/blender: Commit of fluid fix for 32/64bit and max 2.5gb ram issue

[Daniel Genrich]

Revision: 12672
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=12672
Author:   genscher
Date:     2007-11-25 22:14:52 +0100 (Sun, 25 Nov 2007)

Log Message:
-----------
Commit of fluid fix for 32/64bit and max 2.5gb ram issue

Modified Paths:
--------------
    branches/cloth/blender/intern/elbeem/intern/loop_tools.h
    branches/cloth/blender/intern/elbeem/intern/solver_init.cpp
    branches/cloth/blender/intern/elbeem/intern/solver_main.cpp
    branches/cloth/blender/source/blender/blenkernel/BKE_cloth.h
    branches/cloth/blender/source/blender/blenkernel/intern/implicit.c

Modified: branches/cloth/blender/intern/elbeem/intern/loop_tools.h
===================================================================
--- branches/cloth/blender/intern/elbeem/intern/loop_tools.h	2007-11-25 20:49:38 UTC (rev 12671)
+++ branches/cloth/blender/intern/elbeem/intern/loop_tools.h	2007-11-25 21:14:52 UTC (rev 12672)
@@ -91,8 +91,8 @@
 	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(); \
 	 \

Modified: branches/cloth/blender/intern/elbeem/intern/solver_init.cpp
===================================================================
--- branches/cloth/blender/intern/elbeem/intern/solver_init.cpp	2007-11-25 20:49:38 UTC (rev 12671)
+++ branches/cloth/blender/intern/elbeem/intern/solver_init.cpp	2007-11-25 21:14:52 UTC (rev 12672)
@@ -703,11 +703,12 @@
 			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);

Modified: branches/cloth/blender/intern/elbeem/intern/solver_main.cpp
===================================================================
--- branches/cloth/blender/intern/elbeem/intern/solver_main.cpp	2007-11-25 20:49:38 UTC (rev 12671)
+++ branches/cloth/blender/intern/elbeem/intern/solver_main.cpp	2007-11-25 21:14:52 UTC (rev 12672)
@@ -363,10 +363,7 @@
 
 	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; }

Modified: branches/cloth/blender/source/blender/blenkernel/BKE_cloth.h
===================================================================
--- branches/cloth/blender/source/blender/blenkernel/BKE_cloth.h	2007-11-25 20:49:38 UTC (rev 12671)
+++ branches/cloth/blender/source/blender/blenkernel/BKE_cloth.h	2007-11-25 21:14:52 UTC (rev 12672)
@@ -63,6 +63,7 @@
 	float 	goal;		/* goal, from SB			*/
 	float	impulse[3];	/* used in collision.c */
 	unsigned int impulse_count; /* same as above */
+	float collball;
 } ClothVertex;
 
 typedef struct ClothSpring {

Modified: branches/cloth/blender/source/blender/blenkernel/intern/implicit.c
===================================================================
--- branches/cloth/blender/source/blender/blenkernel/intern/implicit.c	2007-11-25 20:49:38 UTC (rev 12671)
+++ branches/cloth/blender/source/blender/blenkernel/intern/implicit.c	2007-11-25 21:14:52 UTC (rev 12672)
@@ -1465,7 +1465,7 @@
 			}
 			
 			// call collision function
-			result = 0; // cloth_bvh_objcollision(clmd, step + dt, step, dt);
+			result = cloth_bvh_objcollision(clmd, step + dt, step, dt);
 			
 			// copy corrected positions back to simulation
 			if(result)