GIT: Resolved conflict

src/postProcessing/functionObjects/utilities/CourantNo/CourantNo.C

@@ -159,10 +159,7 @@ void Foam::CourantNo::execute()
 
 void Foam::CourantNo::end()
 {
-    if (active_)
-    {
-        execute();
-    }
+    // Do nothing
 }
 
 

src/postProcessing/functionObjects/utilities/DESModelRegions/DESModelRegions.C

@@ -176,10 +176,7 @@ void Foam::DESModelRegions::execute()
 
 void Foam::DESModelRegions::end()
 {
-    if (active_)
-    {
-        execute();
-    }
+    // Do nothing
 }
 
 

src/postProcessing/functionObjects/utilities/Lambda2/Lambda2.C

@@ -148,10 +148,7 @@ void Foam::Lambda2::execute()
 
 void Foam::Lambda2::end()
 {
-    if (active_)
-    {
-        execute();
-    }
+    // Do nothing
 }
 
 

src/postProcessing/functionObjects/utilities/Peclet/Peclet.C

@@ -202,10 +202,7 @@ void Foam::Peclet::execute()
 
 void Foam::Peclet::end()
 {
-    if (active_)
-    {
-        execute();
-    }
+    // Do nothing
 }
 
 

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-2015 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -32,7 +32,7 @@ License
 
 namespace Foam
 {
-defineTypeNameAndDebug(Q, 0);
+    defineTypeNameAndDebug(Q, 0);
 }
 
 
@@ -141,10 +141,7 @@ void Foam::Q::execute()
 
 void Foam::Q::end()
 {
-    if (active_)
-    {
-        execute();
-    }
+    // Do nothing
 }
 
 

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

src/postProcessing/functionObjects/utilities/fluxSummary/fluxSummary.C

@@ -468,17 +468,17 @@ void Foam::fluxSummary::initialiseCellZoneAndDirection
             returnReduce(patch.nEdges(), sumOp<label>())
         );
 
-        label nCells = 0;
-        forAll(allFaceInfo, faceI)
-        {
-            if (allFaceInfo[faceI].region() == regionI)
-            {
-                nCells++;
-            }
-        }
-
         if (debug)
         {
+            label nCells = 0;
+            forAll(allFaceInfo, faceI)
+            {
+                if (allFaceInfo[faceI].region() == regionI)
+                {
+                    nCells++;
+                }
+            }
+
             Info<< "*** region:" << regionI
                 << "  found:" << returnReduce(nCells, sumOp<label>())
                 << " faces" << endl;

src/postProcessing/functionObjects/utilities/pressureTools/pressureTools.C

@@ -329,10 +329,7 @@ void Foam::pressureTools::execute()
 
 void Foam::pressureTools::end()
 {
-    if (active_)
-    {
-        execute();
-    }
+    // Do nothing
 }
 
 

src/postProcessing/functionObjects/utilities/scalarTransport/scalarTransport.C

@@ -328,10 +328,7 @@ void Foam::scalarTransport::execute()
 
 void Foam::scalarTransport::end()
 {
-    if (active_)
-    {
-        execute();
-    }
+    // Do nothing
 }
 
 

src/postProcessing/functionObjects/utilities/timeActivatedFileUpdate/timeActivatedFileUpdate.C

@@ -140,10 +140,7 @@ void Foam::timeActivatedFileUpdate::execute()
 
 void Foam::timeActivatedFileUpdate::end()
 {
-    if (active_)
-    {
-        execute();
-    }
+    // Do nothing
 }
 
 

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.
@@ -276,12 +276,7 @@ void Foam::turbulenceFields::execute()
 
 
 void Foam::turbulenceFields::end()
-{
-    if (active_)
-    {
-        execute();
-    }
-}
+{}
 
 
 void Foam::turbulenceFields::timeSet()

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-2015 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -136,10 +136,7 @@ void Foam::vorticity::execute()
 
 void Foam::vorticity::end()
 {
-    if (active_)
-    {
-        execute();
-    }
+    // Do nothing
 }
 
 

src/postProcessing/functionObjects/utilities/wallShearStress/wallShearStress.C

@@ -266,10 +266,7 @@ void Foam::wallShearStress::execute()
 
 void Foam::wallShearStress::end()
 {
-    if (active_)
-    {
-        execute();
-    }
+    // Do nothing
 }
 
 

src/postProcessing/functionObjects/utilities/yPlus/yPlus.C

@@ -202,10 +202,7 @@ void Foam::yPlus::execute()
 
 void Foam::yPlus::end()
 {
-    if (active_)
-    {
-        execute();
-    }
+    // Do nothing
 }