diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/writeVTK/writeVTK.C b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/writeVTK/writeVTK.C index cfb98182ec9291358274fb7c89fcf9baae1c2fca..2e7fa177c3f64ad8ba3e2e54f19555c70ab308e6 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 074c0e0b728fa9f5006415b124ac1f1facb3a7a3..231ebde4e4d8a3b3f1dd9959bd3318ad84d1e8de 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 3b3878d4ba423628540a1e8a75bbbae9f616d5aa..35227216486e424e1e3f2134d89528ebc1c36f4e 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 eb82ed27756996adc4762367d6993c01ad9ee4b7..2f60dd9a9e85f70070beef0a1dc2befe0bd7038f 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 <patchName>;" - with "patch outlet;" + replace "name <patchName>;" + 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 d458a5baffc565a1dabf67613a00d9d98d94c093..277b224a88cad22db5dc8c10d4faa4558c65eab3 100644 --- a/etc/caseDicts/postProcessing/flowRate/flowRatePatch +++ b/etc/caseDicts/postProcessing/flowRate/flowRatePatch @@ -14,7 +14,7 @@ Description flowRatePatch { - patch <patchName>; + name <patchName>; #includeEtc "caseDicts/postProcessing/flowRate/flowRatePatch.cfg" } diff --git a/etc/caseDicts/postProcessing/surfaceRegion/patch.cfg b/etc/caseDicts/postProcessing/surfaceRegion/patch.cfg index ad4d31f77e9d406d79512103c5193b84a0008e56..4dcf7415942f61e6fbf3182a759fd2a14e7a5262 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 2a1bda2fc980565707e72530faf60e4cb2ccfac8..96b660ce904ffefe2eb8ebe3046bd7f85bd7d64c 100644 --- a/etc/caseDicts/postProcessing/surfaceRegion/patchAverage +++ b/etc/caseDicts/postProcessing/surfaceRegion/patchAverage @@ -12,8 +12,8 @@ Description patchAverage { - patch <patchName>; - fields (<field names>); + name <patchName>; + fields (<field names>); operation average; #includeEtc "caseDicts/postProcessing/surfaceRegion/patch.cfg" diff --git a/etc/caseDicts/postProcessing/surfaceRegion/patchIntegrate b/etc/caseDicts/postProcessing/surfaceRegion/patchIntegrate index 41b24735310292dc5b036e92078dbee87b543472..d8e1ef086c2b4c1144fc3676c8132644d28ed413 100644 --- a/etc/caseDicts/postProcessing/surfaceRegion/patchIntegrate +++ b/etc/caseDicts/postProcessing/surfaceRegion/patchIntegrate @@ -12,7 +12,7 @@ Description patchIntegrate { - patch <patchName>; + name <patchName>; fields (<field names>); operation areaIntegrate; diff --git a/etc/codeTemplates/dynamicCode/functionObjectTemplate.C b/etc/codeTemplates/dynamicCode/functionObjectTemplate.C index f18764fa5bb9a4f2e0855d6f338c5fd468857e3b..4df4117cdd826389da54fc49fdd8720139f4556b 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 0662516a0a035055208f0ff9d13fee3aa38c3c03..a20a40120fe2bd22df2dcbc7cce4d8d8f6ed214f 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 634a104869e9af851d1a1801ac0750652df0f1df..68c84dfe7d6d7f79fa449db45406b6e7c527e1ca 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 2e502efed57ed5e6e9450aa54d193d0027a5a5a3..abaf9336494973b56f12df843f236f1bfc09bf2a 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 8001a1d63bfb7e642e6e4293a975b6b7546163f5..a84db356570272c91b891f2c72a21ed11171cf60 100644 --- a/src/OpenFOAM/db/functionObjects/IOOutputFilter/IOOutputFilter.C +++ b/src/OpenFOAM/db/functionObjects/IOOutputFilter/IOOutputFilter.C @@ -122,9 +122,9 @@ bool Foam::IOOutputFilter<OutputFilter>::read() template<class OutputFilter> -bool Foam::IOOutputFilter<OutputFilter>::write(const bool postProcess) +bool Foam::IOOutputFilter<OutputFilter>::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 31aeac2cb6073d0d09424052b3ce4997264eb4ed..17e81c67241962c1841b1e37618ad5efd1cf990d 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 74457227aa2b2c5adbe42684351993ecaf31f55c..632f615cb185332224f4763f0a6f960d3ee477ef 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 d32926d4ffd4fc85403793a8bfc49b770d51d93c..524930b76012c1710299d4675169c8da9a505275 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 0337cd47d71e0bc64e45d30da68a8d84f3e0c6d6..88e3ac8c9a57ff580e6be95db3ff05c52b5048ee 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 09a3b0d9534d30c5fea9e220d186a2faf94b8ed4..38ce9059d482c7fff3c738a10a2726216debd5e2 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 f4b6489630828846d35c77f23ac7a4a5058847c1..1f179698d100fa4bab81c26e9705793aee40614b 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 7d4fe58ee52fd8d7e4a6e5437896e9fd3c72ffd9..0697a18cf632bae28b42e7dcbae6793950b0f8ed 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 4b4bf0d9f91fe0fab8dfba615574587da574ab1e..4fdee06be4bb7fadf232a87570a0457967030030 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 8801c3ee44b03a156ad8e1516935544f99933045..3736262fd8b207b34d18786a8a71e7188669dc70 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 3f31aeb51089de63dbaa61fce081196ec078d64f..7ed53909f189e207c688abbff4d978480376d751 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 ebebd8d57c21285bfdcab5ff75e5b691775d0110..4f23344dc9819cfb5bbe8f867089a67da7db93bb 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 a993803273d201ecec2980542bc18974c4e98967..72794fd602a29091a68bbde7bdc71c0f774b6f7b 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 21405d61b1f665868c431778b32a8184c0d5f987..2a21faa8e953b2201597623549cbeaf534cc415a 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 8fb7e66f1c87b085f8fb6e6e3e002cd8f017178e..4d16100f9212601fb387cdca1eb0485b2c5975a7 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 2ac28884318b2757e310141674bae1e82d14ff20..697bf1404e5aa44ae9bcfa6bd173ccb189f61b53 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 fa7a26d03b65edb24904b31a92d82952f95a22ac..8c65e40887b10ec0f61021cc77ecb69ce7d31dab 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 786927d558043b58ec6140d393ab95dadd936e89..f0b949eb3ff4f82769b202eceb855c21dacb60f4 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 f29fdf24c33543c2f2adf9649868d8c7f499a32a..18e66003cb44d0f3f2490be12ccde6cc0c35221d 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 94ba2f0552af3530fbb3234fe36fe6c3adf3c923..857e546b7f8b0d624b6163e43fd56d7c6ad43d8c 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 4127cb80a8017fbf0d74232ba031a48580010f80..df313aa5460ccafc857914628888a2302e22ea9c 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 40d17636e955d459b61d0de57e8570e947aebb71..77b7d7f3cd678db0feef5d5f285feed9c751256a 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 506540929bdc91aaf4946a4fe3b55e5c6aa26190..53d3865b212c788100a1b75cd770cc69f0dad5c1 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 50d4a41e0ade85750a01ec9472fdd1a5d05376a3..2c4c183b91d2c78bfaf71582639da9009569ebee 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 d4bef0c7a5fcd81b5bf446dc9509337ddcd85ca2..cc36d586bff2aa73298c5a8a2ac4f9e4f07e4ec2 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 f89ab061960099d78423876b4f29f6bae6d3fb29..5e3d609628192c108b56b8158687888ac8e3cd27 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 0035e013b4184389694a372c9edbb9f55b6f9947..4b96159045d8b2d20d6bef272f6d4e819636ebf3 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 8d488bfb529cf4f0063de4b276d1b5f407cfd2fe..bca4cac25eb47a8197f48235a812209d4b7d183c 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 6bce7a84127f1f4c6b16d9144d36b00f101b8da4..f8e015020d3053d49ccd2890f09f7c80f7b52b58 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 831df5edda5ecb1d01a388d353649e03c47557d4..4647ef0f2c02c6da9d49a2beafcf374d83e0854b 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 15bcb22120e6242d451e3144652a8084076b28a9..7b6e865626bf21c06e23dec883400b22c8e12d8f 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 93026a3761f30ee135f22131f71c6ddfaf6f4fb7..3e331f260bf62a0eddc5c7cacb55bfac067aa721 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 fa4ba42c2c6bf2704407bfad1525562a0b56c6f9..e30ab4de92d83057cbf442fcc7c6845b6cb10644 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<volScalarField>("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<volScalarField>("processorID"); diff --git a/src/functionObjects/field/processorField/processorField.H b/src/functionObjects/field/processorField/processorField.H index fe0124cf763e68ea842298efdfc6312222d14f86..61a5e374449ace02f0e194111cfa4724b82c9379 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 93c87e39efa29025ef304786e500cf53c82d6738..876fb539041e22196b39dbed765fd78c601eec46 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 092b536ae129f3b7e4ad6d667d315113861f9451..d99b94ef1ac276cb62ecdb7331e453f0513374da 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 6a617ee7eb352fca0624ca53e3a0312d31e9bbc3..95bab35c13ace75bfdbc56780894ad0653f7150a 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 12e3bbfbfcdc52d2bb2044a2d603c69f725d2e31..7bbf48206869572c5fb0a3556adf94749a8c7c85 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 e969a31ef008d719311037fbdb81d296e245d7e3..0908a5b7a9c6cb77ee94cde5c9d0fc755689117e 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 58d39c4ede416ae781f1807bece69fe9bf0093ee..c34d6ad937cdd44ab49d630f1e2156d8a4b20420 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 fda45b7660da4ba2f9388649a04b18933fedc975..c9f641c76261f694b3af2d3a9d582871b77d2a50 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 aa4405fb1cf6d48a64644465978b875b059e045c..2e4564bd6a947b64556731ae8aef4294a43dfb67 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 ee58e8e47fd352698a3b002ce32b12a6844dcfab..8f9eac99fa155d177cf21c958fb7e79fe1efea4d 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 6b2d8b15ef13c5acf32ed1a996b67cd7a4a59791..68aa9f1c625c4d75c2aeb84d1eb51cb4382c19ae 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 d94ddffee713c6fa4ab9c371eb42ca2eed3a9719..41966402d36d9ef989ee2049788b1f2d96f23aa6 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<const fvMesh&>(obr_); diff --git a/src/functionObjects/field/wallBoundedStreamLine/wallBoundedStreamLine.H b/src/functionObjects/field/wallBoundedStreamLine/wallBoundedStreamLine.H index 5aa0980b8a60fe786ad719437952cdedb0a1910c..94e1e3fa00d818bb023756cac345b8088919782f 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 9d56c7be3bd74e3d1218bb881285601f701ee598..c762190fc8414ceec125d0cf32b2f4a4a1afaba7 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 a117c7591e3e430b7ea942652ba2565cbee5259b..97e5bbec4bea46424ff9b1b26de92c720564e4e3 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 503afa5d1d06cc259589e1e44a338de706ec47ea..e9db697e7820d0439ae486cee088518c27eaecb7 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<const fvMesh>(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<volScalarField>(type()); diff --git a/src/functionObjects/field/yPlus/yPlus.H b/src/functionObjects/field/yPlus/yPlus.H index e1d8c74b1e6e61f75904b1a69792d39c986439dd..c50e310810d03465047a4193e4be0b3c789435db 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 fdb590065b9fa4e3fdda90e4096f02015dad6f26..64d72517e686ee15e1036ae1910a2ac845f0fbc4 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 dc4552eab1fe0b12031897aefb28e7c330923cf8..1163c6badac2bdc849dbfc7753f7721285712208 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 f1345c0afd5c71c86ebd585332f49dc0ca985358..8a698b1ab5b9b549f79405c593af4e63025c6584 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 cfe38f3447a8638d9fbceb045edafa3bb83d1f5e..0f6dbe09f7096c8df439470dfbee4bd7bbaa23e4 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 86db6abc03891c1b10d6bd92f83d298133ac62cc..f2e8639f8c822c4bcad39bbebc1aa8c3615cb3c9 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 3cd45ac7bb25881a34cd244aaa11990e13ebda51..ecd485e25f673feadb6adab29d09eb47ba646241 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 894df64a95b7887348561f8f71e967b194784161..95c96dc9096bf6ea7aca6d71cb6344c1e0c7ef24 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 7ef4359e29e696d708890da9e03b433ce87dd51b..26f49ff59c56ea575e80e71f5a99a3ec2f51d585 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 f4f105f37bce9087a1e0a1bb9aab46f2c6972ade..c37307c377fe1bcf7c66a8ffa7ace5f2f52dec3e 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 e9c3c5c9398a47ee4ac9cf1bba98b46eb1760696..b043e8eae0bc7da3ff2ac52a70f173503df26e44 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 067fb7b940f950bd92a575cccb258a64bed1674b..5aecbd37e3f811e621410a4e3f0c2f5db42dcfda 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 4e2720a078f219f86344259bdbafc2309fe14aa5..80267f582b6f542dcc3aac4092054ea9ab129db1 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 f0194414c87be40bef892f4fa449b5345ebed486..54853319ec9f2247a82d4cab2f5c90fcf292b166 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<bool>()); @@ -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 e0e5d5aa69b7d43ba496ee75a1702561e481cd27..d9c16c8a23855355cb80a95c33f42f694692a3e2 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 1c9e5ada63bff42b3f025f638e5690a260be6a02..33d2227e650e1cf869f77b5cb8a40935494d2fc8 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 64f77bbccd9b65657269f27505b7d55e45b65766..842eaacefd637caadcc5d4a2e92c19ead33755d7 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 7b94ca0d498c54f431a0035f8497414aa8426c82..6fd2a80eecf878746c689762cc191c3c92a33138 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 85801ae85b413f61776dad3222bde0e307ca7b42..18059ad4933adb0a9046158fb50282eeddce07bc 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 16c2c98ac50a7f4893f89ea3007ee74384015095..17e1cb1a7698c25ded04595443a56b87a78b16e7 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 7d43de05ee5deab6fe72bb84375bb81358b862b9..c0902cb5caed90e299d6016994215f5b15ce6ee6 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 37f04583284a47b39b3141337964070e8c0f10bc..1f4554360988fc54fce3eddad537886867be6e59 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 62f12c8cc5c30448409a59671dc197b572a6942f..a20797d80fc81da967d39f0e7a2527837d796dc8 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 9d3645ba437a740435ecfca990e5b32f64628ce7..498457e10cd11616c5b1f608ac8b6fd6f61e51f7 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 4104a6e415c76c8dac006362fd9f6009bcfcfe25..f0030058e18edaafa6bee1adc56109e1805133da 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 9b8af9d7bb8a0ee51bfe675cbe58d795234f6103..ae8f6b2e07cda65c7e91ef498963bc6b6ae7652e 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 79f55ecdd32b67f46fefa19f0d929272b080831a..2644519d6ebab2a0b9eed7543cd48c9875219855 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 c9d5b368e98c3105d1c77600c7f630fcd167204e..58032fc7d9cecca0eac343c60f28cfb2fa792753 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 69e4d49d1760c96ac42a5f1af3cfd1678ff151b0..c7ef4bc7ec744ccb8da722d8290b6304c23b7583 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 1ade3208b8548ee116a1231af24bf993bc12b6e7..cad42b801fdcd543001c11a26014e41082f754c5 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 659fe6a7c9305d34470cd3d4cb2975f79d48934f..db39de97db8dabfc3f36620cdaef8026b0102259 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 ff0866ecd8c8e76ce90bcfee71601661a192af9f..7e7758cc0a0d317bec9794f84006f5846a40229e 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 5eb96c5e36e8881dd4bb18f0d9a6e209cd9b8a29..746ad9921dd1bed00dc6994e463c2f684a1fa545 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 e6e812196d60d752d952119f7e620b40d2c1799c..2e464a233bb45a83952fd4ce86ec9e8bbff5c028 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 30d427cf73c6f20292784966f20ab4f31a36b4e9..b0208601e708555db3d621223eba69020c9557b1 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 f75ebafa195d0078422858e68cc19c0a3aecab7d..e1bc650aa28a043ae36af236afae3a0196d69eb3 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 001d33122009d0838d59e73931c2314c6cbc70d3..2e8bc5ac94208feb7e3ef731588ebe9abf15705c 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 4c59f5b7d3f0b76af9de30d061bf2700199bd75f..98c596a3461c1dfa5bee2203b5c720e518c93e7d 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 77c55de4e184f089d64e8522c8f91d47cc753f09..1b3e3fe2dce48bff27090021c35d8e1b3c26703a 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 40a8f5f7be8debd964542aac725a279a047988fd..e7daabe79ffb9b509bf8c86e512678a0c03fe247 100644 --- a/src/thermophysicalModels/reactionThermo/functionObjects/moleFractions/moleFractions.C +++ b/src/thermophysicalModels/reactionThermo/functionObjects/moleFractions/moleFractions.C @@ -119,7 +119,7 @@ bool Foam::moleFractions<ThermoType>::read template<class ThermoType> -bool Foam::moleFractions<ThermoType>::execute(const bool postProcess) +bool Foam::moleFractions<ThermoType>::execute() { calculateMoleFractions(); return true; @@ -127,7 +127,7 @@ bool Foam::moleFractions<ThermoType>::execute(const bool postProcess) template<class ThermoType> -bool Foam::moleFractions<ThermoType>::write(const bool postProcess) +bool Foam::moleFractions<ThermoType>::write() { return true; } diff --git a/src/thermophysicalModels/reactionThermo/functionObjects/moleFractions/moleFractions.H b/src/thermophysicalModels/reactionThermo/functionObjects/moleFractions/moleFractions.H index 0ad3845a26b26c4061121b65d43dca0b1cd13d04..4298481f2f83fddfd8d2d92ed6d7ad0f209b59fc 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(); };