- fixed MSVC problem in fluidsim.c

- removed some more debug output in the solver

2 files changed, 7 insertions, 7 deletions

diff --git a/intern/elbeem/intern/ntl_geometrymodel.cpp b/intern/elbeem/intern/ntl_geometrymodel.cpp
index 598abbddfac..16d18c4b238 100644
--- a/intern/elbeem/intern/ntl_geometrymodel.cpp
+++ b/intern/elbeem/intern/ntl_geometrymodel.cpp
@@ -234,8 +234,8 @@ int ntlGeometryObjModel::loadBobjModel(string filename)
 	vector<ntlSetVec3f> aninorms;
 	vector<double> anitimes;
 
-	const bool debugPrint=true;
-	const bool debugPrintFull=true;
+	const bool debugPrint=false;
+	const bool debugPrintFull=false;
 	gzFile gzf;
 	gzf = gzopen(filename.c_str(), "rb");
 	if (!gzf) {
diff --git a/intern/elbeem/intern/solver_main.cpp b/intern/elbeem/intern/solver_main.cpp
index 70ff3106645..2888c7e172e 100644
--- a/intern/elbeem/intern/solver_main.cpp
+++ b/intern/elbeem/intern/solver_main.cpp
@@ -900,8 +900,8 @@ LbmFsgrSolver::mainLoop(int lev)
 					((rl>RWVEL_WINDTHRESH) && (lcsmqo<P_LCSMQO)) )// normal checks
 					||(k>this->mSizez-SLOWDOWNREGION)   ) {
 				LbmFloat nuz = uz;
-				LbmFloat jdf; // = 0.05 * (rand()/(RAND_MAX+1.0));
-				if(rl>RWVEL_WINDTHRESH) jdf *= (rl-RWVEL_WINDTHRESH);
+				//? LbmFloat jdf; // = 0.05 * (rand()/(RAND_MAX+1.0));
+				//? if(rl>RWVEL_WINDTHRESH) jdf *= (rl-RWVEL_WINDTHRESH);
 				if(k>this->mSizez-SLOWDOWNREGION) {
 					// special case
 					LbmFloat zfac = (LbmFloat)( k-(this->mSizez-SLOWDOWNREGION) );
@@ -910,11 +910,11 @@ LbmFsgrSolver::mainLoop(int lev)
 					//errMsg("TOPT"," at "<<PRINT_IJK<<" zfac"<<zfac);
 				} else {
 					// normal probability
-					LbmFloat fac = P_LCSMQO-lcsmqo;
-					jdf *= fac;
+					//? LbmFloat fac = P_LCSMQO-lcsmqo;
+					//? jdf *= fac;
 				}
 				FORDF1 {
-					jdf = 0.05 * (rand()/(RAND_MAX+1.0));
+					const LbmFloat jdf = 0.05 * (rand()/(RAND_MAX+1.0));
 					// TODO  use wind velocity?
 					if(jdf>0.025) {
 					const LbmFloat add =  this->dfLength[l]*(-ux*this->dfDvecX[l]-uy*this->dfDvecY[l]-nuz*this->dfDvecZ[l])*jdf;