diff options
| author | Nils Thuerey <nils@thuerey.de> | 2005-10-10 15:31:06 +0400 |
|---|---|---|
| committer | Nils Thuerey <nils@thuerey.de> | 2005-10-10 15:31:06 +0400 |
| commit | 7095d8a11f911ddc460f0469736aecbe6cb9ef4c (patch) | |
| tree | 9ca7f6abbfcf4522efa14041f2d48c6464efec9f /intern/elbeem | |
| parent | d3d8441f678e8bf444a04e7379abc5322e4980b0 (diff) | |
- minor solver fix for msvc compilation
- added pop up menues for fluid sim bake with no
fluid objects or without valid output dir settings
- fixed 3d view redraw for fluidsim buttons
Diffstat (limited to 'intern/elbeem')
| -rw-r--r-- | intern/elbeem/intern/lbmfsgrsolver.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/intern/elbeem/intern/lbmfsgrsolver.h b/intern/elbeem/intern/lbmfsgrsolver.h index febfe5da59c..cf199f46603 100644 --- a/intern/elbeem/intern/lbmfsgrsolver.h +++ b/intern/elbeem/intern/lbmfsgrsolver.h @@ -2698,26 +2698,26 @@ LbmFsgrSolver<D>::stepMain() // do some formatting if(!D::mSilent){ string sepStr(""); // DEBUG +#ifndef USE_MSVC6FIXES + int avgcls = (int)(mAvgNumUsedCells/(long long int)D::mStepCnt); +#else + int avgcls = (int)(mAvgNumUsedCells/(_int64)D::mStepCnt); +#endif debMsgDirect( "mlsups(curr:"<<D::mMLSUPS<< " avg:"<<(mAvgMLSUPS/mAvgMLSUPSCnt)<<"), "<< sepStr<< " totcls:"<<(D::mNumUsedCells)<< sepStr<< -#ifndef USE_MSVC6FIXES - " avgcls:"<< (int)(mAvgNumUsedCells/(long long int)D::mStepCnt)<< sepStr<< -#endif + " avgcls:"<< avgcls<< sepStr<< " intd:"<<mNumInterdCells<< sepStr<< " invif:"<<mNumInvIfCells<< sepStr<< " invift:"<<mNumInvIfTotal<< sepStr<< " fsgrcs:"<<mNumFsgrChanges<< sepStr<< " filled:"<<D::mNumFilledCells<<", emptied:"<<D::mNumEmptiedCells<< sepStr<< " mMxv:"<<mMxvx<<","<<mMxvy<<","<<mMxvz<<", tscnts:"<<mTimeSwitchCounts<< sepStr<< - /*" rhoMax:"<<mRhoMax<<", rhoMin:"<<mRhoMin<<", vlenMax:"<<mMaxVlen<<", "*/ " probs:"<<mNumProblems<< sepStr<< " simt:"<<mSimulationTime<< sepStr<< " for '"<<D::mName<<"' " ); - //wrong? - //debMsgDirect(", dccd:"<< mCurrentMass<<"/"<<mCurrentVolume<<"(fix:"<<D::mFixMass<<",ini:"<<mInitialMass<<") "); debMsgDirect(std::endl); debMsgDirect(D::mStepCnt<<": dccd="<< mCurrentMass<<"/"<<mCurrentVolume<<"(fix="<<D::mFixMass<<",ini="<<mInitialMass<<") "); debMsgDirect(std::endl); |