coupling modifictions for timeControl and iterate

This commit is contained in:
hamidrezanorouzi
2023-01-08 14:06:26 +03:30
parent fef0c4fe96
commit 782c0d5667
5 changed files with 100 additions and 15 deletions

View File

@ -20,6 +20,36 @@ Licence:
#include "sphereDEMSystem.hpp"
void pFlow::sphereDEMSystem::loop()
{
do
{
Control().timers().start();
geometry_->beforeIteration();
interaction_->beforeIteration();
particles_->beforeIteration();
interaction_->iterate();
particles_->iterate();
geometry_->iterate();
particles_->afterIteration();
geometry_->afterIteration();
Control().timers().end();
}while(Control()++);
}
pFlow::sphereDEMSystem::sphereDEMSystem(
word demSystemName,
@ -161,10 +191,23 @@ bool pFlow::sphereDEMSystem::beforeIteration()
bool pFlow::sphereDEMSystem::iterate(
int32 n,
real upToTime,
real timeToWrite,
word timeName)
{
Control().time().setEndTime(upToTime);
Control().time().setOutputToFile(timeToWrite, timeName);
loop();
return true;
}
bool pFlow::sphereDEMSystem::iterate(real upToTime)
{
Control().time().setEndTime(upToTime);
loop();
return true;
}