bartvdbraak/blender
1
0
Fork 4
Code Issues 4 Pull Requests 1 Actions 1 Packages Projects Releases Wiki Activity

I renamed a couple of simple variables to prevent warnings about

Browse Source 
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
This commit is contained in:
Kent Mein 2006-04-06 17:27:15 +00:00
parent 8b94135add
commit 3815e20ad6
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
intern/elbeem/intern/solver_relax.h
View 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 */

4
intern/elbeem/intern/solver_util.cpp
View 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;