diff options
Diffstat (limited to 'intern/elbeem/intern')
| -rw-r--r-- | intern/elbeem/intern/loop_tools.h | 3 | ||||
| -rw-r--r-- | intern/elbeem/intern/ntl_ray.cpp | 6 | ||||
| -rw-r--r-- | intern/elbeem/intern/solver_init.cpp | 6 | ||||
| -rw-r--r-- | intern/elbeem/intern/solver_main.cpp | 2 |
4 files changed, 12 insertions, 5 deletions
diff --git a/intern/elbeem/intern/loop_tools.h b/intern/elbeem/intern/loop_tools.h index f06fa7c2861..661519b0375 100644 --- a/intern/elbeem/intern/loop_tools.h +++ b/intern/elbeem/intern/loop_tools.h @@ -22,6 +22,9 @@ int calcCellsFilled=0; \ int calcCellsEmptied=0; \ int calcNumUsedCells=0; \ + /* This is a generic macro, and now all it's users are using all variables. */ \ + (void)calcCurrentMass; \ + (void)calcCellsFilled \ diff --git a/intern/elbeem/intern/ntl_ray.cpp b/intern/elbeem/intern/ntl_ray.cpp index 1083fcdb68b..618017ae81d 100644 --- a/intern/elbeem/intern/ntl_ray.cpp +++ b/intern/elbeem/intern/ntl_ray.cpp @@ -299,7 +299,7 @@ void ntlRay::intersectBackAABB(ntlVec3Gfx mStart, ntlVec3Gfx mEnd, gfxReal &t, n //! intersect ray with AABB void ntlRay::intersectCompleteAABB(ntlVec3Gfx mStart, ntlVec3Gfx mEnd, gfxReal &tmin, gfxReal &tmax) const { - char inside = true; /* inside box? */ + // char inside = true; /* inside box? */ /* UNUSED */ char hit = false; /* ray hits box? */ int whichPlane; /* intersection plane */ gfxReal candPlane[NUMDIM]; /* candidate plane */ @@ -315,11 +315,11 @@ void ntlRay::intersectCompleteAABB(ntlVec3Gfx mStart, ntlVec3Gfx mEnd, gfxReal & if(origin[i] < mStart[i]) { quadrant[i] = LEFT; candPlane [i] = mStart[i]; - inside = false; + // inside = false; } else if(origin[i] > mEnd[i]) { quadrant[i] = RIGHT; candPlane[i] = mEnd[i]; - inside = false; + // inside = false; } else { /* intersect with backside */ if(dir[i] > 0) { diff --git a/intern/elbeem/intern/solver_init.cpp b/intern/elbeem/intern/solver_init.cpp index 31372f12282..8b962d604cf 100644 --- a/intern/elbeem/intern/solver_init.cpp +++ b/intern/elbeem/intern/solver_init.cpp @@ -685,6 +685,8 @@ bool LbmFsgrSolver::initializeSolverMemory() if(firstMInit) { mrSetup(); } +#else + (void)firstMInit; #endif // LBM_INCLUDE_TESTSOLVERS==1 firstMInit=false; @@ -1351,13 +1353,13 @@ bool LbmFsgrSolver::initializeSolverPostinit() { } } \ if(ntype&(CFBndFreeslip)) { \ const LbmFloat dp=dot(objvel, vec2L((*pNormals)[n]) ); \ - const LbmVec oldov=objvel; /*DEBUG*/ \ + /* const LbmVec oldov=objvel; */ /*DEBUG*/ \ objvel = vec2L((*pNormals)[n]) *dp; \ /* if((j==24)&&(n%5==2)) errMsg("FSBT","n"<<n<<" v"<<objvel<<" nn"<<(*pNormals)[n]<<" dp"<<dp<<" oldov"<<oldov ); */ \ } \ else if(ntype&(CFBndPartslip)) { \ const LbmFloat dp=dot(objvel, vec2L((*pNormals)[n]) ); \ - const LbmVec oldov=objvel; /*DEBUG*/ \ + /* const LbmVec oldov=objvel; */ /*DEBUG*/ \ /* if((j==24)&&(n%5==2)) errMsg("FSBT","n"<<n<<" v"<<objvel<<" nn"<<(*pNormals)[n]<<" dp"<<dp<<" oldov"<<oldov ); */ \ const LbmFloat partv = mObjectPartslips[OId]; \ /*errMsg("PARTSLIP_DEBUG","l="<<l<<" ccel="<<RAC(ccel, dfInv[l] )<<" partv="<<partv<<",id="<<(int)(mnbf>>24)<<" newval="<<newval ); / part slip debug */ \ diff --git a/intern/elbeem/intern/solver_main.cpp b/intern/elbeem/intern/solver_main.cpp index 46af6740cf1..55a8d3eb4aa 100644 --- a/intern/elbeem/intern/solver_main.cpp +++ b/intern/elbeem/intern/solver_main.cpp @@ -777,6 +777,8 @@ LbmFsgrSolver::mainLoop(int lev) + RAC(ccel,dET) - RAC(ccel,dEB) + RAC(ccel,dWT) - RAC(ccel,dWB); + (void)oldRho; + // now reconstruction ux=oldUx, uy=oldUy, uz=oldUz; // no local vars, only for usqr rho = REFERENCE_PRESSURE; |