diff --git a/src/OpenFOAM/db/Time/Time.C b/src/OpenFOAM/db/Time/Time.C
index 77ca3ca783d9f245c5f8dcec017e99a5f454e201..5f102c7be95c62c74eac6fd0ddf824dc42fe1397 100644
--- a/src/OpenFOAM/db/Time/Time.C
+++ b/src/OpenFOAM/db/Time/Time.C
@@ -3,7 +3,7 @@
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
- \\/ M anipulation |
+ \\/ M anipulation | Copyright (C) 2015 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@@ -891,7 +891,10 @@ bool Foam::Time::run() const
// ie, when exiting the control loop
if (!running && timeIndex_ != startTimeIndex_)
{
- // Note, end() also calls an indirect start() as required
+ // Ensure functionObjects execute on last time step
+ // (and hence write uptodate functionObjectProperties)
+ functionObjects_.execute();
+
functionObjects_.end();
}
}
diff --git a/src/OpenFOAM/db/functionObjects/OutputFilterFunctionObject/OutputFilterFunctionObject.C b/src/OpenFOAM/db/functionObjects/OutputFilterFunctionObject/OutputFilterFunctionObject.C
index 9590eb153c5849beffc8d21c3dd317a5c8862452..35ad1428d0b0e55f2ea46f34afc70f211c1b1db4 100644
--- a/src/OpenFOAM/db/functionObjects/OutputFilterFunctionObject/OutputFilterFunctionObject.C
+++ b/src/OpenFOAM/db/functionObjects/OutputFilterFunctionObject/OutputFilterFunctionObject.C
@@ -3,7 +3,7 @@
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
- \\/ M anipulation |
+ \\/ M anipulation | Copyright (C) 2015 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@@ -207,14 +207,6 @@ bool Foam::OutputFilterFunctionObject<OutputFilter>::end()
ptr_->end();
- // Only write if
- // - time within timeStart_ and timeEnd_
- // - it is an output time
- if (active() && outputControl_.output())
- {
- ptr_->write();
- }
-
if (!storeFilter_)
{
destroyFilter();
diff --git a/src/postProcessing/functionObjects/IO/partialWrite/partialWrite.C b/src/postProcessing/functionObjects/IO/partialWrite/partialWrite.C
index 9c5055de5d0f9ad38f21443a35af605d5ce7aa32..d6dcd4d947a8c8d14c6361e8021b62be0eda59c0 100644
--- a/src/postProcessing/functionObjects/IO/partialWrite/partialWrite.C
+++ b/src/postProcessing/functionObjects/IO/partialWrite/partialWrite.C
@@ -3,7 +3,7 @@
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2013-2014 OpenFOAM Foundation
- \\/ M anipulation |
+ \\/ M anipulation | Copyright (C) 2015 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@@ -135,12 +135,12 @@ void Foam::partialWrite::read(const dictionary& dict)
void Foam::partialWrite::execute()
{
+ // Do nothing - only valid on write
}
void Foam::partialWrite::end()
{
- //Pout<< "end at time " << obr_.time().timeName() << endl;
// Do nothing - only valid on write
}
diff --git a/src/postProcessing/functionObjects/IO/removeRegisteredObject/removeRegisteredObject.C b/src/postProcessing/functionObjects/IO/removeRegisteredObject/removeRegisteredObject.C
index fee807a9a63ec7eaf663a4f2a310120860bb6299..bd1b41479ccd3994284598308bed74c78db7b00b 100644
--- a/src/postProcessing/functionObjects/IO/removeRegisteredObject/removeRegisteredObject.C
+++ b/src/postProcessing/functionObjects/IO/removeRegisteredObject/removeRegisteredObject.C
@@ -94,7 +94,7 @@ void Foam::removeRegisteredObject::execute()
void Foam::removeRegisteredObject::end()
{
- execute();
+ // Do nothing - only valid on execute
}
diff --git a/src/postProcessing/functionObjects/IO/writeDictionary/writeDictionary.C b/src/postProcessing/functionObjects/IO/writeDictionary/writeDictionary.C
index 0e6ec44ce8cd2c44c52ff0a8df70a6a38b047b0f..2578b4406459dbea5216a06f0b232f088885f7de 100644
--- a/src/postProcessing/functionObjects/IO/writeDictionary/writeDictionary.C
+++ b/src/postProcessing/functionObjects/IO/writeDictionary/writeDictionary.C
@@ -3,7 +3,7 @@
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2013-2014 OpenFOAM Foundation
- \\/ M anipulation |
+ \\/ M anipulation | Copyright (C) 2015 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@@ -195,7 +195,7 @@ void Foam::writeDictionary::execute()
void Foam::writeDictionary::end()
{
- execute();
+ // do nothing
}
diff --git a/src/postProcessing/functionObjects/field/fieldAverage/fieldAverage/fieldAverage.C b/src/postProcessing/functionObjects/field/fieldAverage/fieldAverage/fieldAverage.C
index 08dcd5aa732c9691068952f72e722a748fcfb227..edbc3ea7feb0943cc7771d36906ffd0f1b50c81a 100644
--- a/src/postProcessing/functionObjects/field/fieldAverage/fieldAverage/fieldAverage.C
+++ b/src/postProcessing/functionObjects/field/fieldAverage/fieldAverage/fieldAverage.C
@@ -288,12 +288,7 @@ void Foam::fieldAverage::execute()
void Foam::fieldAverage::end()
-{
- if (active_)
- {
- execute();
- }
-}
+{}
void Foam::fieldAverage::timeSet()
diff --git a/src/postProcessing/functionObjects/field/fieldCoordinateSystemTransform/fieldCoordinateSystemTransform.C b/src/postProcessing/functionObjects/field/fieldCoordinateSystemTransform/fieldCoordinateSystemTransform.C
index 844a15cb36551ab4192a289bb2cbec364e6fecd8..308448380a2481e43d649ae2ef9b96ab66e9ed7c 100644
--- a/src/postProcessing/functionObjects/field/fieldCoordinateSystemTransform/fieldCoordinateSystemTransform.C
+++ b/src/postProcessing/functionObjects/field/fieldCoordinateSystemTransform/fieldCoordinateSystemTransform.C
@@ -3,7 +3,7 @@
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation
- \\/ M anipulation |
+ \\/ M anipulation | Copyright (C) 2015 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@@ -118,10 +118,7 @@ void Foam::fieldCoordinateSystemTransform::execute()
void Foam::fieldCoordinateSystemTransform::end()
{
- if (active_)
- {
- execute();
- }
+ // Do nothing
}
diff --git a/src/postProcessing/functionObjects/field/fieldValues/fieldValueDelta/fieldValueDelta.C b/src/postProcessing/functionObjects/field/fieldValues/fieldValueDelta/fieldValueDelta.C
index 7c64cfebf4aa8b9cd22fa737dd071d5d084fddce..95a625ce35cc0052e28d7cea25392b3dd4cfa93f 100644
--- a/src/postProcessing/functionObjects/field/fieldValues/fieldValueDelta/fieldValueDelta.C
+++ b/src/postProcessing/functionObjects/field/fieldValues/fieldValueDelta/fieldValueDelta.C
@@ -242,10 +242,7 @@ void Foam::fieldValues::fieldValueDelta::execute()
void Foam::fieldValues::fieldValueDelta::end()
{
- if (active_)
- {
- execute();
- }
+ // Do nothing
}
diff --git a/src/postProcessing/functionObjects/field/nearWallFields/nearWallFields.C b/src/postProcessing/functionObjects/field/nearWallFields/nearWallFields.C
index 6625f2e4cc90c6d0e687e752e135dda0eee02962..2c2a1970df470bc47f5641d6ea628434290b6204 100644
--- a/src/postProcessing/functionObjects/field/nearWallFields/nearWallFields.C
+++ b/src/postProcessing/functionObjects/field/nearWallFields/nearWallFields.C
@@ -3,7 +3,7 @@
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
- \\/ M anipulation |
+ \\/ M anipulation | Copyright (C) 2015 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@@ -369,15 +369,7 @@ void Foam::nearWallFields::execute()
void Foam::nearWallFields::end()
{
- if (debug)
- {
- Info<< "nearWallFields:end()" << endl;
- }
-
- if (active_)
- {
- execute();
- }
+ // Do nothing
}
diff --git a/src/postProcessing/functionObjects/field/processorField/processorField.C b/src/postProcessing/functionObjects/field/processorField/processorField.C
index 73b7a89978739f76495b8f4d593307bbaf131722..efe3733ef5fe96ec238e945c2a95c1f0152f8be5 100644
--- a/src/postProcessing/functionObjects/field/processorField/processorField.C
+++ b/src/postProcessing/functionObjects/field/processorField/processorField.C
@@ -3,7 +3,7 @@
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation
- \\/ M anipulation |
+ \\/ M anipulation | Copyright (C) 2015 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@@ -127,10 +127,7 @@ void Foam::processorField::execute()
void Foam::processorField::end()
{
- if (active_)
- {
- execute();
- }
+ // Do nothing
}
diff --git a/src/postProcessing/functionObjects/field/readFields/readFields.C b/src/postProcessing/functionObjects/field/readFields/readFields.C
index 6bac8da6d49f2baf2ec3a9e73eb9a524339eb544..b8cfba9446cf5f2989503662f83cb576d4884a65 100644
--- a/src/postProcessing/functionObjects/field/readFields/readFields.C
+++ b/src/postProcessing/functionObjects/field/readFields/readFields.C
@@ -112,10 +112,7 @@ void Foam::readFields::execute()
void Foam::readFields::end()
{
- if (active_)
- {
- execute();
- }
+ // Do nothing
}
diff --git a/src/postProcessing/functionObjects/field/surfaceInterpolateFields/surfaceInterpolateFields.C b/src/postProcessing/functionObjects/field/surfaceInterpolateFields/surfaceInterpolateFields.C
index f877a6d0868729b982ddee904c007dbf74733a33..6a13418fe00427abc97e64f4182258de90c47b33 100644
--- a/src/postProcessing/functionObjects/field/surfaceInterpolateFields/surfaceInterpolateFields.C
+++ b/src/postProcessing/functionObjects/field/surfaceInterpolateFields/surfaceInterpolateFields.C
@@ -116,10 +116,7 @@ void Foam::surfaceInterpolateFields::execute()
void Foam::surfaceInterpolateFields::end()
{
- if (active_)
- {
- execute();
- }
+ // Do nothing
}
diff --git a/src/postProcessing/functionObjects/field/valueAverage/valueAverage.C b/src/postProcessing/functionObjects/field/valueAverage/valueAverage.C
index a8e0a8d51e5695acedc895edeb784e3323d386a9..dd8cb4fe67bf4f2915e50be7b7fa52bc429956fa 100644
--- a/src/postProcessing/functionObjects/field/valueAverage/valueAverage.C
+++ b/src/postProcessing/functionObjects/field/valueAverage/valueAverage.C
@@ -180,10 +180,7 @@ void Foam::valueAverage::execute()
void Foam::valueAverage::end()
{
- if (active_)
- {
- execute();
- }
+ // Do nothing
}
diff --git a/src/postProcessing/functionObjects/forces/forceCoeffs/forceCoeffs.C b/src/postProcessing/functionObjects/forces/forceCoeffs/forceCoeffs.C
index e3417e26f82f5fab44fd3e103b4f03f26019e14b..1f220629f0c66c63654f1b990e83055b19b7a963 100644
--- a/src/postProcessing/functionObjects/forces/forceCoeffs/forceCoeffs.C
+++ b/src/postProcessing/functionObjects/forces/forceCoeffs/forceCoeffs.C
@@ -424,10 +424,7 @@ void Foam::forceCoeffs::execute()
void Foam::forceCoeffs::end()
{
- if (active_)
- {
- execute();
- }
+ // Do nothing
}
diff --git a/src/postProcessing/functionObjects/forces/forces/forces.C b/src/postProcessing/functionObjects/forces/forces/forces.C
index 9f3758caf1896af8d9dc4dfb04fb579e77a4d566..d3276f0411e24ea905b7474ddbc4f2833f45cb70 100644
--- a/src/postProcessing/functionObjects/forces/forces/forces.C
+++ b/src/postProcessing/functionObjects/forces/forces/forces.C
@@ -1037,10 +1037,7 @@ void Foam::forces::execute()
void Foam::forces::end()
{
- if (active_)
- {
- execute();
- }
+ // Do nothing
}
diff --git a/src/postProcessing/functionObjects/fvTools/calcFvcDiv/calcFvcDiv.C b/src/postProcessing/functionObjects/fvTools/calcFvcDiv/calcFvcDiv.C
index 9c5e5873288d686d3fa6dd0df2908b671e26d24e..801ae431f2c0145fa4cbfda1d879e458855ea5ee 100644
--- a/src/postProcessing/functionObjects/fvTools/calcFvcDiv/calcFvcDiv.C
+++ b/src/postProcessing/functionObjects/fvTools/calcFvcDiv/calcFvcDiv.C
@@ -157,10 +157,7 @@ void Foam::calcFvcDiv::execute()
void Foam::calcFvcDiv::end()
{
- if (active_)
- {
- execute();
- }
+ // Do nothing
}
diff --git a/src/postProcessing/functionObjects/fvTools/calcFvcGrad/calcFvcGrad.C b/src/postProcessing/functionObjects/fvTools/calcFvcGrad/calcFvcGrad.C
index ff97fa0f3ffa730639124b3e50d8e1671414d27f..90fbae9afc59445490d5ea3441edd493bbdacb03 100644
--- a/src/postProcessing/functionObjects/fvTools/calcFvcGrad/calcFvcGrad.C
+++ b/src/postProcessing/functionObjects/fvTools/calcFvcGrad/calcFvcGrad.C
@@ -119,10 +119,7 @@ void Foam::calcFvcGrad::execute()
void Foam::calcFvcGrad::end()
{
- if (active_)
- {
- execute();
- }
+ // Do nothing
}
diff --git a/src/postProcessing/functionObjects/fvTools/calcMag/calcMag.C b/src/postProcessing/functionObjects/fvTools/calcMag/calcMag.C
index ea11e28b4c60ba91d95adc548b87bdc6d102d9ed..9a3d2b67321e6d0f6ff2b08d4406df6c5e96306c 100644
--- a/src/postProcessing/functionObjects/fvTools/calcMag/calcMag.C
+++ b/src/postProcessing/functionObjects/fvTools/calcMag/calcMag.C
@@ -122,10 +122,7 @@ void Foam::calcMag::execute()
void Foam::calcMag::end()
{
- if (active_)
- {
- execute();
- }
+ // Do nothing
}
diff --git a/src/postProcessing/functionObjects/jobControl/runTimeControl/runTimeControl.C b/src/postProcessing/functionObjects/jobControl/runTimeControl/runTimeControl.C
index 27e1c4e180224b4c4e11b2364b085245aac90056..c987318690b09ad73a79cccf0d6e485def3fd3d1 100644
--- a/src/postProcessing/functionObjects/jobControl/runTimeControl/runTimeControl.C
+++ b/src/postProcessing/functionObjects/jobControl/runTimeControl/runTimeControl.C
@@ -3,7 +3,7 @@
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2015 OpenFOAM Foundation
- \\/ M anipulation |
+ \\/ M anipulation | Copyright (C) 2015 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@@ -236,10 +236,7 @@ void Foam::runTimeControl::execute()
void Foam::runTimeControl::end()
{
- if (active_)
- {
- execute();
- }
+ // Do nothing
}
diff --git a/src/postProcessing/functionObjects/utilities/CourantNo/CourantNo.C b/src/postProcessing/functionObjects/utilities/CourantNo/CourantNo.C
index 160481398817b45e5b86db9aa083e13b0d5c3fe3..692996de438a559113fbc694fc38828269330a02 100644
--- a/src/postProcessing/functionObjects/utilities/CourantNo/CourantNo.C
+++ b/src/postProcessing/functionObjects/utilities/CourantNo/CourantNo.C
@@ -167,10 +167,7 @@ void Foam::CourantNo::execute()
void Foam::CourantNo::end()
{
- if (active_)
- {
- execute();
- }
+ // Do nothing
}
diff --git a/src/postProcessing/functionObjects/utilities/DESModelRegions/DESModelRegions.C b/src/postProcessing/functionObjects/utilities/DESModelRegions/DESModelRegions.C
index 53e961de554b4b4cbb80e3347e4a832583bb8b34..bd0313856bb52ebb6030976b24bd43807eb92e2e 100644
--- a/src/postProcessing/functionObjects/utilities/DESModelRegions/DESModelRegions.C
+++ b/src/postProcessing/functionObjects/utilities/DESModelRegions/DESModelRegions.C
@@ -184,10 +184,7 @@ void Foam::DESModelRegions::execute()
void Foam::DESModelRegions::end()
{
- if (active_)
- {
- execute();
- }
+ // Do nothing
}
diff --git a/src/postProcessing/functionObjects/utilities/Lambda2/Lambda2.C b/src/postProcessing/functionObjects/utilities/Lambda2/Lambda2.C
index 90388fa751dda79e71d526c790c694186afbb1db..3e86b7f991ca288d5dbb80a3742be8a1939b7921 100644
--- a/src/postProcessing/functionObjects/utilities/Lambda2/Lambda2.C
+++ b/src/postProcessing/functionObjects/utilities/Lambda2/Lambda2.C
@@ -156,10 +156,7 @@ void Foam::Lambda2::execute()
void Foam::Lambda2::end()
{
- if (active_)
- {
- execute();
- }
+ // Do nothing
}
diff --git a/src/postProcessing/functionObjects/utilities/Peclet/Peclet.C b/src/postProcessing/functionObjects/utilities/Peclet/Peclet.C
index 8785efbb32428979e54d9a36ba0df291f607c7b3..8ab72b9dfe827e8b50312a7a715f363cb9efb49d 100644
--- a/src/postProcessing/functionObjects/utilities/Peclet/Peclet.C
+++ b/src/postProcessing/functionObjects/utilities/Peclet/Peclet.C
@@ -210,10 +210,7 @@ void Foam::Peclet::execute()
void Foam::Peclet::end()
{
- if (active_)
- {
- execute();
- }
+ // Do nothing
}
diff --git a/src/postProcessing/functionObjects/utilities/Q/Q.C b/src/postProcessing/functionObjects/utilities/Q/Q.C
index 243f2e92d463d43058c70b088118b2798e70481a..579955d829c60b9369b12575b8a6609ec1577a94 100644
--- a/src/postProcessing/functionObjects/utilities/Q/Q.C
+++ b/src/postProcessing/functionObjects/utilities/Q/Q.C
@@ -3,7 +3,7 @@
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2013-2014 OpenFOAM Foundation
- \\/ M anipulation |
+ \\/ M anipulation | Copyright (C) 2015 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@@ -149,10 +149,7 @@ void Foam::Q::execute()
void Foam::Q::end()
{
- if (active_)
- {
- execute();
- }
+ // Do nothing
}
diff --git a/src/postProcessing/functionObjects/utilities/blendingFactor/blendingFactor.C b/src/postProcessing/functionObjects/utilities/blendingFactor/blendingFactor.C
index 73277fc27fb5098681057a21868fcec27a60532d..0a9f38b97cf6fc1a91acae51cadd0d15adfc5af3 100644
--- a/src/postProcessing/functionObjects/utilities/blendingFactor/blendingFactor.C
+++ b/src/postProcessing/functionObjects/utilities/blendingFactor/blendingFactor.C
@@ -146,12 +146,10 @@ void Foam::blendingFactor::execute()
void Foam::blendingFactor::end()
{
- if (active_)
- {
- execute();
- }
+ // Do nothing
}
+
void Foam::blendingFactor::timeSet()
{
// Do nothing
diff --git a/src/postProcessing/functionObjects/utilities/pressureTools/pressureTools.C b/src/postProcessing/functionObjects/utilities/pressureTools/pressureTools.C
index 7d26627af68a43aa4d63dc6265df3e1e06f1aad7..e5bdfe0a17abd1aac2b0c8fa09abb071af487864 100644
--- a/src/postProcessing/functionObjects/utilities/pressureTools/pressureTools.C
+++ b/src/postProcessing/functionObjects/utilities/pressureTools/pressureTools.C
@@ -343,10 +343,7 @@ void Foam::pressureTools::execute()
void Foam::pressureTools::end()
{
- if (active_)
- {
- execute();
- }
+ // Do nothing
}
diff --git a/src/postProcessing/functionObjects/utilities/scalarTransport/scalarTransport.C b/src/postProcessing/functionObjects/utilities/scalarTransport/scalarTransport.C
index 79e1a98ac95f5d07debc354095f9567665649a55..d3f39612bb1065cd5ccbd60cc06fab5e9d74eaaa 100644
--- a/src/postProcessing/functionObjects/utilities/scalarTransport/scalarTransport.C
+++ b/src/postProcessing/functionObjects/utilities/scalarTransport/scalarTransport.C
@@ -328,10 +328,7 @@ void Foam::scalarTransport::execute()
void Foam::scalarTransport::end()
{
- if (active_)
- {
- execute();
- }
+ // Do nothing
}
diff --git a/src/postProcessing/functionObjects/utilities/timeActivatedFileUpdate/timeActivatedFileUpdate.C b/src/postProcessing/functionObjects/utilities/timeActivatedFileUpdate/timeActivatedFileUpdate.C
index 68c09980cc270a735a7fb611fc14dfd5a8b75509..833347edf3660f19a10d2b29aa325b26973325e3 100644
--- a/src/postProcessing/functionObjects/utilities/timeActivatedFileUpdate/timeActivatedFileUpdate.C
+++ b/src/postProcessing/functionObjects/utilities/timeActivatedFileUpdate/timeActivatedFileUpdate.C
@@ -140,10 +140,7 @@ void Foam::timeActivatedFileUpdate::execute()
void Foam::timeActivatedFileUpdate::end()
{
- if (active_)
- {
- execute();
- }
+ // Do nothing
}
diff --git a/src/postProcessing/functionObjects/utilities/turbulenceFields/turbulenceFields.C b/src/postProcessing/functionObjects/utilities/turbulenceFields/turbulenceFields.C
index 7e7d1aff8cb5de2961cd5b4457b5ad33e082bc89..011007048b43da15ecdda81ae644bd56a4c05e68 100644
--- a/src/postProcessing/functionObjects/utilities/turbulenceFields/turbulenceFields.C
+++ b/src/postProcessing/functionObjects/utilities/turbulenceFields/turbulenceFields.C
@@ -3,7 +3,7 @@
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2013-2015 OpenFOAM Foundation
- \\/ M anipulation |
+ \\/ M anipulation | Copyright (C) 2015 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@@ -284,12 +284,7 @@ void Foam::turbulenceFields::execute()
void Foam::turbulenceFields::end()
-{
- if (active_)
- {
- execute();
- }
-}
+{}
void Foam::turbulenceFields::timeSet()
diff --git a/src/postProcessing/functionObjects/utilities/vorticity/vorticity.C b/src/postProcessing/functionObjects/utilities/vorticity/vorticity.C
index f59b8a4c204a7f5f74aca9e8f80a7cc16cf686b9..4f015ffe21bfdd4ec1e3dcf54f980d03bc677d4e 100644
--- a/src/postProcessing/functionObjects/utilities/vorticity/vorticity.C
+++ b/src/postProcessing/functionObjects/utilities/vorticity/vorticity.C
@@ -3,7 +3,7 @@
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2014 OpenFOAM Foundation
- \\/ M anipulation |
+ \\/ M anipulation | Copyright (C) 2015 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@@ -144,10 +144,7 @@ void Foam::vorticity::execute()
void Foam::vorticity::end()
{
- if (active_)
- {
- execute();
- }
+ // Do nothing
}
diff --git a/src/postProcessing/functionObjects/utilities/wallShearStress/wallShearStress.C b/src/postProcessing/functionObjects/utilities/wallShearStress/wallShearStress.C
index c0885773e3fca5389344cb109e7948715a49c354..fd94d3a87f46214460608410e002a75fc1937771 100644
--- a/src/postProcessing/functionObjects/utilities/wallShearStress/wallShearStress.C
+++ b/src/postProcessing/functionObjects/utilities/wallShearStress/wallShearStress.C
@@ -274,10 +274,7 @@ void Foam::wallShearStress::execute()
void Foam::wallShearStress::end()
{
- if (active_)
- {
- execute();
- }
+ // Do nothing
}
diff --git a/src/postProcessing/functionObjects/utilities/yPlus/yPlus.C b/src/postProcessing/functionObjects/utilities/yPlus/yPlus.C
index a88623b1cece97fd54516ac6b62ad06a2f77c77a..7450321150141607320b8aaf0c814904e996a040 100644
--- a/src/postProcessing/functionObjects/utilities/yPlus/yPlus.C
+++ b/src/postProcessing/functionObjects/utilities/yPlus/yPlus.C
@@ -209,10 +209,7 @@ void Foam::yPlus::execute()
void Foam::yPlus::end()
{
- if (active_)
- {
- execute();
- }
+ // Do nothing
}