bug fix for loop stall

DEMSystems/sphereDEMSystem/sphereDEMSystem.cpp

@@ -27,6 +27,8 @@ bool pFlow::sphereDEMSystem::loop()
 	{
 		Control().timers().start();
 
+		//
+		
 		if(! insertion_().insertParticles( 
 			Control().time().currentTime(),
 			Control().time().dt()	) )
@@ -36,6 +38,7 @@ bool pFlow::sphereDEMSystem::loop()
 			return false;
 		}
 		
+
 		geometry_->beforeIteration();
 		
 		interaction_->beforeIteration();
@@ -58,6 +61,7 @@ bool pFlow::sphereDEMSystem::loop()
 
 	}while(Control()++);
 
+	return true;
 }
 
 pFlow::sphereDEMSystem::sphereDEMSystem(
@@ -213,7 +217,7 @@ bool pFlow::sphereDEMSystem::iterate(
 	Control().time().setStopAt(upToTime);
 	Control().time().setOutputToFile(timeToWrite, timeName);
 	
-	loop();
+	return loop();
 
 	return true;
 }
@@ -221,7 +225,7 @@ bool pFlow::sphereDEMSystem::iterate(
 bool pFlow::sphereDEMSystem::iterate(real upToTime)
 {
 	Control().time().setStopAt(upToTime);
-	loop();
+	return loop();
 	return true;
 }
 

src/phasicFlow/Timer/Timer.hpp

@@ -139,10 +139,6 @@ public:
 	{
 		return true;
 	}
-
-	
-
-
 };
 
 

src/phasicFlow/repository/Time/timeControl.cpp

@@ -147,3 +147,20 @@ void pFlow::timeControl::setSaveTimeFolder(
 	}
 }
 
+bool pFlow::timeControl::operator ++(int)
+{
+
+	if( reachedStopAt() ) return false;
+	// increament iteration number 
+	currentIter_++;
+
+	currentTime_ += dt_;
+	if(screenReport())
+	{
+		REPORT(0)<<"Time (s): "<<cyanText( currentTimeWord() )<<endREPORT;
+	}
+	// switch outputToFile_ on/off
+	checkForOutputToFile();
+
+	return true;
+}

src/phasicFlow/repository/Time/timeControl.hpp

@@ -182,23 +182,7 @@ public:
 		return true;
 	}
 
-	bool operator ++(int)
+	bool operator ++(int);
-	{
-
-		if( reachedStopAt() ) return false;
-		// increament iteration number 
-		currentIter_++;
-
-		currentTime_ += dt_;
-		if(screenReport())
-		{
-			REPORT(0)<<"Time (s): "<<cyanText( currentTimeWord() )<<endREPORT;
-		}
-		// switch outputToFile_ on/off
-		checkForOutputToFile();
-
-		return true;
-	}
 
 	void setSaveTimeFolder(
 		bool saveToFile, 

src/phasicFlow/repository/systemControl/systemControl.cpp

@@ -234,6 +234,7 @@ bool pFlow::systemControl::operator ++(int)
 {
 
 	// skip writing to file for the first iteration
+	//output<< "time()++"<<endl;
 	auto finished = time()++; 
 	
 	writeToFileTimer_.start();
@@ -256,6 +257,8 @@ bool pFlow::systemControl::operator ++(int)
 	}
 	writeToFileTimer_.end();
 
+	//output<< "after finalTime()"<<endl;
+
 	if( time().timersReportTime() &&
 		timersReport() )
 	{