From e6951da06f35f11c607f73f1260c58e11d117cfa Mon Sep 17 00:00:00 2001 From: Andrew Heather Date: Fri, 23 Jun 2017 11:56:22 +0100 Subject: [PATCH] ENH: valueAverage FO - update window to use user time --- src/functionObjects/field/valueAverage/valueAverage.C | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/functionObjects/field/valueAverage/valueAverage.C b/src/functionObjects/field/valueAverage/valueAverage.C index e8d1a0faa8..3e74e5f4b6 100644 --- a/src/functionObjects/field/valueAverage/valueAverage.C +++ b/src/functionObjects/field/valueAverage/valueAverage.C @@ -3,7 +3,7 @@ \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | \\ / A nd | Copyright (C) 2015 OpenFOAM Foundation - \\/ M anipulation | Copyright (C) 2015-2016 OpenCFD Ltd. + \\/ M anipulation | Copyright (C) 2015-2017 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -114,7 +114,10 @@ bool Foam::functionObjects::valueAverage::read(const dictionary& dict) dict.lookup("functionObject") >> functionObjectName_; dict.lookup("fields") >> fieldNames_; - window_ = dict.lookupOrDefault("window", -1); + if (dict.readIfPresent("window", window_)) + { + window_ = obr().time().userTimeToTime(window_); + } totalTime_.setSize(fieldNames_.size()); forAll(totalTime_, i)