From 712fba33e3e4d915efc0d67d16299e2a98df3933 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Thu, 26 May 2016 15:32:31 +0100
Subject: [PATCH] functionObjects::Q: Result field named "Q" if the field is
 "U" otherwise "Q(<fieldName>)"

---
 .../functionObjects/field/Make/files             |  1 +
 src/postProcessing/functionObjects/field/Q/Q.C   | 16 ++++++++++++++--
 .../field/fieldExpression/fieldExpression.C      |  2 +-
 3 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/src/postProcessing/functionObjects/field/Make/files b/src/postProcessing/functionObjects/field/Make/files
index ad3b96e6e4..ee5a633491 100644
--- a/src/postProcessing/functionObjects/field/Make/files
+++ b/src/postProcessing/functionObjects/field/Make/files
@@ -34,6 +34,7 @@ histogram/histogram.C
 
 fieldExpression/fieldExpression.C
 components/components.C
+randomise/randomise.C
 div/div.C
 grad/grad.C
 mag/mag.C
diff --git a/src/postProcessing/functionObjects/field/Q/Q.C b/src/postProcessing/functionObjects/field/Q/Q.C
index b4fd7e48b1..be54432d90 100644
--- a/src/postProcessing/functionObjects/field/Q/Q.C
+++ b/src/postProcessing/functionObjects/field/Q/Q.C
@@ -77,8 +77,20 @@ Foam::functionObjects::Q::Q
     const dictionary& dict
 )
 :
-    fieldExpression(name, runTime, dict, "U", "Q")
-{}
+    fieldExpression(name, runTime, dict, "U")
+{
+    if (resultName_.empty())
+    {
+        if (fieldName_ != "U")
+        {
+            resultName_ = "Q(" + fieldName_ + ')';
+        }
+        else
+        {
+            resultName_ = 'Q';
+        }
+    }
+}
 
 
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
diff --git a/src/postProcessing/functionObjects/field/fieldExpression/fieldExpression.C b/src/postProcessing/functionObjects/field/fieldExpression/fieldExpression.C
index 61bc2c3417..2eb9331b6b 100644
--- a/src/postProcessing/functionObjects/field/fieldExpression/fieldExpression.C
+++ b/src/postProcessing/functionObjects/field/fieldExpression/fieldExpression.C
@@ -77,7 +77,7 @@ bool Foam::functionObjects::fieldExpression::read(const dictionary& dict)
 {
     fvMeshFunctionObject::read(dict);
 
-    if (fieldName_ == word::null || dict.found("field"))
+    if (fieldName_.empty() || dict.found("field"))
     {
         dict.lookup("field") >> fieldName_;
     }