Commit ab4be264 authored by Martin Beck's avatar Martin Beck
Browse files

Merge branch 'fix/restartAndEpisodes' into 'master'

Fix/restart and episodes

For me it would be more intuitive to first advance the time level and then do all the processing and file writing. However this is more complicated, therefore I shifted the restart stuff to the same level as the vtk output stuff.

See merge request !310
parent 3eba4bac
......@@ -166,7 +166,7 @@ public:
return
this->timeManager().timeStepIndex() == 0 ||
this->timeManager().timeStepIndex() % outputInterval_ == 0 ||
this->timeManager().episodeWillBeOver() ||
this->timeManager().episodeWillBeFinished() ||
this->timeManager().willBeFinished();
}
......
......@@ -186,7 +186,7 @@ public:
bool shouldWriteOutput() const
{
return this->timeManager().timeStepIndex() % 1 == 0 ||
this->timeManager().episodeWillBeOver() ||
this->timeManager().episodeWillBeFinished() ||
this->timeManager().willBeFinished();
}
......
......@@ -157,7 +157,7 @@ public:
return
this->timeManager().timeStepIndex() == 0 ||
this->timeManager().timeStepIndex() % outputInterval_ == 0 ||
this->timeManager().episodeWillBeOver() ||
this->timeManager().episodeWillBeFinished() ||
this->timeManager().willBeFinished();
}
......
......@@ -162,7 +162,7 @@ public:
return
this->timeManager().timeStepIndex() == 0 ||
this->timeManager().timeStepIndex() % outputInterval_ == 0 ||
this->timeManager().episodeWillBeOver() ||
this->timeManager().episodeWillBeFinished() ||
this->timeManager().willBeFinished();
}
......
......@@ -317,7 +317,7 @@ public:
bool shouldWriteOutput() const
{
return this->timeManager().timeStepIndex() == 0 ||
this->timeManager().episodeWillBeOver() ||
this->timeManager().episodeWillBeFinished() ||
this->timeManager().willBeFinished();
}
......
......@@ -208,7 +208,7 @@ public:
if (timeStepIndex == 0 ||
timeStepIndex % 100 == 0 || //after every 1000000 secs
this->timeManager().episodeWillBeOver() ||
this->timeManager().episodeWillBeFinished() ||
this->timeManager().willBeFinished())
{
std::cout<<" totalMassProducedOil_ : "<< totalMassProducedOil_ << " Time: " << time+dt << std::endl;
......
......@@ -146,7 +146,7 @@ public:
return
this->timeManager().timeStepIndex() == 0 ||
this->timeManager().timeStepIndex() % outputInterval_ == 0 ||
this->timeManager().episodeWillBeOver() ||
this->timeManager().episodeWillBeFinished() ||
this->timeManager().willBeFinished();
}
......
......@@ -155,7 +155,7 @@ public:
return
this->timeManager().timeStepIndex() == 0 ||
this->timeManager().timeStepIndex() % outputInterval_ == 0 ||
this->timeManager().episodeWillBeOver() ||
this->timeManager().episodeWillBeFinished() ||
this->timeManager().willBeFinished();
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment