From 722ce91ae08d536d23c436794d13ae0902e0f7e3 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Wed, 23 Jan 2019 22:55:50 +0100
Subject: [PATCH] STYLE: combine if (log) ... Log statements

---
 .../stabilityBlendingFactor.C                 |  7 ++--
 .../lagrangian/dataCloud/dataCloud.C          |  2 +-
 .../lagrangian/dsmcFields/dsmcFields.C        | 34 +++++++++----------
 .../lagrangian/vtkCloud/vtkCloud.C            |  2 +-
 4 files changed, 20 insertions(+), 25 deletions(-)

diff --git a/src/functionObjects/field/stabilityBlendingFactor/stabilityBlendingFactor.C b/src/functionObjects/field/stabilityBlendingFactor/stabilityBlendingFactor.C
index 6d9f334fe3..c073821fc5 100644
--- a/src/functionObjects/field/stabilityBlendingFactor/stabilityBlendingFactor.C
+++ b/src/functionObjects/field/stabilityBlendingFactor/stabilityBlendingFactor.C
@@ -123,11 +123,8 @@ bool Foam::functionObjects::stabilityBlendingFactor::init(bool first)
         {
             scalar meanRes = gAverage(mag(*residualPtr)) + VSMALL;
 
-            if (log)
-            {
-                Log << nl << name() << " : " << nl;
-                Log << "    Average(mag(residuals)) :  " << meanRes << endl;
-            }
+            Log << nl << name() << " : " << nl
+                << "    Average(mag(residuals)) :  " << meanRes << endl;
 
             oldError_ = error_;
             oldErrorIntegral_ = errorIntegral_;
diff --git a/src/functionObjects/lagrangian/dataCloud/dataCloud.C b/src/functionObjects/lagrangian/dataCloud/dataCloud.C
index f7327c9165..005c5d0889 100644
--- a/src/functionObjects/lagrangian/dataCloud/dataCloud.C
+++ b/src/functionObjects/lagrangian/dataCloud/dataCloud.C
@@ -89,7 +89,7 @@ bool Foam::functionObjects::dataCloud::writeCloud
     // Total number of parcels on all processes
     const label nTotParcels = returnReduce(nParcels, sumOp<label>());
 
-    if (applyFilter_ && log)
+    if (applyFilter_)
     {
         // Report filtered/unfiltered count
         Log << "After filtering using " << nTotParcels << '/'
diff --git a/src/functionObjects/lagrangian/dsmcFields/dsmcFields.C b/src/functionObjects/lagrangian/dsmcFields/dsmcFields.C
index b2b97c6c1d..62e7c626e5 100644
--- a/src/functionObjects/lagrangian/dsmcFields/dsmcFields.C
+++ b/src/functionObjects/lagrangian/dsmcFields/dsmcFields.C
@@ -203,28 +203,26 @@ bool Foam::functionObjects::dsmcFields::write()
             }
         }
 
-        if (log)
-        {
-            Log << "    mag(UMean) max/min : "
-                << max(mag(UMean)).value() << " "
-                << min(mag(UMean)).value() << endl;
 
-            Log << "    translationalT max/min : "
-                << max(translationalT).value() << " "
-                << min(translationalT).value() << endl;
+        Log << "    mag(UMean) max/min : "
+            << max(mag(UMean)).value() << " "
+            << min(mag(UMean)).value() << nl
 
-            Log << "    internalT max/min : "
-                << max(internalT).value() << " "
-                << min(internalT).value() << endl;
+            << "    translationalT max/min : "
+            << max(translationalT).value() << " "
+            << min(translationalT).value() << nl
 
-            Log << "    overallT max/min : "
-                << max(overallT).value() << " "
-                << min(overallT).value() << endl;
+            << "    internalT max/min : "
+            << max(internalT).value() << " "
+            << min(internalT).value() << nl
 
-            Log << "    p max/min : "
-                << max(p).value() << " "
-                << min(p).value() << endl;
-        }
+            << "    overallT max/min : "
+            << max(overallT).value() << " "
+            << min(overallT).value() << nl
+
+            << "    p max/min : "
+            << max(p).value() << " "
+            << min(p).value() << endl;
 
         UMean.write();
 
diff --git a/src/functionObjects/lagrangian/vtkCloud/vtkCloud.C b/src/functionObjects/lagrangian/vtkCloud/vtkCloud.C
index 40887680c3..6fdb41b00b 100644
--- a/src/functionObjects/lagrangian/vtkCloud/vtkCloud.C
+++ b/src/functionObjects/lagrangian/vtkCloud/vtkCloud.C
@@ -142,7 +142,7 @@ bool Foam::functionObjects::vtkCloud::writeCloud
     // Total number of parcels on all processes
     const label nTotParcels = returnReduce(nParcels, sumOp<label>());
 
-    if (applyFilter_ && log)
+    if (applyFilter_)
     {
         // Report filtered/unfiltered count
         Log << "After filtering using " << nTotParcels << '/'