From 443a8488ab950decf8ae214ea85f4ee01406d217 Mon Sep 17 00:00:00 2001 From: andy <a.heather@opencfd.co.uk> Date: Tue, 18 May 2010 14:35:22 +0100 Subject: [PATCH] Partial revert of 0dccf9de85b08593ded9b4cc3dbfc37482bf8b95 - keeping {}s for case statements --- .../outputFilterOutputControl.C | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/src/OpenFOAM/db/functionObjects/outputFilterOutputControl/outputFilterOutputControl.C b/src/OpenFOAM/db/functionObjects/outputFilterOutputControl/outputFilterOutputControl.C index 08694c9817a..fe395bdf402 100644 --- a/src/OpenFOAM/db/functionObjects/outputFilterOutputControl/outputFilterOutputControl.C +++ b/src/OpenFOAM/db/functionObjects/outputFilterOutputControl/outputFilterOutputControl.C @@ -80,11 +80,14 @@ void Foam::outputFilterOutputControl::read(const dictionary& dict) switch (outputControl_) { case ocTimeStep: + { outputInterval_ = dict.lookupOrDefault<label>("outputInterval", 0); break; - + } default: + { break; + } } } @@ -94,24 +97,28 @@ bool Foam::outputFilterOutputControl::output() const switch (outputControl_) { case ocTimeStep: + { return ( (outputInterval_ <= 1) || !(time_.timeIndex() % outputInterval_) ); break; - + } case ocOutputTime: + { return time_.outputTime(); break; - + } default: + { // this error should not actually be possible FatalErrorIn("bool Foam::outputFilterOutputControl::output()") << "Undefined output control: " << outputControlNames_[outputControl_] << nl << abort(FatalError); break; + } } return false; -- GitLab