diff options
author | Kent Mein <mein@cs.umn.edu> | 2006-04-06 21:27:15 +0400 |
---|---|---|
committer | Kent Mein <mein@cs.umn.edu> | 2006-04-06 21:27:15 +0400 |
commit | 3815e20ad6eac291b7f6d6e774d3c9547c187ca5 (patch) | |
tree | 77a985b2b3b1b69e663af208f36885a2b2f5a962 /intern | |
parent | 8b94135add231ad1762f450730fe042da091832a (diff) |
I renamed a couple of simple variables to prevent warnings about
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
Diffstat (limited to 'intern')
-rw-r--r-- | intern/elbeem/intern/solver_relax.h | 10 | ||||
-rw-r--r-- | intern/elbeem/intern/solver_util.cpp | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/intern/elbeem/intern/solver_relax.h b/intern/elbeem/intern/solver_relax.h index 605bc02c0cf..2a618ce00bf 100644 --- a/intern/elbeem/intern/solver_relax.h +++ b/intern/elbeem/intern/solver_relax.h @@ -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 */ diff --git a/intern/elbeem/intern/solver_util.cpp b/intern/elbeem/intern/solver_util.cpp index 8cd698eb65f..00734864b6f 100644 --- a/intern/elbeem/intern/solver_util.cpp +++ b/intern/elbeem/intern/solver_util.cpp @@ -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; |