[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [16351] branches/fluidcontrol/intern/ elbeem/intern: Bugfix for sphere-in-control-object (reported by broken)

[Daniel Genrich]

Revision: 16351
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=16351
Author:   genscher
Date:     2008-09-03 18:01:25 +0200 (Wed, 03 Sep 2008)

Log Message:
-----------
Bugfix for sphere-in-control-object (reported by broken)

Modified Paths:
--------------
    branches/fluidcontrol/intern/elbeem/intern/controlparticles.cpp
    branches/fluidcontrol/intern/elbeem/intern/solver_control.cpp

Modified: branches/fluidcontrol/intern/elbeem/intern/controlparticles.cpp
===================================================================
--- branches/fluidcontrol/intern/elbeem/intern/controlparticles.cpp	2008-09-03 12:54:46 UTC (rev 16350)
+++ branches/fluidcontrol/intern/elbeem/intern/controlparticles.cpp	2008-09-03 16:01:25 UTC (rev 16351)
@@ -168,7 +168,7 @@
 		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 @@
 		}
 	}
 	
+	printf("tcnt: %d\n", tcnt);
+	
 	model->setGeoInitType(FGI_CONTROL);
 
 	delete tree;
@@ -238,7 +240,7 @@
 	_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 @@
 int ControlParticles::initExampleSet()
 {
 	// unused
+	return 0;
 }
 
 int ControlParticles::getTotalSize()

Modified: branches/fluidcontrol/intern/elbeem/intern/solver_control.cpp
===================================================================
--- branches/fluidcontrol/intern/elbeem/intern/solver_control.cpp	2008-09-03 12:54:46 UTC (rev 16350)
+++ branches/fluidcontrol/intern/elbeem/intern/solver_control.cpp	2008-09-03 16:01:25 UTC (rev 16351)
@@ -49,7 +49,9 @@
 
 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.),