diff options
| author | Daniel Genrich <daniel.genrich@gmx.net> | 2012-04-15 14:31:38 +0400 |
|---|---|---|
| committer | Daniel Genrich <daniel.genrich@gmx.net> | 2012-04-15 14:31:38 +0400 |
| commit | c96be5c5f96b6bc959d1fe8a1d211b90d508f065 (patch) | |
| tree | 0eb2890af62fea48a5bf08ca3cb51305b81cf167 /intern/elbeem | |
| parent | cda6230a852c51dfe713b221132cbf30be6a1d5d (diff) | |
Bugfix [#30954] Fluid obstacle checkbox has no effect
Needs testing for sideeffects.
If there are negative sideeffects, revert commit and mark as "will not fix"/"not supported"/"needs UI fix".
Diffstat (limited to 'intern/elbeem')
| -rw-r--r-- | intern/elbeem/intern/solver_init.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/intern/elbeem/intern/solver_init.cpp b/intern/elbeem/intern/solver_init.cpp index 7e9f5e7f420..58f45e4fbfb 100644 --- a/intern/elbeem/intern/solver_init.cpp +++ b/intern/elbeem/intern/solver_init.cpp @@ -1453,7 +1453,9 @@ void LbmFsgrSolver::initMovingObstacles(bool staticInit) { //errMsg("GEOACTT"," obj "<<obj->getName()<<" a:"<<active<<","<<wasActive<<" s"<<sourceTime<<" t"<<targetTime <<" v"<<mObjectSpeeds[OId] ); // skip inactive in/out flows if(ntype==CFInvalid){ errMsg("LbmFsgrSolver::initMovingObstacles","Invalid obj type "<<obj->getGeoInitType()); continue; } - if((!active) && (otype&(CFMbndOutflow|CFMbndInflow)) ) continue; + /* DG: only inflows/outlfows could be activated/deactivated, test new code that everything can be activated + if((!active) && (otype&(CFMbndOutflow|CFMbndInflow)) ) continue; */ + if((!active) /* && (otype&(CFMbndOutflow|CFMbndInflow)) */ ) continue; // copied from recalculateObjectSpeeds mObjectSpeeds[OId] = vec2L(mpParam->calculateLattVelocityFromRw( vec2P( (*mpGiObjects)[OId]->getInitialVelocity(mSimulationTime) ))); |