zhyang-dev/openfoam
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/openfoam.git synced 2025-12-28 03:37:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

avoid calling functionObjectList twice with Time::operator+=()

Browse Source 
- make functionObjectList mutable so it can change behind our back
This commit is contained in:
Mark Olesen
2009-02-12 16:01:39 +01:00
parent b5a1f09321
commit d8ec3376fc
3 changed files with 34 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
src/OpenFOAM/db/Time/Time.C
View File

@ -27,8 +27,6 @@ License
#include "Time.H"
#include "PstreamReduceOps.H"
#include <sstream>
// * * * * * * * * * * * * * Static Member Data * * * * * * * * * * * * * * //
defineTypeNameAndDebug(Foam::Time, 0);
@ -490,9 +488,13 @@ bool Foam::Time::run() const
{
bool running = value() < (endTime_ - 0.5*deltaT_);
if (!subCycling_ && !running && timeIndex_ != startTimeIndex_)
if (!running && !subCycling_)
{
const_cast<functionObjectList&>(functionObjects_).execute();
// Note, the execute() also calls an indirect start() if required
if (timeIndex_ != startTimeIndex_)
{
functionObjects_.execute();
}
}
return running;
@ -610,24 +612,8 @@ Foam::Time& Foam::Time::operator+=(const dimensionedScalar& deltaT)
Foam::Time& Foam::Time::operator+=(const scalar deltaT)
{
readModifiedObjects();
if (!subCycling_)
{
if (timeIndex_ == startTimeIndex_)
{
functionObjects_.start();
}
else
{
functionObjects_.execute();
}
}
setDeltaT(deltaT);
operator++();
return *this;
return operator++();
}
@ -660,19 +646,19 @@ Foam::Time& Foam::Time::operator++()
switch(writeControl_)
{
case wcTimeStep:
outputTime_ = !(timeIndex_%label(writeInterval_));
outputTime_ = !(timeIndex_ % label(writeInterval_));
break;
case wcRunTime:
case wcAdjustableRunTime:
{
label outputTimeIndex =
label outputIndex =
label(((value() - startTime_) + 0.5*deltaT_)/writeInterval_);
if (outputTimeIndex > outputTimeIndex_)
if (outputIndex > outputTimeIndex_)
{
outputTime_ = true;
outputTimeIndex_ = outputTimeIndex;
outputTimeIndex_ = outputIndex;
}
else
{
@ -683,13 +669,11 @@ Foam::Time& Foam::Time::operator++()
case wcCpuTime:
{
label outputTimeIndex =
label(elapsedCpuTime()/writeInterval_);
if (outputTimeIndex > outputTimeIndex_)
label outputIndex = label(elapsedCpuTime()/writeInterval_);
if (outputIndex > outputTimeIndex_)
{
outputTime_ = true;
outputTimeIndex_ = outputTimeIndex;
outputTimeIndex_ = outputIndex;
}
else
{
@ -700,11 +684,11 @@ Foam::Time& Foam::Time::operator++()
case wcClockTime:
{
label outputTimeIndex = label(elapsedClockTime()/writeInterval_);
if (outputTimeIndex > outputTimeIndex_)
label outputIndex = label(elapsedClockTime()/writeInterval_);
if (outputIndex > outputTimeIndex_)
{
outputTime_ = true;
outputTimeIndex_ = outputTimeIndex;
outputTimeIndex_ = outputIndex;
}
else
{