From 7e8fb96d33bbc87cd4a46e600c8e5e53c81ff3a9 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Tue, 3 Dec 2019 07:56:27 +0100
Subject: [PATCH] STYLE: output consistency for exprResult entry

---
 src/OpenFOAM/expressions/exprResult/exprResultI.H | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/OpenFOAM/expressions/exprResult/exprResultI.H b/src/OpenFOAM/expressions/exprResult/exprResultI.H
index 5fd9fcf216..4ea9e03bea 100644
--- a/src/OpenFOAM/expressions/exprResult/exprResultI.H
+++ b/src/OpenFOAM/expressions/exprResult/exprResultI.H
@@ -546,12 +546,16 @@ bool Foam::expressions::exprResult::writeEntryChecked
         {
             const Type& val = single_.get<Type>();
 
-            os  << "uniform " << val
+            if (keyword.size())
+            {
+                os.writeKeyword(keyword);
+            }
+            os  << word("uniform") << token::SPACE << val
                 << token::END_STATEMENT << nl;
         }
         else
         {
-            // Zero-sized
+            // Zero-sized - written as nonuniform
             const Field<Type> fld;
             fld.writeEntry(keyword, os);
         }
@@ -562,7 +566,11 @@ bool Foam::expressions::exprResult::writeEntryChecked
 
         if (isUniform_ && is_contiguous<Type>::value)
         {
-            os  << "uniform " << fld.first()
+            if (keyword.size())
+            {
+                os.writeKeyword(keyword);
+            }
+            os  << word("uniform") << token::SPACE << fld.first()
                 << token::END_STATEMENT << nl;
         }
         else