From 7bf7aaea915c530f41876d7589cf037a65df014c Mon Sep 17 00:00:00 2001
From: sergio <sergio>
Date: Tue, 19 Jun 2018 12:04:27 -0700
Subject: [PATCH] ENH: Further enhancements to stabilizationSchemes

---
 .../stabilityBlendingFactor.C                 | 87 +++++++++++--------
 .../stabilityBlendingFactor.H                 |  3 +
 .../motorBike/system/stabilizationSchemes     |  1 -
 3 files changed, 56 insertions(+), 35 deletions(-)

diff --git a/src/functionObjects/field/stabilityBlendingFactor/stabilityBlendingFactor.C b/src/functionObjects/field/stabilityBlendingFactor/stabilityBlendingFactor.C
index d7c660adf0..12b05143bc 100644
--- a/src/functionObjects/field/stabilityBlendingFactor/stabilityBlendingFactor.C
+++ b/src/functionObjects/field/stabilityBlendingFactor/stabilityBlendingFactor.C
@@ -48,6 +48,37 @@ namespace functionObjects
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
+void Foam::functionObjects::stabilityBlendingFactor::calcStats
+(
+    label& nCellsScheme1,
+    label& nCellsScheme2,
+    label& nCellsBlended
+) const
+{
+    forAll(indicator_, celli)
+    {
+        scalar i = indicator_[celli];
+
+        if (i < tolerance_)
+        {
+            nCellsScheme2++;
+        }
+        else if (i > (1 - tolerance_))
+        {
+            nCellsScheme1++;
+        }
+        else
+        {
+            nCellsBlended++;
+        }
+    }
+
+    reduce(nCellsScheme1, sumOp<label>());
+    reduce(nCellsScheme2, sumOp<label>());
+    reduce(nCellsBlended, sumOp<label>());
+}
+
+
 void Foam::functionObjects::stabilityBlendingFactor::writeFileHeader
 (
     Ostream& os
@@ -370,6 +401,21 @@ bool Foam::functionObjects::stabilityBlendingFactor::init(bool first)
         Log << nl;
     }
 
+    if (log)
+    {
+        label nCellsScheme1 = 0;
+        label nCellsScheme2 = 0;
+        label nCellsBlended = 0;
+
+        calcStats(nCellsScheme1, nCellsScheme2, nCellsBlended);
+
+        Log << nl << type() << " execute :" << nl
+        << "    scheme 1 cells :  " << nCellsScheme1 << nl
+        << "    scheme 2 cells :  " << nCellsScheme2 << nl
+        << "    blended cells  :  " << nCellsBlended << nl
+        << endl;
+    }
+
     indicator_.correctBoundaryConditions();
     indicator_.min(1.0);
     indicator_.max(0.0);
@@ -689,41 +735,15 @@ bool Foam::functionObjects::stabilityBlendingFactor::read
 
 bool Foam::functionObjects::stabilityBlendingFactor::write()
 {
-    // Generate scheme statistics
-    label nCellsScheme1 = 0;
-    label nCellsScheme2 = 0;
-    label nCellsBlended = 0;
-    forAll(indicator_, celli)
-    {
-        scalar i = indicator_[celli];
-
-        if (i < tolerance_)
-        {
-            nCellsScheme2++;
-        }
-        else if (i > (1 - tolerance_))
-        {
-            nCellsScheme1++;
-        }
-        else
-        {
-            nCellsBlended++;
-        }
-    }
-
-    reduce(nCellsScheme1, sumOp<label>());
-    reduce(nCellsScheme2, sumOp<label>());
-    reduce(nCellsBlended, sumOp<label>());
-
-    Log << nl << type() << " execute :" << nl
-        << "    scheme 1 cells :  " << nCellsScheme1 << nl
-        << "    scheme 2 cells :  " << nCellsScheme2 << nl
-        << "    blended cells  :  " << nCellsBlended << nl
-        << endl;
-
-
     if (writeToFile_)
     {
+
+        label nCellsScheme1 = 0;
+        label nCellsScheme2 = 0;
+        label nCellsBlended = 0;
+
+        calcStats(nCellsScheme1, nCellsScheme2, nCellsBlended);
+
         writeTime(file());
 
         file()
@@ -736,5 +756,4 @@ bool Foam::functionObjects::stabilityBlendingFactor::write()
     return true;
 }
 
-
 // ************************************************************************* //
diff --git a/src/functionObjects/field/stabilityBlendingFactor/stabilityBlendingFactor.H b/src/functionObjects/field/stabilityBlendingFactor/stabilityBlendingFactor.H
index 915f13affb..98776a4d2a 100644
--- a/src/functionObjects/field/stabilityBlendingFactor/stabilityBlendingFactor.H
+++ b/src/functionObjects/field/stabilityBlendingFactor/stabilityBlendingFactor.H
@@ -424,6 +424,9 @@ class stabilityBlendingFactor
         //- Init fields
         bool init(bool first);
 
+        //- Calculate statistics
+        void calcStats(label&, label&, label&) const ;
+
         //- Calculate the blending factor field and return true if successful
         virtual bool calc();
 
diff --git a/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/system/stabilizationSchemes b/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/system/stabilizationSchemes
index 7c79baebed..896ed2c213 100644
--- a/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/system/stabilizationSchemes
+++ b/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/system/stabilizationSchemes
@@ -22,7 +22,6 @@ blendingFactor
     log                 true;
     writeToFile         false;
 
-
     switchNonOrtho      yes;
     switchGradCc        no;
     switchResiduals     yes;