I renamed a couple of simple variables to prevent warnings about
authorKent Mein <mein@cs.umn.edu>
Thu, 6 Apr 2006 17:27:15 +0000 (17:27 +0000)
committerKent Mein <mein@cs.umn.edu>
Thu, 6 Apr 2006 17:27:15 +0000 (17:27 +0000)
variable blah at a higher scope is already defined...
(one of these was introduced by me when I moved a variable declaration
to the top of the function.)

Kent

intern/elbeem/intern/solver_relax.h
intern/elbeem/intern/solver_util.cpp

index 605bc02c0cf5a98d2429ea5a33435a42d5a2af2d..2a618ce00bfcafc06f10f8f24acf7071a5554e86 100644 (file)
@@ -1060,11 +1060,11 @@ inline LbmFloat LbmFsgrSolver::getLesOmega(LbmFloat omega, LbmFloat csmago, LbmF
 
 #define DEBUG_CALCPRINTCELL(str,df) {\
                LbmFloat prho=df[0], pux=0., puy=0., puz=0.; \
-               for(int l=1; l<this->cDfNum; l++) { \
-                       prho += df[l];  \
-                       pux  += (this->dfDvecX[l]*df[l]);  \
-                       puy  += (this->dfDvecY[l]*df[l]);  \
-                       puz  += (this->dfDvecZ[l]*df[l]);  \
+               for(int ll=1; ll<this->cDfNum; ll++) { \
+                       prho += df[ll];  \
+                       pux  += (this->dfDvecX[ll]*df[ll]);  \
+                       puy  += (this->dfDvecY[ll]*df[ll]);  \
+                       puz  += (this->dfDvecZ[ll]*df[ll]);  \
                } \
                errMsg("DEBUG_CALCPRINTCELL",">"<<str<<" rho="<<prho<<" vel="<<ntlVec3Gfx(pux,puy,puz) ); \
        } /* END DEBUG_CALCPRINTCELL */ 
index 8cd698eb65fc8218d1ad44dfeb17bcf68bd4901b..00734864b6f31a65c01fb0d71964caada241a8d8 100644 (file)
@@ -598,8 +598,8 @@ void LbmFsgrSolver::advanceParticles() {
                                                //if(p->getLifeTime()>50) { 
                                                P_CHANGETYPE(p, PART_FLOAT ); continue; 
                                                // jitter in cell to prevent stacking when hitting a steep surface
-                                               LbmVec pos = p->getPos(); pos[0] += (rand()/(RAND_MAX+1.0))-0.5;
-                                               pos[1] += (rand()/(RAND_MAX+1.0))-0.5; p->setPos(pos);
+                                               LbmVec posi = p->getPos(); posi[0] += (rand()/(RAND_MAX+1.0))-0.5;
+                                               posi[1] += (rand()/(RAND_MAX+1.0))-0.5; p->setPos(posi);
                                                //} else DEL_PART;
                                        } else {
                                                DEL_PART;