From c35df0803bc2b4f97b8a4243006c76e1a48f337c Mon Sep 17 00:00:00 2001 From: andy Date: Thu, 2 Jan 2014 18:21:27 +0000 Subject: [PATCH] ENH: fieldAverage - updates for end() functionality --- .../fieldAverage/fieldAverage/fieldAverage.C | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/src/postProcessing/functionObjects/field/fieldAverage/fieldAverage/fieldAverage.C b/src/postProcessing/functionObjects/field/fieldAverage/fieldAverage/fieldAverage.C index 5469335d4a..2c69ec6336 100644 --- a/src/postProcessing/functionObjects/field/fieldAverage/fieldAverage/fieldAverage.C +++ b/src/postProcessing/functionObjects/field/fieldAverage/fieldAverage/fieldAverage.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -111,8 +111,6 @@ void Foam::fieldAverage::calcAverages() initialize(); } - Info<< type() << " " << name_ << " output:" << nl; - const label currentTimeIndex = static_cast(obr_).time().timeIndex(); @@ -125,6 +123,8 @@ void Foam::fieldAverage::calcAverages() prevTimeIndex_ = currentTimeIndex; } + Info<< type() << " " << name_ << " output:" << nl; + Info<< " Calculating averages" << nl; addMeanSqrToPrime2Mean(); @@ -324,7 +324,14 @@ void Foam::fieldAverage::execute() void Foam::fieldAverage::end() -{} +{ + if (active_) + { + calcAverages(); + + Info<< endl; + } +} void Foam::fieldAverage::timeSet()