yade-dev team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 2417
committer: Václav Šmilauer <eudoxos@xxxxxxxx>
branch nick: trunk
timestamp: Fri 2010-08-27 10:51:54 +0200
message:
  1. When disabling sub-stepping when the last step is done only partially, all remaining substeps are run at the next step.
modified:
  core/Scene.cpp


--
lp:yade
https://code.launchpad.net/~yade-dev/yade/trunk

Your team Yade developers is subscribed to branch lp:yade.
To unsubscribe from this branch go to https://code.launchpad.net/~yade-dev/yade/trunk/+edit-subscription

=== modified file 'core/Scene.cpp'
--- core/Scene.cpp	2010-08-26 16:56:07 +0000
+++ core/Scene.cpp	2010-08-27 08:51:54 +0000
@@ -90,16 +90,23 @@
 	} else {
 		/* IMPORTANT: take care to copy EXACTLY the same sequence as is in the block above !! */
 		if(TimingInfo::enabled){ TimingInfo::enabled=false; LOG_INFO("O.timingEnabled disabled, since O.subStepping is used."); }
-		// ** 1. ** prologue
-		if(subStep<-1 || subStep>(int)engines.size()){ LOG_WARN("Invalid value of Scene::subStep ("<<subStep<<"), setting to -1 (prologue will be run)."); subStep=-1; }
-		if(subStep==-1){ if(isPeriodic) cell->integrateAndUpdate(dt); }
-		// ** 2. ** engines
-		else if(subStep>=0 && subStep<(int)engines.size()){ const shared_ptr<Engine>& e(engines[subStep]); e->scene=this; if(e->isActivated()) e->action(); }
-		// ** 3. ** epilogue
-		else if(subStep==(int)engines.size()){ iter++; time+=dt; /* gives -1 along with the increment afterwards */ subStep=-2; }
-		// (?!)
-		else { /* never reached */ assert(false); }
-		subStep++;
+		if(subStep<-1 || subStep>(int)engines.size()){ LOG_ERROR("Invalid value of Scene::subStep ("<<subStep<<"), setting to -1 (prologue will be run)."); subStep=-1; }
+		// if subStepping is disabled, it means we have not yet finished last step completely; in that case, do that here by running all remaining substeps at once
+		// if subStepping is enabled, just run the step we need (the loop is traversed only once, with subs==subStep)
+		int maxSubStep=subStep;
+		if(!subStepping){ maxSubStep=engines.size(); LOG_INFO("Running remaining sub-steps ("<<subStep<<"…"<<maxSubStep<<") before disabling sub-stepping."); }
+		for(int subs=subStep; subs<=maxSubStep; subs++){
+			assert(subs>=-1 && subs<=(int)engines.size());
+			// ** 1. ** prologue
+			if(subs==-1){ if(isPeriodic) cell->integrateAndUpdate(dt); }
+			// ** 2. ** engines
+			else if(subs>=0 && subs<(int)engines.size()){ const shared_ptr<Engine>& e(engines[subs]); e->scene=this; if(e->isActivated()) e->action(); }
+			// ** 3. ** epilogue
+			else if(subs==(int)engines.size()){ iter++; time+=dt; /* gives -1 along with the increment afterwards */ subStep=-2; }
+			// (?!)
+			else { /* never reached */ assert(false); }
+		}
+		subStep++; // if not substepping, this will make subStep=-2+1=-1, which is what we want
 	}
 }