diff --git a/src/functionObjects/field/fieldAverage/fieldAverage.C b/src/functionObjects/field/fieldAverage/fieldAverage.C index 6aa9b84db6..ba00d299e7 100644 --- a/src/functionObjects/field/fieldAverage/fieldAverage.C +++ b/src/functionObjects/field/fieldAverage/fieldAverage.C @@ -293,13 +293,19 @@ bool Foam::functionObjects::fieldAverage::read(const dictionary& dict) { fvMeshFunctionObject::read(dict); + // Make certain that the values are consistent with the defaults: initialised_ = false; + restartOnRestart_ = false; + restartOnOutput_ = false; + periodicRestart_ = false; + restartPeriod_ = GREAT; + restartTime_ = GREAT; Info<< type() << " " << name() << ":" << nl; dict.readIfPresent("restartOnRestart", restartOnRestart_); - dict.readIfPresent("restartOnOutput", restartOnOutput_); - dict.readIfPresent("periodicRestart", periodicRestart_); + dict.readIfPresent("restartOnOutput", restartOnOutput_); + dict.readIfPresent("periodicRestart", periodicRestart_); dict.lookup("fields") >> faItems_; const scalar currentTime = obr().time().value(); @@ -331,7 +337,6 @@ bool Foam::functionObjects::fieldAverage::read(const dictionary& dict) } } - restartTime_ = GREAT; if (dict.readIfPresent("restartTime", restartTime_)) { if (currentTime > restartTime_) diff --git a/src/functionObjects/field/valueAverage/valueAverage.C b/src/functionObjects/field/valueAverage/valueAverage.C index 7b26468a4f..e8d1a0faa8 100644 --- a/src/functionObjects/field/valueAverage/valueAverage.C +++ b/src/functionObjects/field/valueAverage/valueAverage.C @@ -109,6 +109,9 @@ bool Foam::functionObjects::valueAverage::read(const dictionary& dict) regionFunctionObject::read(dict); writeFile::read(dict); + // Make certain that the values are consistent with the defaults: + resetOnRestart_ = false; + dict.lookup("functionObject") >> functionObjectName_; dict.lookup("fields") >> fieldNames_; window_ = dict.lookupOrDefault("window", -1); @@ -119,7 +122,7 @@ bool Foam::functionObjects::valueAverage::read(const dictionary& dict) totalTime_[i] = time_.deltaTValue(); } - resetOnRestart_ = readBool(dict.lookup("resetOnRestart")); + dict.readIfPresent("resetOnRestart", resetOnRestart_); return true; } diff --git a/src/functionObjects/field/valueAverage/valueAverage.H b/src/functionObjects/field/valueAverage/valueAverage.H index 6c25c8a56f..cb6ae974be 100644 --- a/src/functionObjects/field/valueAverage/valueAverage.H +++ b/src/functionObjects/field/valueAverage/valueAverage.H @@ -55,7 +55,7 @@ Usage log | write average data to standard output | no | yes fields | list of fields to process | yes | functionObject | Name of function object to retrieve data from | yes | - resetOnRestart | Reset the averaging on restart | yes | + resetOnRestart | Reset the averaging on restart | no | no | \endtable Output data is written to the file \/valueAverage.dat @@ -110,7 +110,7 @@ protected: List totalTime_; //- Reset the averaging process on restart - bool resetOnRestart_; + Switch resetOnRestart_; // Protected Member Functions