diff options
| author | Daniel Genrich <daniel.genrich@gmx.net> | 2008-09-03 20:01:25 +0400 |
|---|---|---|
| committer | Daniel Genrich <daniel.genrich@gmx.net> | 2008-09-03 20:01:25 +0400 |
| commit | c587252a781865c5111c563dc397125390569526 (patch) | |
| tree | 646d10f009c2a87e330a74af13cc4e47ab6ad3ba /intern/elbeem | |
| parent | 8cf385a93d2863ddb4311d901598222d1d68b2c5 (diff) | |
Bugfix for sphere-in-control-object (reported by broken)
Diffstat (limited to 'intern/elbeem')
| -rw-r--r-- | intern/elbeem/intern/controlparticles.cpp | 7 | ||||
| -rw-r--r-- | intern/elbeem/intern/solver_control.cpp | 4 |
2 files changed, 8 insertions, 3 deletions
diff --git a/intern/elbeem/intern/controlparticles.cpp b/intern/elbeem/intern/controlparticles.cpp index c08501d5847..18c87011971 100644 --- a/intern/elbeem/intern/controlparticles.cpp +++ b/intern/elbeem/intern/controlparticles.cpp @@ -168,7 +168,7 @@ int ControlParticles::initFromObject(ntlGeometryObjModel *model) { mvm.transfer(vertices, ninspos); tcnt++; - for(int i=0; i<(int)ninspos.size(); i++) { + for(size_t i=0; i < ninspos.size(); i++) { if(useCP[i]) { ControlParticle p; p.reset(); @@ -178,6 +178,8 @@ int ControlParticles::initFromObject(ntlGeometryObjModel *model) { } } + printf("tcnt: %d\n", tcnt); + model->setGeoInitType(FGI_CONTROL); delete tree; @@ -238,7 +240,7 @@ ControlParticles::ControlParticles() : _fluidSpacing(1.), _kernelWeight(-1.), _charLength(1.), _charLengthInv(1.), mvCPSStart(-10000.), mvCPSEnd(10000.), - mCPSWidth(0.1), mCPSTimestep(0.05), + mCPSWidth(0.1), mCPSTimestep(0.02), // was 0.05 mCPSTimeStart(0.), mCPSTimeEnd(0.5), mCPSWeightFac(1.), mDebugInit(0) { @@ -281,6 +283,7 @@ void ControlParticles::setInfluenceVelocity(LbmFloat set, LbmFloat dt) { int ControlParticles::initExampleSet() { // unused + return 0; } int ControlParticles::getTotalSize() diff --git a/intern/elbeem/intern/solver_control.cpp b/intern/elbeem/intern/solver_control.cpp index 6b4c31b8f3e..15b9468ed0d 100644 --- a/intern/elbeem/intern/solver_control.cpp +++ b/intern/elbeem/intern/solver_control.cpp @@ -49,7 +49,9 @@ void LbmControlSet::initCparts() { LbmControlData::LbmControlData() : mSetForceStrength(0.), - mCons(), mCpUpdateInterval(16), mCpOutfile(""), + mCons(), + mCpUpdateInterval(8), // DG: was 16 --> causes problems (big sphere after some time), unstable + mCpOutfile(""), mCpForces(), mCpKernel(), mMdKernel(), mDiffVelCon(1.), mDebugCpscale(0.), |