From ae1a6dd12d6c0ed95aa4fb2e5891267da40feba4 Mon Sep 17 00:00:00 2001 From: Henry Weller Date: Mon, 13 Jun 2016 08:36:03 +0100 Subject: [PATCH] functionObjects: Simplified the handling of the post-processing mode Replaced the 'postProcess' argument to the 'write' and 'execute' functions with the single static member 'postProcess' in the functionObject base-class. --- .../foamToVTK/foamToVTK/writeVTK/writeVTK.C | 4 ++-- .../foamToVTK/foamToVTK/writeVTK/writeVTK.H | 4 ++-- .../utilities/postProcessing/postProcess/postProcess.C | 2 +- etc/caseDicts/postProcessing/README | 4 ++-- etc/caseDicts/postProcessing/flowRate/flowRatePatch | 2 +- etc/caseDicts/postProcessing/surfaceRegion/patch.cfg | 1 - .../postProcessing/surfaceRegion/patchAverage | 4 ++-- .../postProcessing/surfaceRegion/patchIntegrate | 2 +- etc/codeTemplates/dynamicCode/functionObjectTemplate.C | 4 ++-- etc/codeTemplates/dynamicCode/functionObjectTemplate.H | 4 ++-- etc/codeTemplates/functionObject/FUNCTIONOBJECT.C | 4 ++-- etc/codeTemplates/functionObject/FUNCTIONOBJECT.H | 4 ++-- .../db/functionObjects/IOOutputFilter/IOOutputFilter.C | 4 ++-- .../db/functionObjects/IOOutputFilter/IOOutputFilter.H | 2 +- .../db/functionObjects/functionObject/functionObject.H | 4 ++-- .../functionObjectList/functionObjectList.C | 8 ++++---- .../functionObjectList/functionObjectList.H | 2 +- .../functionObjects/functionObjectList/postProcess.H | 2 +- .../timeControl/timeControlFunctionObject.C | 4 ++-- .../timeControl/timeControlFunctionObject.H | 4 ++-- .../db/functionObjects/writeFiles/writeFiles.C | 2 +- .../db/functionObjects/writeFiles/writeFiles.H | 2 +- src/functionObjects/field/components/components.C | 2 +- src/functionObjects/field/components/components.H | 2 +- src/functionObjects/field/fieldAverage/fieldAverage.C | 4 ++-- src/functionObjects/field/fieldAverage/fieldAverage.H | 4 ++-- .../fieldCoordinateSystemTransform.C | 10 ++-------- .../fieldCoordinateSystemTransform.H | 4 ++-- .../field/fieldExpression/fieldExpression.C | 4 ++-- .../field/fieldExpression/fieldExpression.H | 4 ++-- src/functionObjects/field/fieldMinMax/fieldMinMax.C | 4 ++-- src/functionObjects/field/fieldMinMax/fieldMinMax.H | 4 ++-- .../field/fieldValues/fieldValue/fieldValue.C | 4 ++-- .../field/fieldValues/fieldValue/fieldValue.H | 4 ++-- .../fieldValues/fieldValueDelta/fieldValueDelta.C | 10 ++-------- .../fieldValues/fieldValueDelta/fieldValueDelta.H | 4 ++-- .../field/fieldValues/surfaceRegion/surfaceRegion.C | 5 +---- .../field/fieldValues/surfaceRegion/surfaceRegion.H | 2 +- .../field/fieldValues/volRegion/volRegion.C | 5 +---- .../field/fieldValues/volRegion/volRegion.H | 2 +- src/functionObjects/field/histogram/histogram.C | 4 ++-- src/functionObjects/field/histogram/histogram.H | 4 ++-- .../field/nearWallFields/nearWallFields.C | 4 ++-- .../field/nearWallFields/nearWallFields.H | 4 ++-- .../field/processorField/processorField.C | 4 ++-- .../field/processorField/processorField.H | 4 ++-- src/functionObjects/field/readFields/readFields.C | 4 ++-- src/functionObjects/field/readFields/readFields.H | 4 ++-- .../regionSizeDistribution/regionSizeDistribution.C | 10 ++-------- .../regionSizeDistribution/regionSizeDistribution.H | 4 ++-- src/functionObjects/field/streamLine/streamLine.C | 4 ++-- src/functionObjects/field/streamLine/streamLine.H | 4 ++-- .../field/surfaceInterpolate/surfaceInterpolate.C | 10 ++-------- .../field/surfaceInterpolate/surfaceInterpolate.H | 4 ++-- .../field/turbulenceFields/turbulenceFields.C | 4 ++-- .../field/turbulenceFields/turbulenceFields.H | 4 ++-- .../wallBoundedStreamLine/wallBoundedStreamLine.C | 7 ++----- .../wallBoundedStreamLine/wallBoundedStreamLine.H | 4 ++-- .../field/wallShearStress/wallShearStress.C | 4 ++-- .../field/wallShearStress/wallShearStress.H | 4 ++-- src/functionObjects/field/yPlus/yPlus.C | 4 ++-- src/functionObjects/field/yPlus/yPlus.H | 4 ++-- src/functionObjects/forces/forceCoeffs/forceCoeffs.C | 4 ++-- src/functionObjects/forces/forceCoeffs/forceCoeffs.H | 4 ++-- src/functionObjects/forces/forces/forces.C | 4 ++-- src/functionObjects/forces/forces/forces.H | 4 ++-- src/functionObjects/lagrangian/cloudInfo/cloudInfo.C | 4 ++-- src/functionObjects/lagrangian/cloudInfo/cloudInfo.H | 4 ++-- src/functionObjects/lagrangian/dsmcFields/dsmcFields.C | 4 ++-- src/functionObjects/lagrangian/dsmcFields/dsmcFields.H | 4 ++-- .../icoUncoupledKinematicCloud.C | 10 ++-------- .../icoUncoupledKinematicCloud.H | 4 ++-- .../solvers/scalarTransport/scalarTransport.C | 4 ++-- .../solvers/scalarTransport/scalarTransport.H | 4 ++-- src/functionObjects/utilities/abort/abort.C | 4 ++-- src/functionObjects/utilities/abort/abort.H | 4 ++-- .../codedFunctionObject/codedFunctionObject.C | 8 ++++---- .../codedFunctionObject/codedFunctionObject.H | 4 ++-- .../removeRegisteredObject/removeRegisteredObject.C | 10 ++-------- .../removeRegisteredObject/removeRegisteredObject.H | 4 ++-- src/functionObjects/utilities/residuals/residuals.C | 4 ++-- src/functionObjects/utilities/residuals/residuals.H | 4 ++-- .../utilities/setTimeStep/setTimeStepFunctionObject.C | 10 ++-------- .../utilities/setTimeStep/setTimeStepFunctionObject.H | 4 ++-- src/functionObjects/utilities/systemCall/systemCall.C | 4 ++-- src/functionObjects/utilities/systemCall/systemCall.H | 4 ++-- .../timeActivatedFileUpdate/timeActivatedFileUpdate.C | 10 ++-------- .../timeActivatedFileUpdate/timeActivatedFileUpdate.H | 4 ++-- .../utilities/writeDictionary/writeDictionary.C | 4 ++-- .../utilities/writeDictionary/writeDictionary.H | 4 ++-- .../utilities/writeObjects/writeObjects.C | 10 ++-------- .../utilities/writeObjects/writeObjects.H | 4 ++-- src/sampling/probes/patchProbes.C | 2 +- src/sampling/probes/patchProbes.H | 2 +- src/sampling/probes/probes.C | 4 ++-- src/sampling/probes/probes.H | 4 ++-- src/sampling/sampledSet/sampledSets/sampledSets.C | 4 ++-- src/sampling/sampledSet/sampledSets/sampledSets.H | 4 ++-- .../sampledSurface/sampledSurfaces/sampledSurfaces.C | 4 ++-- .../sampledSurface/sampledSurfaces/sampledSurfaces.H | 4 ++-- .../functionObjects/moleFractions/moleFractions.C | 4 ++-- .../functionObjects/moleFractions/moleFractions.H | 4 ++-- 102 files changed, 190 insertions(+), 254 deletions(-) diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/writeVTK/writeVTK.C b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/writeVTK/writeVTK.C index cfb98182ec..2e7fa177c3 100644 --- a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/writeVTK/writeVTK.C +++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/writeVTK/writeVTK.C @@ -74,13 +74,13 @@ bool Foam::functionObjects::writeVTK::read(const dictionary& dict) } -bool Foam::functionObjects::writeVTK::execute(const bool postProcess) +bool Foam::functionObjects::writeVTK::execute() { return true; } -bool Foam::functionObjects::writeVTK::write(const bool postProcess) +bool Foam::functionObjects::writeVTK::write() { Info<< type() << " " << name() << " output:" << nl; diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/writeVTK/writeVTK.H b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/writeVTK/writeVTK.H index 074c0e0b72..231ebde4e4 100644 --- a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/writeVTK/writeVTK.H +++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/writeVTK/writeVTK.H @@ -129,10 +129,10 @@ public: virtual bool read(const dictionary&); //- Execute, currently does nothing - virtual bool execute(const bool postProcess = false); + virtual bool execute(); //- Write the writeVTK - virtual bool write(const bool postProcess = false); + virtual bool write(); }; diff --git a/applications/utilities/postProcessing/postProcess/postProcess.C b/applications/utilities/postProcessing/postProcess/postProcess.C index 3b3878d4ba..3522721648 100644 --- a/applications/utilities/postProcessing/postProcess/postProcess.C +++ b/applications/utilities/postProcessing/postProcess/postProcess.C @@ -113,7 +113,7 @@ void executeFunctionObjects Info<< nl << "Executing functionObjects" << endl; // Execute the functionObjects in post-processing mode - functions.execute(true); + functions.execute(); while (!storedObjects.empty()) { diff --git a/etc/caseDicts/postProcessing/README b/etc/caseDicts/postProcessing/README index eb82ed2775..2f60dd9a9e 100644 --- a/etc/caseDicts/postProcessing/README +++ b/etc/caseDicts/postProcessing/README @@ -26,8 +26,8 @@ Solution: - copy the flowRatePatch file into the case system directory (not flowRatePatch.cfg) - edit system/flowRatePatch to set the patch name - replace "patch ;" - with "patch outlet;" + replace "name ;" + with "name outlet;" - activate the function object by including the flowRatePatch file in functions sub-dictionary in the case controlDict file, e.g. functions diff --git a/etc/caseDicts/postProcessing/flowRate/flowRatePatch b/etc/caseDicts/postProcessing/flowRate/flowRatePatch index d458a5baff..277b224a88 100644 --- a/etc/caseDicts/postProcessing/flowRate/flowRatePatch +++ b/etc/caseDicts/postProcessing/flowRate/flowRatePatch @@ -14,7 +14,7 @@ Description flowRatePatch { - patch ; + name ; #includeEtc "caseDicts/postProcessing/flowRate/flowRatePatch.cfg" } diff --git a/etc/caseDicts/postProcessing/surfaceRegion/patch.cfg b/etc/caseDicts/postProcessing/surfaceRegion/patch.cfg index ad4d31f77e..4dcf741594 100644 --- a/etc/caseDicts/postProcessing/surfaceRegion/patch.cfg +++ b/etc/caseDicts/postProcessing/surfaceRegion/patch.cfg @@ -9,6 +9,5 @@ #includeEtc "caseDicts/postProcessing/surfaceRegion/surfaceRegion.cfg" regionType patch; -name $patch; // ************************************************************************* // diff --git a/etc/caseDicts/postProcessing/surfaceRegion/patchAverage b/etc/caseDicts/postProcessing/surfaceRegion/patchAverage index 2a1bda2fc9..96b660ce90 100644 --- a/etc/caseDicts/postProcessing/surfaceRegion/patchAverage +++ b/etc/caseDicts/postProcessing/surfaceRegion/patchAverage @@ -12,8 +12,8 @@ Description patchAverage { - patch ; - fields (); + name ; + fields (); operation average; #includeEtc "caseDicts/postProcessing/surfaceRegion/patch.cfg" diff --git a/etc/caseDicts/postProcessing/surfaceRegion/patchIntegrate b/etc/caseDicts/postProcessing/surfaceRegion/patchIntegrate index 41b2473531..d8e1ef086c 100644 --- a/etc/caseDicts/postProcessing/surfaceRegion/patchIntegrate +++ b/etc/caseDicts/postProcessing/surfaceRegion/patchIntegrate @@ -12,7 +12,7 @@ Description patchIntegrate { - patch ; + name ; fields (); operation areaIntegrate; diff --git a/etc/codeTemplates/dynamicCode/functionObjectTemplate.C b/etc/codeTemplates/dynamicCode/functionObjectTemplate.C index f18764fa5b..4df4117cdd 100644 --- a/etc/codeTemplates/dynamicCode/functionObjectTemplate.C +++ b/etc/codeTemplates/dynamicCode/functionObjectTemplate.C @@ -121,7 +121,7 @@ bool ${typeName}FunctionObject::read(const dictionary& dict) } -bool ${typeName}FunctionObject::execute(const bool postProcess) +bool ${typeName}FunctionObject::execute() { if (${verbose:-false}) { @@ -136,7 +136,7 @@ bool ${typeName}FunctionObject::execute(const bool postProcess) } -bool ${typeName}FunctionObject::write(const bool postProcess) +bool ${typeName}FunctionObject::write() { if (${verbose:-false}) { diff --git a/etc/codeTemplates/dynamicCode/functionObjectTemplate.H b/etc/codeTemplates/dynamicCode/functionObjectTemplate.H index 0662516a0a..a20a40120f 100644 --- a/etc/codeTemplates/dynamicCode/functionObjectTemplate.H +++ b/etc/codeTemplates/dynamicCode/functionObjectTemplate.H @@ -100,13 +100,13 @@ public: virtual bool read(const dictionary&); //- Execute the "executeCalls" at each time-step - virtual bool execute(const bool postProcess = false); + virtual bool execute(); //- Execute the "endCalls" at the final time-loop virtual bool end(); //- Write, execute the "writeCalls" - virtual bool write(const bool postProcess = false); + virtual bool write(); }; diff --git a/etc/codeTemplates/functionObject/FUNCTIONOBJECT.C b/etc/codeTemplates/functionObject/FUNCTIONOBJECT.C index 634a104869..68c84dfe7d 100644 --- a/etc/codeTemplates/functionObject/FUNCTIONOBJECT.C +++ b/etc/codeTemplates/functionObject/FUNCTIONOBJECT.C @@ -76,7 +76,7 @@ bool Foam::functionObjects::FUNCTIONOBJECT::read(const dictionary& dict) } -bool Foam::functionObjects::FUNCTIONOBJECT::execute(const bool postProcess) +bool Foam::functionObjects::FUNCTIONOBJECT::execute() { return true; } @@ -88,7 +88,7 @@ bool Foam::functionObjects::FUNCTIONOBJECT::end() } -bool Foam::functionObjects::FUNCTIONOBJECT::write(const bool postProcess) +bool Foam::functionObjects::FUNCTIONOBJECT::write() { return true; } diff --git a/etc/codeTemplates/functionObject/FUNCTIONOBJECT.H b/etc/codeTemplates/functionObject/FUNCTIONOBJECT.H index 2e502efed5..abaf933649 100644 --- a/etc/codeTemplates/functionObject/FUNCTIONOBJECT.H +++ b/etc/codeTemplates/functionObject/FUNCTIONOBJECT.H @@ -125,13 +125,13 @@ public: virtual bool read(const dictionary&); //- Execute, currently does nothing - virtual bool execute(const bool postProcess = false); + virtual bool execute(); //- Execute at the final time-loop, currently does nothing virtual bool end(); //- Write the FUNCTIONOBJECT - virtual bool write(const bool postProcess = false); + virtual bool write(); }; diff --git a/src/OpenFOAM/db/functionObjects/IOOutputFilter/IOOutputFilter.C b/src/OpenFOAM/db/functionObjects/IOOutputFilter/IOOutputFilter.C index 8001a1d63b..a84db35657 100644 --- a/src/OpenFOAM/db/functionObjects/IOOutputFilter/IOOutputFilter.C +++ b/src/OpenFOAM/db/functionObjects/IOOutputFilter/IOOutputFilter.C @@ -122,9 +122,9 @@ bool Foam::IOOutputFilter::read() template -bool Foam::IOOutputFilter::write(const bool postProcess) +bool Foam::IOOutputFilter::write() { - return OutputFilter::write(postProcess); + return OutputFilter::write(); } diff --git a/src/OpenFOAM/db/functionObjects/IOOutputFilter/IOOutputFilter.H b/src/OpenFOAM/db/functionObjects/IOOutputFilter/IOOutputFilter.H index 31aeac2cb6..17e81c6724 100644 --- a/src/OpenFOAM/db/functionObjects/IOOutputFilter/IOOutputFilter.H +++ b/src/OpenFOAM/db/functionObjects/IOOutputFilter/IOOutputFilter.H @@ -126,7 +126,7 @@ public: using regIOobject::write; //- Sample and write - virtual bool write(const bool postProcess = false); + virtual bool write(); //- Update for changes of mesh virtual void updateMesh(const mapPolyMesh& mpm); diff --git a/src/OpenFOAM/db/functionObjects/functionObject/functionObject.H b/src/OpenFOAM/db/functionObjects/functionObject/functionObject.H index 74457227aa..632f615cb1 100644 --- a/src/OpenFOAM/db/functionObjects/functionObject/functionObject.H +++ b/src/OpenFOAM/db/functionObjects/functionObject/functionObject.H @@ -211,12 +211,12 @@ public: //- Called at each ++ or += of the time-loop. // postProcess overrides the usual executeControl behaviour and // forces execution (used in post-processing mode) - virtual bool execute(const bool postProcess = false) = 0; + virtual bool execute() = 0; //- Called at each ++ or += of the time-loop. // postProcess overrides the usual writeControl behaviour and // forces writing always (used in post-processing mode) - virtual bool write(const bool postProcess = false) = 0; + virtual bool write() = 0; //- Called when Time::run() determines that the time-loop exits. // By default it simply calls execute(). diff --git a/src/OpenFOAM/db/functionObjects/functionObjectList/functionObjectList.C b/src/OpenFOAM/db/functionObjects/functionObjectList/functionObjectList.C index d32926d4ff..524930b760 100644 --- a/src/OpenFOAM/db/functionObjects/functionObjectList/functionObjectList.C +++ b/src/OpenFOAM/db/functionObjects/functionObjectList/functionObjectList.C @@ -145,7 +145,7 @@ bool Foam::functionObjectList::readFunctionObject // 'patchAverage(patch=inlet, p)' -> funcName = patchAverage; // args = (patch=inlet, p); field = p - word funcName; + word funcName(funcNameArgs); int argLevel = 0; wordList args; @@ -436,7 +436,7 @@ bool Foam::functionObjectList::start() } -bool Foam::functionObjectList::execute(const bool postProcess) +bool Foam::functionObjectList::execute() { bool ok = true; @@ -449,8 +449,8 @@ bool Foam::functionObjectList::execute(const bool postProcess) forAll(*this, objectI) { - ok = operator[](objectI).execute(postProcess) && ok; - ok = operator[](objectI).write(postProcess) && ok; + ok = operator[](objectI).execute() && ok; + ok = operator[](objectI).write() && ok; } } diff --git a/src/OpenFOAM/db/functionObjects/functionObjectList/functionObjectList.H b/src/OpenFOAM/db/functionObjects/functionObjectList/functionObjectList.H index 0337cd47d7..88e3ac8c9a 100644 --- a/src/OpenFOAM/db/functionObjects/functionObjectList/functionObjectList.H +++ b/src/OpenFOAM/db/functionObjects/functionObjectList/functionObjectList.H @@ -235,7 +235,7 @@ public: //- Called at each ++ or += of the time-loop. // postProcess overrides the usual executeControl behaviour and // forces execution (used in post-processing mode) - bool execute(const bool postProcess = false); + bool execute(); //- Called when Time::run() determines that the time-loop exits bool end(); diff --git a/src/OpenFOAM/db/functionObjects/functionObjectList/postProcess.H b/src/OpenFOAM/db/functionObjects/functionObjectList/postProcess.H index 09a3b0d953..38ce9059d4 100644 --- a/src/OpenFOAM/db/functionObjects/functionObjectList/postProcess.H +++ b/src/OpenFOAM/db/functionObjects/functionObjectList/postProcess.H @@ -136,7 +136,7 @@ if (argList::postProcess(argc, argv)) #include INCLUDE_FILE(CREATE_FIELDS_3) #endif - functionsPtr->execute(true); + functionsPtr->execute(); } catch (IOerror& err) { diff --git a/src/OpenFOAM/db/functionObjects/timeControl/timeControlFunctionObject.C b/src/OpenFOAM/db/functionObjects/timeControl/timeControlFunctionObject.C index f4b6489630..1f179698d1 100644 --- a/src/OpenFOAM/db/functionObjects/timeControl/timeControlFunctionObject.C +++ b/src/OpenFOAM/db/functionObjects/timeControl/timeControlFunctionObject.C @@ -85,7 +85,7 @@ Foam::functionObjects::timeControl::timeControl // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -bool Foam::functionObjects::timeControl::execute(const bool postProcess) +bool Foam::functionObjects::timeControl::execute() { if (active() && (postProcess || executeControl_.execute())) { @@ -96,7 +96,7 @@ bool Foam::functionObjects::timeControl::execute(const bool postProcess) } -bool Foam::functionObjects::timeControl::write(const bool postProcess) +bool Foam::functionObjects::timeControl::write() { if (active() && (postProcess || writeControl_.execute())) { diff --git a/src/OpenFOAM/db/functionObjects/timeControl/timeControlFunctionObject.H b/src/OpenFOAM/db/functionObjects/timeControl/timeControlFunctionObject.H index 7d4fe58ee5..0697a18cf6 100644 --- a/src/OpenFOAM/db/functionObjects/timeControl/timeControlFunctionObject.H +++ b/src/OpenFOAM/db/functionObjects/timeControl/timeControlFunctionObject.H @@ -151,12 +151,12 @@ public: //- Called at each ++ or += of the time-loop. // postProcess overrides the usual executeControl behaviour and // forces execution (used in post-processing mode) - virtual bool execute(const bool postProcess = false); + virtual bool execute(); //- Called at each ++ or += of the time-loop. // postProcess overrides the usual writeControl behaviour and // forces writing (used in post-processing mode) - virtual bool write(const bool postProcess = false); + virtual bool write(); //- Called when Time::run() determines that the time-loop exits virtual bool end(); diff --git a/src/OpenFOAM/db/functionObjects/writeFiles/writeFiles.C b/src/OpenFOAM/db/functionObjects/writeFiles/writeFiles.C index 4b4bf0d9f9..4fdee06be4 100644 --- a/src/OpenFOAM/db/functionObjects/writeFiles/writeFiles.C +++ b/src/OpenFOAM/db/functionObjects/writeFiles/writeFiles.C @@ -194,7 +194,7 @@ Foam::OFstream& Foam::functionObjects::writeFiles::file(const label i) } -bool Foam::functionObjects::writeFiles::write(const bool postProcess) +bool Foam::functionObjects::writeFiles::write() { createFiles(); diff --git a/src/OpenFOAM/db/functionObjects/writeFiles/writeFiles.H b/src/OpenFOAM/db/functionObjects/writeFiles/writeFiles.H index 8801c3ee44..3736262fd8 100644 --- a/src/OpenFOAM/db/functionObjects/writeFiles/writeFiles.H +++ b/src/OpenFOAM/db/functionObjects/writeFiles/writeFiles.H @@ -129,7 +129,7 @@ public: OFstream& file(const label i); //- Write function - virtual bool write(const bool postProcess = false); + virtual bool write(); }; diff --git a/src/functionObjects/field/components/components.C b/src/functionObjects/field/components/components.C index 3f31aeb510..7ed53909f1 100644 --- a/src/functionObjects/field/components/components.C +++ b/src/functionObjects/field/components/components.C @@ -76,7 +76,7 @@ Foam::functionObjects::components::~components() // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -bool Foam::functionObjects::components::write(const bool postProcess) +bool Foam::functionObjects::components::write() { bool written = true; diff --git a/src/functionObjects/field/components/components.H b/src/functionObjects/field/components/components.H index ebebd8d57c..4f23344dc9 100644 --- a/src/functionObjects/field/components/components.H +++ b/src/functionObjects/field/components/components.H @@ -107,7 +107,7 @@ public: // Member Functions //- Write the component fields - virtual bool write(const bool postProcess = false); + virtual bool write(); //- Clear the component fields from the objectRegistry virtual bool clear(); diff --git a/src/functionObjects/field/fieldAverage/fieldAverage.C b/src/functionObjects/field/fieldAverage/fieldAverage.C index a993803273..72794fd602 100644 --- a/src/functionObjects/field/fieldAverage/fieldAverage.C +++ b/src/functionObjects/field/fieldAverage/fieldAverage.C @@ -322,7 +322,7 @@ bool Foam::functionObjects::fieldAverage::read(const dictionary& dict) } -bool Foam::functionObjects::fieldAverage::execute(const bool postProcess) +bool Foam::functionObjects::fieldAverage::execute() { calcAverages(); @@ -330,7 +330,7 @@ bool Foam::functionObjects::fieldAverage::execute(const bool postProcess) } -bool Foam::functionObjects::fieldAverage::write(const bool postProcess) +bool Foam::functionObjects::fieldAverage::write() { writeAverages(); writeAveragingProperties(); diff --git a/src/functionObjects/field/fieldAverage/fieldAverage.H b/src/functionObjects/field/fieldAverage/fieldAverage.H index 21405d61b1..2a21faa8e9 100644 --- a/src/functionObjects/field/fieldAverage/fieldAverage.H +++ b/src/functionObjects/field/fieldAverage/fieldAverage.H @@ -296,10 +296,10 @@ public: virtual bool read(const dictionary&); //- Calculate the field averages - virtual bool execute(const bool postProcess = false); + virtual bool execute(); //- Write the field averages - virtual bool write(const bool postProcess = false); + virtual bool write(); }; diff --git a/src/functionObjects/field/fieldCoordinateSystemTransform/fieldCoordinateSystemTransform.C b/src/functionObjects/field/fieldCoordinateSystemTransform/fieldCoordinateSystemTransform.C index 8fb7e66f1c..4d16100f92 100644 --- a/src/functionObjects/field/fieldCoordinateSystemTransform/fieldCoordinateSystemTransform.C +++ b/src/functionObjects/field/fieldCoordinateSystemTransform/fieldCoordinateSystemTransform.C @@ -98,10 +98,7 @@ bool Foam::functionObjects::fieldCoordinateSystemTransform::read } -bool Foam::functionObjects::fieldCoordinateSystemTransform::execute -( - const bool postProcess -) +bool Foam::functionObjects::fieldCoordinateSystemTransform::execute() { forAll(fieldSet_, fieldi) { @@ -116,10 +113,7 @@ bool Foam::functionObjects::fieldCoordinateSystemTransform::execute } -bool Foam::functionObjects::fieldCoordinateSystemTransform::write -( - const bool postProcess -) +bool Foam::functionObjects::fieldCoordinateSystemTransform::write() { forAll(fieldSet_, fieldi) { diff --git a/src/functionObjects/field/fieldCoordinateSystemTransform/fieldCoordinateSystemTransform.H b/src/functionObjects/field/fieldCoordinateSystemTransform/fieldCoordinateSystemTransform.H index 2ac2888431..697bf1404e 100644 --- a/src/functionObjects/field/fieldCoordinateSystemTransform/fieldCoordinateSystemTransform.H +++ b/src/functionObjects/field/fieldCoordinateSystemTransform/fieldCoordinateSystemTransform.H @@ -145,10 +145,10 @@ public: virtual bool read(const dictionary&); //- Calculate the transformed fields - virtual bool execute(const bool postProcess = false); + virtual bool execute(); //- Write the transformed fields - virtual bool write(const bool postProcess = false); + virtual bool write(); }; diff --git a/src/functionObjects/field/fieldExpression/fieldExpression.C b/src/functionObjects/field/fieldExpression/fieldExpression.C index fa7a26d03b..8c65e40887 100644 --- a/src/functionObjects/field/fieldExpression/fieldExpression.C +++ b/src/functionObjects/field/fieldExpression/fieldExpression.C @@ -116,7 +116,7 @@ bool Foam::functionObjects::fieldExpression::read(const dictionary& dict) } -bool Foam::functionObjects::fieldExpression::execute(const bool postProcess) +bool Foam::functionObjects::fieldExpression::execute() { if (!calc()) { @@ -136,7 +136,7 @@ bool Foam::functionObjects::fieldExpression::execute(const bool postProcess) } -bool Foam::functionObjects::fieldExpression::write(const bool postProcess) +bool Foam::functionObjects::fieldExpression::write() { return writeObject(resultName_); } diff --git a/src/functionObjects/field/fieldExpression/fieldExpression.H b/src/functionObjects/field/fieldExpression/fieldExpression.H index 786927d558..f0b949eb3f 100644 --- a/src/functionObjects/field/fieldExpression/fieldExpression.H +++ b/src/functionObjects/field/fieldExpression/fieldExpression.H @@ -116,10 +116,10 @@ public: virtual bool read(const dictionary&); //- Calculate the result field - virtual bool execute(const bool postProcess = false); + virtual bool execute(); //- Write the result field - virtual bool write(const bool postProcess = false); + virtual bool write(); //- Clear the result field from the objectRegistry virtual bool clear(); diff --git a/src/functionObjects/field/fieldMinMax/fieldMinMax.C b/src/functionObjects/field/fieldMinMax/fieldMinMax.C index f29fdf24c3..18e66003cb 100644 --- a/src/functionObjects/field/fieldMinMax/fieldMinMax.C +++ b/src/functionObjects/field/fieldMinMax/fieldMinMax.C @@ -140,13 +140,13 @@ bool Foam::functionObjects::fieldMinMax::read(const dictionary& dict) } -bool Foam::functionObjects::fieldMinMax::execute(const bool postProcess) +bool Foam::functionObjects::fieldMinMax::execute() { return true; } -bool Foam::functionObjects::fieldMinMax::write(const bool postProcess) +bool Foam::functionObjects::fieldMinMax::write() { writeFiles::write(); diff --git a/src/functionObjects/field/fieldMinMax/fieldMinMax.H b/src/functionObjects/field/fieldMinMax/fieldMinMax.H index 94ba2f0552..857e546b7f 100644 --- a/src/functionObjects/field/fieldMinMax/fieldMinMax.H +++ b/src/functionObjects/field/fieldMinMax/fieldMinMax.H @@ -181,10 +181,10 @@ public: virtual bool read(const dictionary&); //- Execute, currently does nothing - virtual bool execute(const bool postProcess = false); + virtual bool execute(); //- Write the fieldMinMax - virtual bool write(const bool postProcess = false); + virtual bool write(); }; diff --git a/src/functionObjects/field/fieldValues/fieldValue/fieldValue.C b/src/functionObjects/field/fieldValues/fieldValue/fieldValue.C index 4127cb80a8..df313aa546 100644 --- a/src/functionObjects/field/fieldValues/fieldValue/fieldValue.C +++ b/src/functionObjects/field/fieldValues/fieldValue/fieldValue.C @@ -97,13 +97,13 @@ bool Foam::functionObjects::fieldValue::read(const dictionary& dict) } -bool Foam::functionObjects::fieldValue::execute(const bool postProcess) +bool Foam::functionObjects::fieldValue::execute() { return true; } -bool Foam::functionObjects::fieldValue::write(const bool postProcess) +bool Foam::functionObjects::fieldValue::write() { writeFiles::write(); diff --git a/src/functionObjects/field/fieldValues/fieldValue/fieldValue.H b/src/functionObjects/field/fieldValues/fieldValue/fieldValue.H index 40d17636e9..77b7d7f3cd 100644 --- a/src/functionObjects/field/fieldValues/fieldValue/fieldValue.H +++ b/src/functionObjects/field/fieldValues/fieldValue/fieldValue.H @@ -172,10 +172,10 @@ public: virtual bool read(const dictionary& dict); //- Execute - virtual bool execute(const bool postProcess = false); + virtual bool execute(); //- Write to screen/file - virtual bool write(const bool postProcess = false); + virtual bool write(); }; diff --git a/src/functionObjects/field/fieldValues/fieldValueDelta/fieldValueDelta.C b/src/functionObjects/field/fieldValues/fieldValueDelta/fieldValueDelta.C index 506540929b..53d3865b21 100644 --- a/src/functionObjects/field/fieldValues/fieldValueDelta/fieldValueDelta.C +++ b/src/functionObjects/field/fieldValues/fieldValueDelta/fieldValueDelta.C @@ -164,10 +164,7 @@ bool Foam::functionObjects::fieldValues::fieldValueDelta::read } -bool Foam::functionObjects::fieldValues::fieldValueDelta::write -( - const bool postProcess -) +bool Foam::functionObjects::fieldValues::fieldValueDelta::write() { writeFiles::write(); @@ -206,10 +203,7 @@ bool Foam::functionObjects::fieldValues::fieldValueDelta::write } -bool Foam::functionObjects::fieldValues::fieldValueDelta::execute -( - const bool postProcess -) +bool Foam::functionObjects::fieldValues::fieldValueDelta::execute() { return true; } diff --git a/src/functionObjects/field/fieldValues/fieldValueDelta/fieldValueDelta.H b/src/functionObjects/field/fieldValues/fieldValueDelta/fieldValueDelta.H index 50d4a41e0a..2c4c183b91 100644 --- a/src/functionObjects/field/fieldValues/fieldValueDelta/fieldValueDelta.H +++ b/src/functionObjects/field/fieldValues/fieldValueDelta/fieldValueDelta.H @@ -171,10 +171,10 @@ public: virtual bool read(const dictionary&); //- Do nothing - virtual bool execute(const bool postProcess = false); + virtual bool execute(); //- Calculate and write - virtual bool write(const bool postProcess = false); + virtual bool write(); }; diff --git a/src/functionObjects/field/fieldValues/surfaceRegion/surfaceRegion.C b/src/functionObjects/field/fieldValues/surfaceRegion/surfaceRegion.C index d4bef0c7a5..cc36d586bf 100644 --- a/src/functionObjects/field/fieldValues/surfaceRegion/surfaceRegion.C +++ b/src/functionObjects/field/fieldValues/surfaceRegion/surfaceRegion.C @@ -721,10 +721,7 @@ bool Foam::functionObjects::fieldValues::surfaceRegion::read } -bool Foam::functionObjects::fieldValues::surfaceRegion::write -( - const bool postProcess -) +bool Foam::functionObjects::fieldValues::surfaceRegion::write() { fieldValue::write(); diff --git a/src/functionObjects/field/fieldValues/surfaceRegion/surfaceRegion.H b/src/functionObjects/field/fieldValues/surfaceRegion/surfaceRegion.H index f89ab06196..5e3d609628 100644 --- a/src/functionObjects/field/fieldValues/surfaceRegion/surfaceRegion.H +++ b/src/functionObjects/field/fieldValues/surfaceRegion/surfaceRegion.H @@ -402,7 +402,7 @@ public: virtual bool read(const dictionary&); //- Calculate and write - virtual bool write(const bool postProcess = false); + virtual bool write(); }; diff --git a/src/functionObjects/field/fieldValues/volRegion/volRegion.C b/src/functionObjects/field/fieldValues/volRegion/volRegion.C index 0035e013b4..4b96159045 100644 --- a/src/functionObjects/field/fieldValues/volRegion/volRegion.C +++ b/src/functionObjects/field/fieldValues/volRegion/volRegion.C @@ -275,10 +275,7 @@ bool Foam::functionObjects::fieldValues::volRegion::read } -bool Foam::functionObjects::fieldValues::volRegion::write -( - const bool postProcess -) +bool Foam::functionObjects::fieldValues::volRegion::write() { fieldValue::write(); diff --git a/src/functionObjects/field/fieldValues/volRegion/volRegion.H b/src/functionObjects/field/fieldValues/volRegion/volRegion.H index 8d488bfb52..bca4cac25e 100644 --- a/src/functionObjects/field/fieldValues/volRegion/volRegion.H +++ b/src/functionObjects/field/fieldValues/volRegion/volRegion.H @@ -279,7 +279,7 @@ public: virtual bool read(const dictionary&); //- Calculate and write - virtual bool write(const bool postProcess = false); + virtual bool write(); }; diff --git a/src/functionObjects/field/histogram/histogram.C b/src/functionObjects/field/histogram/histogram.C index 6bce7a8412..f8e015020d 100644 --- a/src/functionObjects/field/histogram/histogram.C +++ b/src/functionObjects/field/histogram/histogram.C @@ -109,13 +109,13 @@ bool Foam::functionObjects::histogram::read(const dictionary& dict) } -bool Foam::functionObjects::histogram::execute(const bool postProcess) +bool Foam::functionObjects::histogram::execute() { return true; } -bool Foam::functionObjects::histogram::write(const bool postProcess) +bool Foam::functionObjects::histogram::write() { Log << type() << " " << name() << " write:" << nl; diff --git a/src/functionObjects/field/histogram/histogram.H b/src/functionObjects/field/histogram/histogram.H index 831df5edda..4647ef0f2c 100644 --- a/src/functionObjects/field/histogram/histogram.H +++ b/src/functionObjects/field/histogram/histogram.H @@ -148,12 +148,12 @@ public: virtual bool read(const dictionary&); //- Execute, currently does nothing - virtual bool execute(const bool postProcess = false); + virtual bool execute(); //- Calculate the histogram and write. // postProcess overrides the usual writeControl behaviour and // forces writing always (used in post-processing mode) - virtual bool write(const bool postProcess = false); + virtual bool write(); }; diff --git a/src/functionObjects/field/nearWallFields/nearWallFields.C b/src/functionObjects/field/nearWallFields/nearWallFields.C index 15bcb22120..7b6e865626 100644 --- a/src/functionObjects/field/nearWallFields/nearWallFields.C +++ b/src/functionObjects/field/nearWallFields/nearWallFields.C @@ -286,7 +286,7 @@ bool Foam::functionObjects::nearWallFields::read(const dictionary& dict) } -bool Foam::functionObjects::nearWallFields::execute(const bool postProcess) +bool Foam::functionObjects::nearWallFields::execute() { DebugInFunction << endl; @@ -327,7 +327,7 @@ bool Foam::functionObjects::nearWallFields::execute(const bool postProcess) } -bool Foam::functionObjects::nearWallFields::write(const bool postProcess) +bool Foam::functionObjects::nearWallFields::write() { DebugInFunction << endl; diff --git a/src/functionObjects/field/nearWallFields/nearWallFields.H b/src/functionObjects/field/nearWallFields/nearWallFields.H index 93026a3761..3e331f260b 100644 --- a/src/functionObjects/field/nearWallFields/nearWallFields.H +++ b/src/functionObjects/field/nearWallFields/nearWallFields.H @@ -196,10 +196,10 @@ public: virtual bool read(const dictionary&); //- Calculate the near-wall fields - virtual bool execute(const bool postProcess = false); + virtual bool execute(); //- Write the near-wall fields - virtual bool write(const bool postProcess = false); + virtual bool write(); }; diff --git a/src/functionObjects/field/processorField/processorField.C b/src/functionObjects/field/processorField/processorField.C index fa4ba42c2c..e30ab4de92 100644 --- a/src/functionObjects/field/processorField/processorField.C +++ b/src/functionObjects/field/processorField/processorField.C @@ -89,7 +89,7 @@ bool Foam::functionObjects::processorField::read(const dictionary& dict) } -bool Foam::functionObjects::processorField::execute(const bool postProcess) +bool Foam::functionObjects::processorField::execute() { const volScalarField& procField = mesh_.lookupObject("processorID"); @@ -101,7 +101,7 @@ bool Foam::functionObjects::processorField::execute(const bool postProcess) } -bool Foam::functionObjects::processorField::write(const bool postProcess) +bool Foam::functionObjects::processorField::write() { const volScalarField& procField = mesh_.lookupObject("processorID"); diff --git a/src/functionObjects/field/processorField/processorField.H b/src/functionObjects/field/processorField/processorField.H index fe0124cf76..61a5e37444 100644 --- a/src/functionObjects/field/processorField/processorField.H +++ b/src/functionObjects/field/processorField/processorField.H @@ -111,10 +111,10 @@ public: virtual bool read(const dictionary&); //- Calculate the processorID field - virtual bool execute(const bool postProcess = false); + virtual bool execute(); //- Write the processorID field - virtual bool write(const bool postProcess = false); + virtual bool write(); }; diff --git a/src/functionObjects/field/readFields/readFields.C b/src/functionObjects/field/readFields/readFields.C index 93c87e39ef..876fb53904 100644 --- a/src/functionObjects/field/readFields/readFields.C +++ b/src/functionObjects/field/readFields/readFields.C @@ -74,7 +74,7 @@ bool Foam::functionObjects::readFields::read(const dictionary& dict) } -bool Foam::functionObjects::readFields::execute(const bool postProcess) +bool Foam::functionObjects::readFields::execute() { // Clear out any previously loaded fields vsf_.clear(); @@ -105,7 +105,7 @@ bool Foam::functionObjects::readFields::execute(const bool postProcess) } -bool Foam::functionObjects::readFields::write(const bool postProcess) +bool Foam::functionObjects::readFields::write() { return true; } diff --git a/src/functionObjects/field/readFields/readFields.H b/src/functionObjects/field/readFields/readFields.H index 092b536ae1..d99b94ef1a 100644 --- a/src/functionObjects/field/readFields/readFields.H +++ b/src/functionObjects/field/readFields/readFields.H @@ -154,10 +154,10 @@ public: virtual bool read(const dictionary&); //- Read the fields - virtual bool execute(const bool postProcess = false); + virtual bool execute(); //- Do nothing - virtual bool write(const bool postProcess = false); + virtual bool write(); }; diff --git a/src/functionObjects/field/regionSizeDistribution/regionSizeDistribution.C b/src/functionObjects/field/regionSizeDistribution/regionSizeDistribution.C index 6a617ee7eb..95bab35c13 100644 --- a/src/functionObjects/field/regionSizeDistribution/regionSizeDistribution.C +++ b/src/functionObjects/field/regionSizeDistribution/regionSizeDistribution.C @@ -378,19 +378,13 @@ bool Foam::functionObjects::regionSizeDistribution::read(const dictionary& dict) } -bool Foam::functionObjects::regionSizeDistribution::execute -( - const bool postProcess -) +bool Foam::functionObjects::regionSizeDistribution::execute() { return true; } -bool Foam::functionObjects::regionSizeDistribution::write -( - const bool postProcess -) +bool Foam::functionObjects::regionSizeDistribution::write() { Info<< type() << " " << name() << " write:" << nl; diff --git a/src/functionObjects/field/regionSizeDistribution/regionSizeDistribution.H b/src/functionObjects/field/regionSizeDistribution/regionSizeDistribution.H index 12e3bbfbfc..7bbf482068 100644 --- a/src/functionObjects/field/regionSizeDistribution/regionSizeDistribution.H +++ b/src/functionObjects/field/regionSizeDistribution/regionSizeDistribution.H @@ -256,10 +256,10 @@ public: virtual bool read(const dictionary&); //- Do nothing - virtual bool execute(const bool postProcess = false); + virtual bool execute(); //- Calculate the regionSizeDistribution and write - virtual bool write(const bool postProcess = false); + virtual bool write(); }; diff --git a/src/functionObjects/field/streamLine/streamLine.C b/src/functionObjects/field/streamLine/streamLine.C index e969a31ef0..0908a5b7a9 100644 --- a/src/functionObjects/field/streamLine/streamLine.C +++ b/src/functionObjects/field/streamLine/streamLine.C @@ -423,13 +423,13 @@ bool Foam::functionObjects::streamLine::read(const dictionary& dict) } -bool Foam::functionObjects::streamLine::execute(const bool postProcess) +bool Foam::functionObjects::streamLine::execute() { return true; } -bool Foam::functionObjects::streamLine::write(const bool postProcess) +bool Foam::functionObjects::streamLine::write() { Info<< type() << " " << name() << " write:" << nl; diff --git a/src/functionObjects/field/streamLine/streamLine.H b/src/functionObjects/field/streamLine/streamLine.H index 58d39c4ede..c34d6ad937 100644 --- a/src/functionObjects/field/streamLine/streamLine.H +++ b/src/functionObjects/field/streamLine/streamLine.H @@ -243,10 +243,10 @@ public: virtual bool read(const dictionary&); //- Do nothing - virtual bool execute(const bool postProcess = false); + virtual bool execute(); //- Calculate and write the steamlines - virtual bool write(const bool postProcess = false); + virtual bool write(); //- Update for changes of mesh virtual void updateMesh(const mapPolyMesh&); diff --git a/src/functionObjects/field/surfaceInterpolate/surfaceInterpolate.C b/src/functionObjects/field/surfaceInterpolate/surfaceInterpolate.C index fda45b7660..c9f641c762 100644 --- a/src/functionObjects/field/surfaceInterpolate/surfaceInterpolate.C +++ b/src/functionObjects/field/surfaceInterpolate/surfaceInterpolate.C @@ -80,10 +80,7 @@ bool Foam::functionObjects::surfaceInterpolate::read } -bool Foam::functionObjects::surfaceInterpolate::execute -( - const bool postProcess -) +bool Foam::functionObjects::surfaceInterpolate::execute() { Info<< type() << " " << name() << " write:" << nl; @@ -106,10 +103,7 @@ bool Foam::functionObjects::surfaceInterpolate::execute } -bool Foam::functionObjects::surfaceInterpolate::write -( - const bool postProcess -) +bool Foam::functionObjects::surfaceInterpolate::write() { Info<< type() << " " << name() << " write:" << nl; diff --git a/src/functionObjects/field/surfaceInterpolate/surfaceInterpolate.H b/src/functionObjects/field/surfaceInterpolate/surfaceInterpolate.H index aa4405fb1c..2e4564bd6a 100644 --- a/src/functionObjects/field/surfaceInterpolate/surfaceInterpolate.H +++ b/src/functionObjects/field/surfaceInterpolate/surfaceInterpolate.H @@ -157,10 +157,10 @@ public: virtual bool read(const dictionary&); //- Calculate the interpolated fields - virtual bool execute(const bool postProcess = false); + virtual bool execute(); //- Write the interpolated fields - virtual bool write(const bool postProcess = false); + virtual bool write(); }; diff --git a/src/functionObjects/field/turbulenceFields/turbulenceFields.C b/src/functionObjects/field/turbulenceFields/turbulenceFields.C index ee58e8e47f..8f9eac99fa 100644 --- a/src/functionObjects/field/turbulenceFields/turbulenceFields.C +++ b/src/functionObjects/field/turbulenceFields/turbulenceFields.C @@ -174,7 +174,7 @@ bool Foam::functionObjects::turbulenceFields::read(const dictionary& dict) } -bool Foam::functionObjects::turbulenceFields::execute(const bool postProcess) +bool Foam::functionObjects::turbulenceFields::execute() { bool comp = compressible(); @@ -299,7 +299,7 @@ bool Foam::functionObjects::turbulenceFields::execute(const bool postProcess) } -bool Foam::functionObjects::turbulenceFields::write(const bool postProcess) +bool Foam::functionObjects::turbulenceFields::write() { forAllConstIter(wordHashSet, fieldSet_, iter) { diff --git a/src/functionObjects/field/turbulenceFields/turbulenceFields.H b/src/functionObjects/field/turbulenceFields/turbulenceFields.H index 6b2d8b15ef..68aa9f1c62 100644 --- a/src/functionObjects/field/turbulenceFields/turbulenceFields.H +++ b/src/functionObjects/field/turbulenceFields/turbulenceFields.H @@ -203,11 +203,11 @@ public: virtual bool read(const dictionary&); //- Calculate turbulence fields - virtual bool execute(const bool postProcess = false); + virtual bool execute(); //- Do nothing. // The turbulence fields are registered and written automatically - virtual bool write(const bool postProcess = false); + virtual bool write(); }; diff --git a/src/functionObjects/field/wallBoundedStreamLine/wallBoundedStreamLine.C b/src/functionObjects/field/wallBoundedStreamLine/wallBoundedStreamLine.C index d94ddffee7..41966402d3 100644 --- a/src/functionObjects/field/wallBoundedStreamLine/wallBoundedStreamLine.C +++ b/src/functionObjects/field/wallBoundedStreamLine/wallBoundedStreamLine.C @@ -588,16 +588,13 @@ bool Foam::functionObjects::wallBoundedStreamLine::read(const dictionary& dict) } -bool Foam::functionObjects::wallBoundedStreamLine::execute -( - const bool postProcess -) +bool Foam::functionObjects::wallBoundedStreamLine::execute() { return true; } -bool Foam::functionObjects::wallBoundedStreamLine::write(const bool postProcess) +bool Foam::functionObjects::wallBoundedStreamLine::write() { const Time& runTime = obr_.time(); const fvMesh& mesh = dynamic_cast(obr_); diff --git a/src/functionObjects/field/wallBoundedStreamLine/wallBoundedStreamLine.H b/src/functionObjects/field/wallBoundedStreamLine/wallBoundedStreamLine.H index 5aa0980b8a..94e1e3fa00 100644 --- a/src/functionObjects/field/wallBoundedStreamLine/wallBoundedStreamLine.H +++ b/src/functionObjects/field/wallBoundedStreamLine/wallBoundedStreamLine.H @@ -249,10 +249,10 @@ public: virtual bool read(const dictionary&); //- Do nothing - virtual bool execute(const bool postProcess = false); + virtual bool execute(); //- Calculate and write the wall-bounded streamlines - virtual bool write(const bool postProcess = false); + virtual bool write(); //- Update for changes of mesh virtual void updateMesh(const mapPolyMesh&); diff --git a/src/functionObjects/field/wallShearStress/wallShearStress.C b/src/functionObjects/field/wallShearStress/wallShearStress.C index 9d56c7be3b..c762190fc8 100644 --- a/src/functionObjects/field/wallShearStress/wallShearStress.C +++ b/src/functionObjects/field/wallShearStress/wallShearStress.C @@ -191,7 +191,7 @@ bool Foam::functionObjects::wallShearStress::read(const dictionary& dict) } -bool Foam::functionObjects::wallShearStress::execute(const bool postProcess) +bool Foam::functionObjects::wallShearStress::execute() { typedef compressible::turbulenceModel cmpModel; typedef incompressible::turbulenceModel icoModel; @@ -232,7 +232,7 @@ bool Foam::functionObjects::wallShearStress::execute(const bool postProcess) } -bool Foam::functionObjects::wallShearStress::write(const bool postProcess) +bool Foam::functionObjects::wallShearStress::write() { writeFiles::write(); diff --git a/src/functionObjects/field/wallShearStress/wallShearStress.H b/src/functionObjects/field/wallShearStress/wallShearStress.H index a117c7591e..97e5bbec4b 100644 --- a/src/functionObjects/field/wallShearStress/wallShearStress.H +++ b/src/functionObjects/field/wallShearStress/wallShearStress.H @@ -161,10 +161,10 @@ public: virtual bool read(const dictionary&); //- Calculate the wall shear-stress - virtual bool execute(const bool postProcess = false); + virtual bool execute(); //- Write the wall shear-stress - virtual bool write(const bool postProcess = false); + virtual bool write(); }; diff --git a/src/functionObjects/field/yPlus/yPlus.C b/src/functionObjects/field/yPlus/yPlus.C index 503afa5d1d..e9db697e78 100644 --- a/src/functionObjects/field/yPlus/yPlus.C +++ b/src/functionObjects/field/yPlus/yPlus.C @@ -170,7 +170,7 @@ bool Foam::functionObjects::yPlus::read(const dictionary& dict) } -bool Foam::functionObjects::yPlus::execute(const bool postProcess) +bool Foam::functionObjects::yPlus::execute() { const fvMesh& mesh = refCast(obr_); @@ -198,7 +198,7 @@ bool Foam::functionObjects::yPlus::execute(const bool postProcess) } -bool Foam::functionObjects::yPlus::write(const bool postProcess) +bool Foam::functionObjects::yPlus::write() { const volScalarField& yPlus = obr_.lookupObject(type()); diff --git a/src/functionObjects/field/yPlus/yPlus.H b/src/functionObjects/field/yPlus/yPlus.H index e1d8c74b1e..c50e310810 100644 --- a/src/functionObjects/field/yPlus/yPlus.H +++ b/src/functionObjects/field/yPlus/yPlus.H @@ -114,10 +114,10 @@ public: virtual bool read(const dictionary&); //- Calculate the yPlus field - virtual bool execute(const bool postProcess = false); + virtual bool execute(); //- Write the yPlus field - virtual bool write(const bool postProcess = false); + virtual bool write(); }; diff --git a/src/functionObjects/forces/forceCoeffs/forceCoeffs.C b/src/functionObjects/forces/forceCoeffs/forceCoeffs.C index fdb590065b..64d72517e6 100644 --- a/src/functionObjects/forces/forceCoeffs/forceCoeffs.C +++ b/src/functionObjects/forces/forceCoeffs/forceCoeffs.C @@ -167,13 +167,13 @@ bool Foam::functionObjects::forceCoeffs::read(const dictionary& dict) } -bool Foam::functionObjects::forceCoeffs::execute(const bool postProcess) +bool Foam::functionObjects::forceCoeffs::execute() { return true; } -bool Foam::functionObjects::forceCoeffs::write(const bool postProcess) +bool Foam::functionObjects::forceCoeffs::write() { forces::calcForcesMoment(); diff --git a/src/functionObjects/forces/forceCoeffs/forceCoeffs.H b/src/functionObjects/forces/forceCoeffs/forceCoeffs.H index dc4552eab1..1163c6bada 100644 --- a/src/functionObjects/forces/forceCoeffs/forceCoeffs.H +++ b/src/functionObjects/forces/forceCoeffs/forceCoeffs.H @@ -180,10 +180,10 @@ public: virtual bool read(const dictionary&); //- Execute, currently does nothing - virtual bool execute(const bool postProcess = false); + virtual bool execute(); //- Write the forces - virtual bool write(const bool postProcess = false); + virtual bool write(); }; diff --git a/src/functionObjects/forces/forces/forces.C b/src/functionObjects/forces/forces/forces.C index f1345c0afd..8a698b1ab5 100644 --- a/src/functionObjects/forces/forces/forces.C +++ b/src/functionObjects/forces/forces/forces.C @@ -892,13 +892,13 @@ Foam::vector Foam::functionObjects::forces::momentEff() const } -bool Foam::functionObjects::forces::execute(const bool postProcess) +bool Foam::functionObjects::forces::execute() { return true; } -bool Foam::functionObjects::forces::write(const bool postProcess) +bool Foam::functionObjects::forces::write() { calcForcesMoment(); diff --git a/src/functionObjects/forces/forces/forces.H b/src/functionObjects/forces/forces/forces.H index cfe38f3447..0f6dbe09f7 100644 --- a/src/functionObjects/forces/forces/forces.H +++ b/src/functionObjects/forces/forces/forces.H @@ -296,10 +296,10 @@ public: virtual vector momentEff() const; //- Execute, currently does nothing - virtual bool execute(const bool postProcess = false); + virtual bool execute(); //- Write the forces - virtual bool write(const bool postProcess = false); + virtual bool write(); }; diff --git a/src/functionObjects/lagrangian/cloudInfo/cloudInfo.C b/src/functionObjects/lagrangian/cloudInfo/cloudInfo.C index 86db6abc03..f2e8639f8c 100644 --- a/src/functionObjects/lagrangian/cloudInfo/cloudInfo.C +++ b/src/functionObjects/lagrangian/cloudInfo/cloudInfo.C @@ -103,13 +103,13 @@ bool Foam::functionObjects::cloudInfo::read(const dictionary& dict) } -bool Foam::functionObjects::cloudInfo::execute(const bool postProcess) +bool Foam::functionObjects::cloudInfo::execute() { return true; } -bool Foam::functionObjects::cloudInfo::write(const bool postProcess) +bool Foam::functionObjects::cloudInfo::write() { writeFiles::write(); diff --git a/src/functionObjects/lagrangian/cloudInfo/cloudInfo.H b/src/functionObjects/lagrangian/cloudInfo/cloudInfo.H index 3cd45ac7bb..ecd485e25f 100644 --- a/src/functionObjects/lagrangian/cloudInfo/cloudInfo.H +++ b/src/functionObjects/lagrangian/cloudInfo/cloudInfo.H @@ -134,10 +134,10 @@ public: virtual bool read(const dictionary&); //- Execute, currently does nothing - virtual bool execute(const bool postProcess = false); + virtual bool execute(); //- Write - virtual bool write(const bool postProcess = false); + virtual bool write(); }; diff --git a/src/functionObjects/lagrangian/dsmcFields/dsmcFields.C b/src/functionObjects/lagrangian/dsmcFields/dsmcFields.C index 894df64a95..95c96dc909 100644 --- a/src/functionObjects/lagrangian/dsmcFields/dsmcFields.C +++ b/src/functionObjects/lagrangian/dsmcFields/dsmcFields.C @@ -92,13 +92,13 @@ bool Foam::functionObjects::dsmcFields::read(const dictionary& dict) } -bool Foam::functionObjects::dsmcFields::execute(const bool postProcess) +bool Foam::functionObjects::dsmcFields::execute() { return true; } -bool Foam::functionObjects::dsmcFields::write(const bool postProcess) +bool Foam::functionObjects::dsmcFields::write() { word rhoNMeanName = "rhoNMean"; word rhoMMeanName = "rhoMMean"; diff --git a/src/functionObjects/lagrangian/dsmcFields/dsmcFields.H b/src/functionObjects/lagrangian/dsmcFields/dsmcFields.H index 7ef4359e29..26f49ff59c 100644 --- a/src/functionObjects/lagrangian/dsmcFields/dsmcFields.H +++ b/src/functionObjects/lagrangian/dsmcFields/dsmcFields.H @@ -105,10 +105,10 @@ public: virtual bool read(const dictionary&); //- Do nothing - virtual bool execute(const bool postProcess = false); + virtual bool execute(); //- Calculate and write the DSMC fields - virtual bool write(const bool postProcess = false); + virtual bool write(); }; diff --git a/src/functionObjects/lagrangian/icoUncoupledKinematicCloud/icoUncoupledKinematicCloud.C b/src/functionObjects/lagrangian/icoUncoupledKinematicCloud/icoUncoupledKinematicCloud.C index f4f105f37b..c37307c377 100644 --- a/src/functionObjects/lagrangian/icoUncoupledKinematicCloud/icoUncoupledKinematicCloud.C +++ b/src/functionObjects/lagrangian/icoUncoupledKinematicCloud/icoUncoupledKinematicCloud.C @@ -126,10 +126,7 @@ bool Foam::functionObjects::icoUncoupledKinematicCloud::read } -bool Foam::functionObjects::icoUncoupledKinematicCloud::execute -( - const bool postProcess -) +bool Foam::functionObjects::icoUncoupledKinematicCloud::execute() { mu_ = rhoValue_*laminarTransport_.nu(); kinematicCloud_.evolve(); @@ -138,10 +135,7 @@ bool Foam::functionObjects::icoUncoupledKinematicCloud::execute } -bool Foam::functionObjects::icoUncoupledKinematicCloud::write -( - const bool postProcess -) +bool Foam::functionObjects::icoUncoupledKinematicCloud::write() { return true; } diff --git a/src/functionObjects/lagrangian/icoUncoupledKinematicCloud/icoUncoupledKinematicCloud.H b/src/functionObjects/lagrangian/icoUncoupledKinematicCloud/icoUncoupledKinematicCloud.H index e9c3c5c939..b043e8eae0 100644 --- a/src/functionObjects/lagrangian/icoUncoupledKinematicCloud/icoUncoupledKinematicCloud.H +++ b/src/functionObjects/lagrangian/icoUncoupledKinematicCloud/icoUncoupledKinematicCloud.H @@ -158,10 +158,10 @@ public: virtual bool read(const dictionary&); //- Track the cloud - virtual bool execute(const bool postProcess = false); + virtual bool execute(); //- Write the cloud - virtual bool write(const bool postProcess = false); + virtual bool write(); }; diff --git a/src/functionObjects/solvers/scalarTransport/scalarTransport.C b/src/functionObjects/solvers/scalarTransport/scalarTransport.C index 067fb7b940..5aecbd37e3 100644 --- a/src/functionObjects/solvers/scalarTransport/scalarTransport.C +++ b/src/functionObjects/solvers/scalarTransport/scalarTransport.C @@ -186,7 +186,7 @@ bool Foam::functionObjects::scalarTransport::read(const dictionary& dict) } -bool Foam::functionObjects::scalarTransport::execute(const bool postProcess) +bool Foam::functionObjects::scalarTransport::execute() { Info<< type() << " write:" << endl; @@ -263,7 +263,7 @@ bool Foam::functionObjects::scalarTransport::execute(const bool postProcess) } -bool Foam::functionObjects::scalarTransport::write(const bool postProcess) +bool Foam::functionObjects::scalarTransport::write() { return true; } diff --git a/src/functionObjects/solvers/scalarTransport/scalarTransport.H b/src/functionObjects/solvers/scalarTransport/scalarTransport.H index 4e2720a078..80267f582b 100644 --- a/src/functionObjects/solvers/scalarTransport/scalarTransport.H +++ b/src/functionObjects/solvers/scalarTransport/scalarTransport.H @@ -135,11 +135,11 @@ public: virtual bool read(const dictionary&); //- Calculate the scalarTransport - virtual bool execute(const bool postProcess = false); + virtual bool execute(); //- Do nothing. // The volScalarField is registered and written automatically - virtual bool write(const bool postProcess = false); + virtual bool write(); }; diff --git a/src/functionObjects/utilities/abort/abort.C b/src/functionObjects/utilities/abort/abort.C index f0194414c8..54853319ec 100644 --- a/src/functionObjects/utilities/abort/abort.C +++ b/src/functionObjects/utilities/abort/abort.C @@ -132,7 +132,7 @@ bool Foam::functionObjects::abort::read(const dictionary& dict) } -bool Foam::functionObjects::abort::execute(const bool postProcess) +bool Foam::functionObjects::abort::execute() { bool hasAbort = isFile(abortFile_); reduce(hasAbort, orOp()); @@ -183,7 +183,7 @@ bool Foam::functionObjects::abort::execute(const bool postProcess) } -bool Foam::functionObjects::abort::write(const bool postProcess) +bool Foam::functionObjects::abort::write() { return true; } diff --git a/src/functionObjects/utilities/abort/abort.H b/src/functionObjects/utilities/abort/abort.H index e0e5d5aa69..d9c16c8a23 100644 --- a/src/functionObjects/utilities/abort/abort.H +++ b/src/functionObjects/utilities/abort/abort.H @@ -130,10 +130,10 @@ public: virtual bool read(const dictionary&); //- Execute, check existence of abort file and take action - virtual bool execute(const bool postProcess = false); + virtual bool execute(); //- Execute, check existence of abort file and take action - virtual bool write(const bool postProcess = false); + virtual bool write(); //- Execute at the final time-loop, used for cleanup virtual bool end(); diff --git a/src/functionObjects/utilities/codedFunctionObject/codedFunctionObject.C b/src/functionObjects/utilities/codedFunctionObject/codedFunctionObject.C index 1c9e5ada63..33d2227e65 100644 --- a/src/functionObjects/utilities/codedFunctionObject/codedFunctionObject.C +++ b/src/functionObjects/utilities/codedFunctionObject/codedFunctionObject.C @@ -161,17 +161,17 @@ Foam::functionObject& Foam::codedFunctionObject::redirectFunctionObject() const } -bool Foam::codedFunctionObject::execute(const bool postProcess) +bool Foam::codedFunctionObject::execute() { updateLibrary(name_); - return redirectFunctionObject().execute(postProcess); + return redirectFunctionObject().execute(); } -bool Foam::codedFunctionObject::write(const bool postProcess) +bool Foam::codedFunctionObject::write() { updateLibrary(name_); - return redirectFunctionObject().write(postProcess); + return redirectFunctionObject().write(); } diff --git a/src/functionObjects/utilities/codedFunctionObject/codedFunctionObject.H b/src/functionObjects/utilities/codedFunctionObject/codedFunctionObject.H index 64f77bbccd..842eaacefd 100644 --- a/src/functionObjects/utilities/codedFunctionObject/codedFunctionObject.H +++ b/src/functionObjects/utilities/codedFunctionObject/codedFunctionObject.H @@ -169,12 +169,12 @@ public: //- Called at each ++ or += of the time-loop. // postProcess overrides the usual executeControl behaviour and // forces execution (used in post-processing mode) - virtual bool execute(const bool postProcess = false); + virtual bool execute(); //- Called at each ++ or += of the time-loop. // postProcess overrides the usual writeControl behaviour and // forces writing always (used in post-processing mode) - virtual bool write(const bool postProcess = false); + virtual bool write(); //- Called when Time::run() determines that the time-loop exits. // By default it simply calls execute(). diff --git a/src/functionObjects/utilities/removeRegisteredObject/removeRegisteredObject.C b/src/functionObjects/utilities/removeRegisteredObject/removeRegisteredObject.C index 7b94ca0d49..6fd2a80eec 100644 --- a/src/functionObjects/utilities/removeRegisteredObject/removeRegisteredObject.C +++ b/src/functionObjects/utilities/removeRegisteredObject/removeRegisteredObject.C @@ -85,10 +85,7 @@ bool Foam::functionObjects::removeRegisteredObject::read(const dictionary& dict) } -bool Foam::functionObjects::removeRegisteredObject::execute -( - const bool postProcess -) +bool Foam::functionObjects::removeRegisteredObject::execute() { forAll(objectNames_, i) { @@ -113,10 +110,7 @@ bool Foam::functionObjects::removeRegisteredObject::execute } -bool Foam::functionObjects::removeRegisteredObject::write -( - const bool postProcess -) +bool Foam::functionObjects::removeRegisteredObject::write() { return true; } diff --git a/src/functionObjects/utilities/removeRegisteredObject/removeRegisteredObject.H b/src/functionObjects/utilities/removeRegisteredObject/removeRegisteredObject.H index 85801ae85b..18059ad493 100644 --- a/src/functionObjects/utilities/removeRegisteredObject/removeRegisteredObject.H +++ b/src/functionObjects/utilities/removeRegisteredObject/removeRegisteredObject.H @@ -126,10 +126,10 @@ public: virtual bool read(const dictionary&); //- Remove the registered objects - virtual bool execute(const bool postProcess = false); + virtual bool execute(); //- Do nothing - virtual bool write(const bool postProcess = false); + virtual bool write(); }; diff --git a/src/functionObjects/utilities/residuals/residuals.C b/src/functionObjects/utilities/residuals/residuals.C index 16c2c98ac5..17e1cb1a76 100644 --- a/src/functionObjects/utilities/residuals/residuals.C +++ b/src/functionObjects/utilities/residuals/residuals.C @@ -106,13 +106,13 @@ void Foam::functionObjects::residuals::writeFileHeader(const label i) } -bool Foam::functionObjects::residuals::execute(const bool postProcess) +bool Foam::functionObjects::residuals::execute() { return true; } -bool Foam::functionObjects::residuals::write(const bool postProcess) +bool Foam::functionObjects::residuals::write() { writeFiles::write(); diff --git a/src/functionObjects/utilities/residuals/residuals.H b/src/functionObjects/utilities/residuals/residuals.H index 7d43de05ee..c0902cb5ca 100644 --- a/src/functionObjects/utilities/residuals/residuals.H +++ b/src/functionObjects/utilities/residuals/residuals.H @@ -139,10 +139,10 @@ public: virtual bool read(const dictionary&); //- Execute, currently does nothing - virtual bool execute(const bool postProcess = false); + virtual bool execute(); //- Write the residuals - virtual bool write(const bool postProcess = false); + virtual bool write(); }; diff --git a/src/functionObjects/utilities/setTimeStep/setTimeStepFunctionObject.C b/src/functionObjects/utilities/setTimeStep/setTimeStepFunctionObject.C index 37f0458328..1f45543609 100644 --- a/src/functionObjects/utilities/setTimeStep/setTimeStepFunctionObject.C +++ b/src/functionObjects/utilities/setTimeStep/setTimeStepFunctionObject.C @@ -113,19 +113,13 @@ bool Foam::functionObjects::setTimeStepFunctionObject::read } -bool Foam::functionObjects::setTimeStepFunctionObject::execute -( - const bool postProcess -) +bool Foam::functionObjects::setTimeStepFunctionObject::execute() { return true; } -bool Foam::functionObjects::setTimeStepFunctionObject::write -( - const bool postProcess -) +bool Foam::functionObjects::setTimeStepFunctionObject::write() { return true; } diff --git a/src/functionObjects/utilities/setTimeStep/setTimeStepFunctionObject.H b/src/functionObjects/utilities/setTimeStep/setTimeStepFunctionObject.H index 62f12c8cc5..a20797d80f 100644 --- a/src/functionObjects/utilities/setTimeStep/setTimeStepFunctionObject.H +++ b/src/functionObjects/utilities/setTimeStep/setTimeStepFunctionObject.H @@ -113,12 +113,12 @@ public: //- Called at each ++ or += of the time-loop. // postProcess overrides the usual executeControl behaviour and // forces execution (used in post-processing mode) - virtual bool execute(const bool postProcess = false); + virtual bool execute(); //- Called at each ++ or += of the time-loop. // postProcess overrides the usual writeControl behaviour and // forces writing always (used in post-processing mode) - virtual bool write(const bool postProcess = false); + virtual bool write(); }; diff --git a/src/functionObjects/utilities/systemCall/systemCall.C b/src/functionObjects/utilities/systemCall/systemCall.C index 9d3645ba43..498457e10c 100644 --- a/src/functionObjects/utilities/systemCall/systemCall.C +++ b/src/functionObjects/utilities/systemCall/systemCall.C @@ -105,7 +105,7 @@ bool Foam::functionObjects::systemCall::read(const dictionary& dict) } -bool Foam::functionObjects::systemCall::execute(const bool postProcess) +bool Foam::functionObjects::systemCall::execute() { forAll(executeCalls_, callI) { @@ -127,7 +127,7 @@ bool Foam::functionObjects::systemCall::end() } -bool Foam::functionObjects::systemCall::write(const bool postProcess) +bool Foam::functionObjects::systemCall::write() { forAll(writeCalls_, callI) { diff --git a/src/functionObjects/utilities/systemCall/systemCall.H b/src/functionObjects/utilities/systemCall/systemCall.H index 4104a6e415..f0030058e1 100644 --- a/src/functionObjects/utilities/systemCall/systemCall.H +++ b/src/functionObjects/utilities/systemCall/systemCall.H @@ -156,13 +156,13 @@ public: virtual bool read(const dictionary&); //- Execute the "executeCalls" at each time-step - virtual bool execute(const bool postProcess = false); + virtual bool execute(); //- Execute the "endCalls" at the final time-loop virtual bool end(); //- Write, execute the "writeCalls" - virtual bool write(const bool postProcess = false); + virtual bool write(); }; diff --git a/src/functionObjects/utilities/timeActivatedFileUpdate/timeActivatedFileUpdate.C b/src/functionObjects/utilities/timeActivatedFileUpdate/timeActivatedFileUpdate.C index 9b8af9d7bb..ae8f6b2e07 100644 --- a/src/functionObjects/utilities/timeActivatedFileUpdate/timeActivatedFileUpdate.C +++ b/src/functionObjects/utilities/timeActivatedFileUpdate/timeActivatedFileUpdate.C @@ -131,10 +131,7 @@ bool Foam::functionObjects::timeActivatedFileUpdate::read } -bool Foam::functionObjects::timeActivatedFileUpdate::execute -( - const bool postProcess -) +bool Foam::functionObjects::timeActivatedFileUpdate::execute() { updateFile(); @@ -142,10 +139,7 @@ bool Foam::functionObjects::timeActivatedFileUpdate::execute } -bool Foam::functionObjects::timeActivatedFileUpdate::write -( - const bool postProcess -) +bool Foam::functionObjects::timeActivatedFileUpdate::write() { return true; } diff --git a/src/functionObjects/utilities/timeActivatedFileUpdate/timeActivatedFileUpdate.H b/src/functionObjects/utilities/timeActivatedFileUpdate/timeActivatedFileUpdate.H index 79f55ecdd3..2644519d6e 100644 --- a/src/functionObjects/utilities/timeActivatedFileUpdate/timeActivatedFileUpdate.H +++ b/src/functionObjects/utilities/timeActivatedFileUpdate/timeActivatedFileUpdate.H @@ -135,10 +135,10 @@ public: virtual bool read(const dictionary&); //- Execute file updates - virtual bool execute(const bool postProcess = false); + virtual bool execute(); //- Do nothing - virtual bool write(const bool postProcess = false); + virtual bool write(); }; diff --git a/src/functionObjects/utilities/writeDictionary/writeDictionary.C b/src/functionObjects/utilities/writeDictionary/writeDictionary.C index c9d5b368e9..58032fc7d9 100644 --- a/src/functionObjects/utilities/writeDictionary/writeDictionary.C +++ b/src/functionObjects/utilities/writeDictionary/writeDictionary.C @@ -153,13 +153,13 @@ bool Foam::functionObjects::writeDictionary::read(const dictionary& dict) } -bool Foam::functionObjects::writeDictionary::execute(const bool postProcess) +bool Foam::functionObjects::writeDictionary::execute() { return true; } -bool Foam::functionObjects::writeDictionary::write(const bool postProcess) +bool Foam::functionObjects::writeDictionary::write() { bool firstDict = true; forAll(dictNames_, i) diff --git a/src/functionObjects/utilities/writeDictionary/writeDictionary.H b/src/functionObjects/utilities/writeDictionary/writeDictionary.H index 69e4d49d17..c7ef4bc7ec 100644 --- a/src/functionObjects/utilities/writeDictionary/writeDictionary.H +++ b/src/functionObjects/utilities/writeDictionary/writeDictionary.H @@ -122,10 +122,10 @@ public: virtual bool read(const dictionary&); //- Execute, currently does nothing - virtual bool execute(const bool postProcess = false); + virtual bool execute(); //- Write the selected dictionaries - virtual bool write(const bool postProcess = false); + virtual bool write(); }; diff --git a/src/functionObjects/utilities/writeObjects/writeObjects.C b/src/functionObjects/utilities/writeObjects/writeObjects.C index 1ade3208b8..cad42b801f 100644 --- a/src/functionObjects/utilities/writeObjects/writeObjects.C +++ b/src/functionObjects/utilities/writeObjects/writeObjects.C @@ -100,19 +100,13 @@ bool Foam::functionObjects::writeObjects::read(const dictionary& dict) } -bool Foam::functionObjects::writeObjects::execute -( - const bool postProcess -) +bool Foam::functionObjects::writeObjects::execute() { return true; } -bool Foam::functionObjects::writeObjects::write -( - const bool postProcess -) +bool Foam::functionObjects::writeObjects::write() { Info<< type() << " " << name() << " write:" << nl; diff --git a/src/functionObjects/utilities/writeObjects/writeObjects.H b/src/functionObjects/utilities/writeObjects/writeObjects.H index 659fe6a7c9..db39de97db 100644 --- a/src/functionObjects/utilities/writeObjects/writeObjects.H +++ b/src/functionObjects/utilities/writeObjects/writeObjects.H @@ -144,10 +144,10 @@ public: virtual bool read(const dictionary&); //- Do nothing - virtual bool execute(const bool postProcess = false); + virtual bool execute(); //- Write the registered objects - virtual bool write(const bool postProcess = false); + virtual bool write(); }; diff --git a/src/sampling/probes/patchProbes.C b/src/sampling/probes/patchProbes.C index ff0866ecd8..7e7758cc0a 100644 --- a/src/sampling/probes/patchProbes.C +++ b/src/sampling/probes/patchProbes.C @@ -237,7 +237,7 @@ Foam::patchProbes::~patchProbes() {} -bool Foam::patchProbes::write(const bool postProcess) +bool Foam::patchProbes::write() { if (this->size() && prepare()) { diff --git a/src/sampling/probes/patchProbes.H b/src/sampling/probes/patchProbes.H index 5eb96c5e36..746ad9921d 100644 --- a/src/sampling/probes/patchProbes.H +++ b/src/sampling/probes/patchProbes.H @@ -154,7 +154,7 @@ public: //- Public members //- Sample and write - virtual bool write(const bool postProcess = false); + virtual bool write(); //- Read virtual bool read(const dictionary&); diff --git a/src/sampling/probes/probes.C b/src/sampling/probes/probes.C index e6e812196d..2e464a233b 100644 --- a/src/sampling/probes/probes.C +++ b/src/sampling/probes/probes.C @@ -357,13 +357,13 @@ bool Foam::probes::read(const dictionary& dict) } -bool Foam::probes::execute(const bool postProcess) +bool Foam::probes::execute() { return true; } -bool Foam::probes::write(const bool postProcess) +bool Foam::probes::write() { if (size() && prepare()) { diff --git a/src/sampling/probes/probes.H b/src/sampling/probes/probes.H index 30d427cf73..b0208601e7 100644 --- a/src/sampling/probes/probes.H +++ b/src/sampling/probes/probes.H @@ -252,10 +252,10 @@ public: virtual bool read(const dictionary&); //- Execute, currently does nothing - virtual bool execute(const bool postProcess = false); + virtual bool execute(); //- Sample and write - virtual bool write(const bool postProcess = false); + virtual bool write(); //- Update for changes of mesh virtual void updateMesh(const mapPolyMesh&); diff --git a/src/sampling/sampledSet/sampledSets/sampledSets.C b/src/sampling/sampledSet/sampledSets/sampledSets.C index f75ebafa19..e1bc650aa2 100644 --- a/src/sampling/sampledSet/sampledSets/sampledSets.C +++ b/src/sampling/sampledSet/sampledSets/sampledSets.C @@ -228,13 +228,13 @@ void Foam::sampledSets::verbose(const bool verbosity) } -bool Foam::sampledSets::execute(const bool postProcess) +bool Foam::sampledSets::execute() { return true; } -bool Foam::sampledSets::write(const bool postProcess) +bool Foam::sampledSets::write() { if (size()) { diff --git a/src/sampling/sampledSet/sampledSets/sampledSets.H b/src/sampling/sampledSet/sampledSets/sampledSets.H index 001d331220..2e8bc5ac94 100644 --- a/src/sampling/sampledSet/sampledSets/sampledSets.H +++ b/src/sampling/sampledSet/sampledSets/sampledSets.H @@ -288,10 +288,10 @@ public: virtual bool read(const dictionary&); //- Execute, currently does nothing - virtual bool execute(const bool postProcess = false); + virtual bool execute(); //- Sample and write - virtual bool write(const bool postProcess = false); + virtual bool write(); //- Correct for mesh changes void correct(); diff --git a/src/sampling/sampledSurface/sampledSurfaces/sampledSurfaces.C b/src/sampling/sampledSurface/sampledSurfaces/sampledSurfaces.C index 4c59f5b7d3..98c596a346 100644 --- a/src/sampling/sampledSurface/sampledSurfaces/sampledSurfaces.C +++ b/src/sampling/sampledSurface/sampledSurfaces/sampledSurfaces.C @@ -177,13 +177,13 @@ void Foam::sampledSurfaces::verbose(const bool verbosity) } -bool Foam::sampledSurfaces::execute(const bool postProcess) +bool Foam::sampledSurfaces::execute() { return true; } -bool Foam::sampledSurfaces::write(const bool postProcess) +bool Foam::sampledSurfaces::write() { if (size()) { diff --git a/src/sampling/sampledSurface/sampledSurfaces/sampledSurfaces.H b/src/sampling/sampledSurface/sampledSurfaces/sampledSurfaces.H index 77c55de4e1..1b3e3fe2dc 100644 --- a/src/sampling/sampledSurface/sampledSurfaces/sampledSurfaces.H +++ b/src/sampling/sampledSurface/sampledSurfaces/sampledSurfaces.H @@ -219,10 +219,10 @@ public: virtual bool read(const dictionary&); //- Execute, currently does nothing - virtual bool execute(const bool postProcess = false); + virtual bool execute(); //- Sample and write - virtual bool write(const bool postProcess = false); + virtual bool write(); //- Update for changes of mesh - expires the surfaces virtual void updateMesh(const mapPolyMesh&); diff --git a/src/thermophysicalModels/reactionThermo/functionObjects/moleFractions/moleFractions.C b/src/thermophysicalModels/reactionThermo/functionObjects/moleFractions/moleFractions.C index 40a8f5f7be..e7daabe79f 100644 --- a/src/thermophysicalModels/reactionThermo/functionObjects/moleFractions/moleFractions.C +++ b/src/thermophysicalModels/reactionThermo/functionObjects/moleFractions/moleFractions.C @@ -119,7 +119,7 @@ bool Foam::moleFractions::read template -bool Foam::moleFractions::execute(const bool postProcess) +bool Foam::moleFractions::execute() { calculateMoleFractions(); return true; @@ -127,7 +127,7 @@ bool Foam::moleFractions::execute(const bool postProcess) template -bool Foam::moleFractions::write(const bool postProcess) +bool Foam::moleFractions::write() { return true; } diff --git a/src/thermophysicalModels/reactionThermo/functionObjects/moleFractions/moleFractions.H b/src/thermophysicalModels/reactionThermo/functionObjects/moleFractions/moleFractions.H index 0ad3845a26..4298481f2f 100644 --- a/src/thermophysicalModels/reactionThermo/functionObjects/moleFractions/moleFractions.H +++ b/src/thermophysicalModels/reactionThermo/functionObjects/moleFractions/moleFractions.H @@ -121,10 +121,10 @@ public: virtual bool read(const dictionary&); //- Calculate the mole-fraction fields - virtual bool execute(const bool postProcess = false); + virtual bool execute(); //- The mole-fraction fields auto-write - virtual bool write(const bool postProcess = false); + virtual bool write(); };