functionObjects::Q: Result field named "Q" if the field is "U" otherwise "Q(<fieldName>)"

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

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  * * * * * * * * * * * * * * * //

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_;
     }