From e6937f60de43d1177dcf23ae444d43f737b7da0a Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Mon, 11 Feb 2019 16:03:10 +0100
Subject: [PATCH] ENH: add Ensight output support for a labelField (treat like
 scalarField)

---
 src/fileFormats/ensight/file/ensightFile.C    | 17 +++++++++++++----
 src/fileFormats/ensight/file/ensightFile.H    |  3 +++
 src/fileFormats/ensight/type/ensightPTraits.C | 13 +++++++++++--
 src/fileFormats/ensight/type/ensightPTraits.H | 11 ++++++++++-
 4 files changed, 37 insertions(+), 7 deletions(-)

diff --git a/src/fileFormats/ensight/file/ensightFile.C b/src/fileFormats/ensight/file/ensightFile.C
index 06aa44c1a9..5163cc0942 100644
--- a/src/fileFormats/ensight/file/ensightFile.C
+++ b/src/fileFormats/ensight/file/ensightFile.C
@@ -326,10 +326,17 @@ void Foam::ensightFile::beginParticleCoordinates(const label nparticles)
 }
 
 
-void Foam::ensightFile::writeList
-(
-    const UList<scalar>& field
-)
+void Foam::ensightFile::writeList(const UList<label>& field)
+{
+    for (const label val : field)
+    {
+        write(scalar(val));
+        newline();
+    }
+}
+
+
+void Foam::ensightFile::writeList(const UList<scalar>& field)
 {
     for (const scalar& val : field)
     {
@@ -347,6 +354,7 @@ void Foam::ensightFile::writeList
 }
 
 
+
 void Foam::ensightFile::writeList
 (
     const UList<scalar>& field,
@@ -368,4 +376,5 @@ void Foam::ensightFile::writeList
     }
 }
 
+
 // ************************************************************************* //
diff --git a/src/fileFormats/ensight/file/ensightFile.H b/src/fileFormats/ensight/file/ensightFile.H
index 9d97ef0cca..c9e837377b 100644
--- a/src/fileFormats/ensight/file/ensightFile.H
+++ b/src/fileFormats/ensight/file/ensightFile.H
@@ -191,6 +191,9 @@ public:
         //- Begin a "particle coordinates" block (measured data)
         void beginParticleCoordinates(const label nparticles);
 
+        //- Write a list of integers as float values
+        void writeList(const UList<label>& field);
+
         //- Write a list of floats as "%12.5e" or as binary
         //  With carriage return after each value (ascii stream)
         void writeList(const UList<scalar>& field);
diff --git a/src/fileFormats/ensight/type/ensightPTraits.C b/src/fileFormats/ensight/type/ensightPTraits.C
index 9c1f493240..2a8e20c96d 100644
--- a/src/fileFormats/ensight/type/ensightPTraits.C
+++ b/src/fileFormats/ensight/type/ensightPTraits.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           |
+    \\  /    A nd           | Copyright (C) 2019 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
                             | Copyright (C) 2013-2015 OpenFOAM Foundation
@@ -29,6 +29,15 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
+template<>
+const char* const
+Foam::ensightPTraits<Foam::label>::typeName = "scalar";
+
+template<>
+const Foam::direction
+Foam::ensightPTraits<Foam::label>::componentOrder[] = {0};
+
+
 template<>
 const char* const
 Foam::ensightPTraits<Foam::scalar>::typeName = "scalar";
@@ -47,7 +56,7 @@ const Foam::direction
 Foam::ensightPTraits<Foam::vector>::componentOrder[] = {0, 1, 2};
 
 
-// use mag(sphericalTensor) instead
+// Use mag(sphericalTensor) instead
 template<>
 const char* const
 Foam::ensightPTraits<Foam::sphericalTensor>::typeName = "scalar";
diff --git a/src/fileFormats/ensight/type/ensightPTraits.H b/src/fileFormats/ensight/type/ensightPTraits.H
index 5f6f5ce7f1..d7e71df51e 100644
--- a/src/fileFormats/ensight/type/ensightPTraits.H
+++ b/src/fileFormats/ensight/type/ensightPTraits.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           |
+    \\  /    A nd           | Copyright (C) 2019 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
                             | Copyright (C) 2013-2015 OpenFOAM Foundation
@@ -29,6 +29,9 @@ Class
 Description
     Conversion of OpenFOAM pTraits into the Ensight equivalent
 
+    For the purpose of traits, integers (label) are treated like
+    floating point (scalar). Spherical tensors are mapped as a scalar.
+
 \*---------------------------------------------------------------------------*/
 
 #ifndef ensightPTraits_H
@@ -62,6 +65,12 @@ public:
         static const direction componentOrder[];
 };
 
+template<>
+const char* const ensightPTraits<label>::typeName;
+
+template<>
+const direction ensightPTraits<label>::componentOrder[];
+
 template<>
 const char* const ensightPTraits<scalar>::typeName;