[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [46949] branches/smoke2/intern/smoke/ intern/FLUID_3D.cpp: Fix another typo, but still not working

[Daniel Genrich]

Revision: 46949
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=46949
Author:   genscher
Date:     2012-05-23 19:28:58 +0000 (Wed, 23 May 2012)
Log Message:
-----------
Fix another typo, but still not working

Modified Paths:
--------------
    branches/smoke2/intern/smoke/intern/FLUID_3D.cpp

Modified: branches/smoke2/intern/smoke/intern/FLUID_3D.cpp
===================================================================
--- branches/smoke2/intern/smoke/intern/FLUID_3D.cpp	2012-05-23 19:07:01 UTC (rev 46948)
+++ branches/smoke2/intern/smoke/intern/FLUID_3D.cpp	2012-05-23 19:28:58 UTC (rev 46949)
@@ -932,6 +932,7 @@
 			}
 
 	unsigned int valCount = 0;
+	unsigned int rowCount = 0;
 	index = _slabSize + _xRes + 1;
 	for (z = 1; z < _zRes - 1; z++, index += 2 * _xRes)
 		for (y = 1; y < _yRes - 1; y++, index += 2)
@@ -939,22 +940,22 @@
 		if (!_obstacles[INDEX(x,y,z)])
 		{
 			if(Ai[INDEX(x - 1, y, z)] < 0)
-				A.insert(valCount, gridToIndex(INDEX(x - 1, y, z))) = Ai[INDEX(x - 1, y, z)];
+				A.insert(rowCount, gridToIndex(INDEX(x - 1, y, z))) = Ai[INDEX(x - 1, y, z)];
 			if(Aj[INDEX(x, y - 1, z)] < 0)
-				A.insert(valCount, gridToIndex(INDEX(x, y - 1, z))) = Aj[INDEX(x, y - 1, z)];
+				A.insert(rowCount, gridToIndex(INDEX(x, y - 1, z))) = Aj[INDEX(x, y - 1, z)];
 			if(Ak[INDEX(x, y, z - 1)] < 0)
-				A.insert(valCount, gridToIndex(INDEX(x, y, z - 1))) = Ak[INDEX(x, y, z - 1)];
+				A.insert(rowCount, gridToIndex(INDEX(x, y, z - 1))) = Ak[INDEX(x, y, z - 1)];
 
-			A.insert(valCount, gridToIndex(INDEX(x, y, z))) = A0[INDEX(x, y, z)];
+			A.insert(rowCount, gridToIndex(INDEX(x, y, z))) = A0[INDEX(x, y, z)];
 
-			if(Ai[INDEX(x + 1, y, z)] < 0)
-				A.insert(valCount, gridToIndex(INDEX(x + 1, y, z))) = Ai[INDEX(x, y, z)];
-			if(Aj[INDEX(x, y + 1, z)] < 0)
-				A.insert(valCount, gridToIndex(INDEX(x, y + 1, z))) = Aj[INDEX(x, y, z)];
-			if(Ak[INDEX(x, y, z + 1)] < 0)
-				A.insert(valCount, gridToIndex(INDEX(x, y, z + 1))) = Ak[INDEX(x, y, z)];
+			if(Ai[INDEX(x, y, z)] < 0)
+				A.insert(rowCount, gridToIndex(INDEX(x + 1, y, z))) = Ai[INDEX(x, y, z)];
+			if(Aj[INDEX(x, y, z)] < 0)
+				A.insert(rowCount, gridToIndex(INDEX(x, y + 1, z))) = Aj[INDEX(x, y, z)];
+			if(Ak[INDEX(x, y, z)] < 0)
+				A.insert(rowCount, gridToIndex(INDEX(x, y, z + 1))) = Ak[INDEX(x, y, z)];
 
-				valCount++;
+				rowCount++;
 		}
 
 	index = _slabSize + _xRes + 1;
@@ -964,9 +965,9 @@
 		if (!_obstacles[INDEX(x,y,z)])
 			b[gridToIndex(INDEX(x, y, z))] = _divergence[INDEX(x,y,z)];
 
-	// A.makeCompressed();
+	A.makeCompressed();
 
-	ConjugateGradient<SparseMatrix<float>, Eigen::Lower> solver;
+	ConjugateGradient<SparseMatrix<float>, Eigen::Upper> solver;
 
 	solver.compute(A);
 	if(solver.info() != Success)