From f99880cbeadeae48303da59563af5bd7ad851ec6 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Tue, 8 May 2018 09:51:15 +0200
Subject: [PATCH] ENH: add nodeValues option for ensightWrite function object
 (closes #734)

---
 .../utilities/ensightWrite/ensightWrite.C        | 16 +++++++++-------
 .../utilities/ensightWrite/ensightWrite.H        |  1 +
 .../ensightWrite/ensightWriteTemplates.C         |  5 +++--
 .../windAroundBuildings/system/ensightWrite      |  2 ++
 4 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/src/functionObjects/utilities/ensightWrite/ensightWrite.C b/src/functionObjects/utilities/ensightWrite/ensightWrite.C
index b286935733..3d65005a70 100644
--- a/src/functionObjects/utilities/ensightWrite/ensightWrite.C
+++ b/src/functionObjects/utilities/ensightWrite/ensightWrite.C
@@ -111,30 +111,32 @@ bool Foam::functionObjects::ensightWrite::read(const dictionary& dict)
 
     if (dict.found("patches"))
     {
-        wordRes lst(dict.lookup("patches"));
-        lst.uniq();
+        wordRes list(dict.lookup("patches"));
+        list.uniq();
 
-        writeOpts_.patchSelection(lst);
+        writeOpts_.patchSelection(list);
     }
 
     if (dict.found("faceZones"))
     {
-        wordRes lst(dict.lookup("faceZones"));
-        lst.uniq();
+        wordRes list(dict.lookup("faceZones"));
+        list.uniq();
 
-        writeOpts_.faceZoneSelection(lst);
+        writeOpts_.faceZoneSelection(list);
     }
 
 
     //
     // case options
     //
+
+    caseOpts_.nodeValues(dict.lookupOrDefault("nodeValues", false));
+
     caseOpts_.width(dict.lookupOrDefault<label>("width", 8));
 
     // remove existing output directory
     caseOpts_.overwrite(dict.lookupOrDefault("overwrite", false));
 
-
     //
     // other options
     //
diff --git a/src/functionObjects/utilities/ensightWrite/ensightWrite.H b/src/functionObjects/utilities/ensightWrite/ensightWrite.H
index 1c1b30c7f4..25954ea89c 100644
--- a/src/functionObjects/utilities/ensightWrite/ensightWrite.H
+++ b/src/functionObjects/utilities/ensightWrite/ensightWrite.H
@@ -66,6 +66,7 @@ Description
         patches      | Select patches to write      | no        |
         faceZones    | Select faceZones to write    | no        |
         consecutive  | Consecutive output numbering | no        | false
+        nodeValues   | Write values at nodes        | no        | false
     \endtable
 
     Note that if the \c patches entry is an empty list, this will select all
diff --git a/src/functionObjects/utilities/ensightWrite/ensightWriteTemplates.C b/src/functionObjects/utilities/ensightWrite/ensightWriteTemplates.C
index e9ff3a98eb..e68858f3fd 100644
--- a/src/functionObjects/utilities/ensightWrite/ensightWriteTemplates.C
+++ b/src/functionObjects/utilities/ensightWrite/ensightWriteTemplates.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2016 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2016-2018 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -49,7 +49,8 @@ int Foam::functionObjects::ensightWrite::writeVolField
     (
         lookupObject<VolFieldType>(inputName),
         ensMesh(),
-        os
+        os,
+        caseOpts_.nodeValues()
     );
 
     Log << " " << inputName;
diff --git a/tutorials/incompressible/simpleFoam/windAroundBuildings/system/ensightWrite b/tutorials/incompressible/simpleFoam/windAroundBuildings/system/ensightWrite
index 2345202b8e..238ba01963 100644
--- a/tutorials/incompressible/simpleFoam/windAroundBuildings/system/ensightWrite
+++ b/tutorials/incompressible/simpleFoam/windAroundBuildings/system/ensightWrite
@@ -7,6 +7,8 @@ ensightWrite
     libs    ("libutilityFunctionObjects.so");
     log     true;
 
+    nodeValues  true;
+
     // Fields to output (words or regex)
     fields  (U p "(k|epsilon|omega)");