From a956e0f73ac7c706be1e04f7eb8261a2565c52e8 Mon Sep 17 00:00:00 2001
From: Andrew Heather <a.heather@opencfd.co.uk>
Date: Fri, 16 Dec 2016 14:25:58 +0000
Subject: [PATCH] ENH: blendingFactor function object - always include field
 name in result name

---
 .../field/blendingFactor/blendingFactor.C     | 38 ++++++++++---------
 1 file changed, 21 insertions(+), 17 deletions(-)

diff --git a/src/functionObjects/field/blendingFactor/blendingFactor.C b/src/functionObjects/field/blendingFactor/blendingFactor.C
index f46374f29c..de66522a2f 100644
--- a/src/functionObjects/field/blendingFactor/blendingFactor.C
+++ b/src/functionObjects/field/blendingFactor/blendingFactor.C
@@ -79,7 +79,7 @@ Foam::functionObjects::blendingFactor::blendingFactor
 {
     read(dict);
     writeFileHeader(file());
-    setResultName(typeName, fieldName_);
+    setResultName(typeName, "");
 
     tmp<volScalarField> indicatorPtr
     (
@@ -113,24 +113,28 @@ Foam::functionObjects::blendingFactor::~blendingFactor()
 
 bool Foam::functionObjects::blendingFactor::read(const dictionary& dict)
 {
-    fieldExpression::read(dict);
-    writeFile::read(dict);
-
-    phiName_ = dict.lookupOrDefault<word>("phi", "phi");
-
-    tolerance_ = 0.001;
-    if
-    (
-        dict.readIfPresent("tolerance", tolerance_)
-     && (tolerance_ < 0 || tolerance_ > 1)
-    )
+    if (fieldExpression::read(dict) && writeFile::read(dict))
     {
-        FatalErrorInFunction
-            << "tolerance must be in the range 0 to 1.  Supplied value: "
-            << tolerance_ << exit(FatalError);
-    }
+        phiName_ = dict.lookupOrDefault<word>("phi", "phi");
 
-    return true;
+        tolerance_ = 0.001;
+        if
+        (
+            dict.readIfPresent("tolerance", tolerance_)
+         && (tolerance_ < 0 || tolerance_ > 1)
+        )
+        {
+            FatalErrorInFunction
+                << "tolerance must be in the range 0 to 1.  Supplied value: "
+                << tolerance_ << exit(FatalError);
+        }
+
+        return true;
+    }
+    else
+    {
+        return false;
+    }
 }