From 82151962c543d685587dfeca4e4f9e9153595ff8 Mon Sep 17 00:00:00 2001 From: Henry Weller Date: Wed, 11 May 2016 10:20:39 +0100 Subject: [PATCH] functionObjects: Removed redundant "start()" member function --- .../OutputFilterFunctionObject.C | 18 ++++++------------ .../OutputFilterFunctionObject.H | 3 --- .../functionObject/functionObject.H | 3 --- .../codedFunctionObject/codedFunctionObject.C | 13 ++++--------- .../codedFunctionObject/codedFunctionObject.H | 3 --- .../setTimeStep/setTimeStepFunctionObject.C | 6 ------ .../setTimeStep/setTimeStepFunctionObject.H | 3 --- 7 files changed, 10 insertions(+), 39 deletions(-) diff --git a/src/OpenFOAM/db/functionObjects/OutputFilterFunctionObject/OutputFilterFunctionObject.C b/src/OpenFOAM/db/functionObjects/OutputFilterFunctionObject/OutputFilterFunctionObject.C index 73c6dd2927..316e128fc1 100644 --- a/src/OpenFOAM/db/functionObjects/OutputFilterFunctionObject/OutputFilterFunctionObject.C +++ b/src/OpenFOAM/db/functionObjects/OutputFilterFunctionObject/OutputFilterFunctionObject.C @@ -128,13 +128,6 @@ Foam::OutputFilterFunctionObject::OutputFilterFunctionObject ), outputControl_(t, dict, "output"), evaluateControl_(t, dict, "evaluate") -{} - - -// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // - -template -bool Foam::OutputFilterFunctionObject::start() { readDict(); if (!allocateFilter()) @@ -143,11 +136,11 @@ bool Foam::OutputFilterFunctionObject::start() << "Cannot construct " << OutputFilter::typeName << exit(FatalError); } - - return true; } +// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // + template bool Foam::OutputFilterFunctionObject::execute ( @@ -252,10 +245,11 @@ bool Foam::OutputFilterFunctionObject::read if (dict != dict_) { dict_ = dict; - outputControl_.read(dict); - // Reset the OutputFilter - return start(); + outputControl_.read(dict); + readDict(); + + return true; } else { diff --git a/src/OpenFOAM/db/functionObjects/OutputFilterFunctionObject/OutputFilterFunctionObject.H b/src/OpenFOAM/db/functionObjects/OutputFilterFunctionObject/OutputFilterFunctionObject.H index 4e1d6bbb2c..5af1be11e9 100644 --- a/src/OpenFOAM/db/functionObjects/OutputFilterFunctionObject/OutputFilterFunctionObject.H +++ b/src/OpenFOAM/db/functionObjects/OutputFilterFunctionObject/OutputFilterFunctionObject.H @@ -158,9 +158,6 @@ public: // Function object control - //- Called at the start of the time-loop - virtual bool start(); - //- Called at each ++ or += of the time-loop. forceWrite overrides // the usual outputControl behaviour and forces writing always // (used in post-processing mode) diff --git a/src/OpenFOAM/db/functionObjects/functionObject/functionObject.H b/src/OpenFOAM/db/functionObjects/functionObject/functionObject.H index 58f3b8ab1f..a56625d579 100644 --- a/src/OpenFOAM/db/functionObjects/functionObject/functionObject.H +++ b/src/OpenFOAM/db/functionObjects/functionObject/functionObject.H @@ -183,9 +183,6 @@ public: //- Name virtual const word& name() const; - //- Called at the start of the time-loop - virtual bool start() = 0; - //- Called at each ++ or += of the time-loop. forceWrite overrides // the usual outputControl behaviour and forces writing always // (used in post-processing mode) diff --git a/src/postProcessing/functionObjects/utilities/codedFunctionObject/codedFunctionObject.C b/src/postProcessing/functionObjects/utilities/codedFunctionObject/codedFunctionObject.C index bb0abb0a20..8ae77458b0 100644 --- a/src/postProcessing/functionObjects/utilities/codedFunctionObject/codedFunctionObject.C +++ b/src/postProcessing/functionObjects/utilities/codedFunctionObject/codedFunctionObject.C @@ -136,6 +136,9 @@ Foam::codedFunctionObject::codedFunctionObject { read(dict_); } + + updateLibrary(redirectType_); + redirectFunctionObject(); } @@ -147,8 +150,7 @@ Foam::codedFunctionObject::~codedFunctionObject() // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -Foam::functionObject& -Foam::codedFunctionObject::redirectFunctionObject() const +Foam::functionObject& Foam::codedFunctionObject::redirectFunctionObject() const { if (!redirectFunctionObjectPtr_.valid()) { @@ -166,13 +168,6 @@ Foam::codedFunctionObject::redirectFunctionObject() const } -bool Foam::codedFunctionObject::start() -{ - updateLibrary(redirectType_); - return redirectFunctionObject().start(); -} - - bool Foam::codedFunctionObject::execute(const bool forceWrite) { updateLibrary(redirectType_); diff --git a/src/postProcessing/functionObjects/utilities/codedFunctionObject/codedFunctionObject.H b/src/postProcessing/functionObjects/utilities/codedFunctionObject/codedFunctionObject.H index bd3bf8107b..66f716037b 100644 --- a/src/postProcessing/functionObjects/utilities/codedFunctionObject/codedFunctionObject.H +++ b/src/postProcessing/functionObjects/utilities/codedFunctionObject/codedFunctionObject.H @@ -171,9 +171,6 @@ public: //- Dynamically compiled functionObject functionObject& redirectFunctionObject() const; - //- Called at the start of the time-loop - virtual bool start(); - //- Called at each ++ or += of the time-loop. forceWrite overrides the // outputControl behaviour. virtual bool execute(const bool forceWrite); diff --git a/src/postProcessing/functionObjects/utilities/setTimeStep/setTimeStepFunctionObject.C b/src/postProcessing/functionObjects/utilities/setTimeStep/setTimeStepFunctionObject.C index 52c1394cb4..28039535f1 100644 --- a/src/postProcessing/functionObjects/utilities/setTimeStep/setTimeStepFunctionObject.C +++ b/src/postProcessing/functionObjects/utilities/setTimeStep/setTimeStepFunctionObject.C @@ -75,12 +75,6 @@ Foam::functionObjects::setTimeStepFunctionObject::time() const } -bool Foam::functionObjects::setTimeStepFunctionObject::start() -{ - return true; -} - - bool Foam::functionObjects::setTimeStepFunctionObject::execute ( const bool forceWrite diff --git a/src/postProcessing/functionObjects/utilities/setTimeStep/setTimeStepFunctionObject.H b/src/postProcessing/functionObjects/utilities/setTimeStep/setTimeStepFunctionObject.H index 8be4b8580d..50749655df 100644 --- a/src/postProcessing/functionObjects/utilities/setTimeStep/setTimeStepFunctionObject.H +++ b/src/postProcessing/functionObjects/utilities/setTimeStep/setTimeStepFunctionObject.H @@ -109,9 +109,6 @@ public: // Function object control - //- Called at the start of the time-loop - virtual bool start(); - //- Called at each ++ or += of the time-loop virtual bool execute(const bool forceWrite);