BUG: Updated fieldAverage function object for restart - mantis 854

This commit is contained in:
andy
2013-05-29 11:00:40 +01:00
parent 82de75b26d
commit 5ed7767054

View File

@ -144,11 +144,21 @@ void Foam::fieldAverage::initialize()
} }
} }
} }
// ensure first averaging works unconditionally
prevTimeIndex_ = -1;
initialised_ = true;
} }
void Foam::fieldAverage::calcAverages() void Foam::fieldAverage::calcAverages()
{ {
if (!initialised_)
{
initialize();
}
const label currentTimeIndex = const label currentTimeIndex =
static_cast<const fvMesh&>(obr_).time().timeIndex(); static_cast<const fvMesh&>(obr_).time().timeIndex();
@ -374,16 +384,6 @@ void Foam::fieldAverage::execute()
{ {
if (active_) if (active_)
{ {
if (!initialised_)
{
initialize();
// ensure first averaging works unconditionally
prevTimeIndex_ = -1;
initialised_ = true;
}
calcAverages(); calcAverages();
} }
} }
@ -397,16 +397,6 @@ void Foam::fieldAverage::write()
{ {
if (active_) if (active_)
{ {
if (!initialised_)
{
initialize();
// ensure first averaging works unconditionally
prevTimeIndex_ = -1;
initialised_ = true;
}
calcAverages(); calcAverages();
writeAverages(); writeAverages();
writeAveragingProperties(); writeAveragingProperties();