From 1c941055744271a3f34f355e714406be35821214 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Mon, 11 Nov 2019 08:54:05 +0100
Subject: [PATCH 1/9] BUG: surfaceFieldValue interpolate on sampled surface
 fails (fixes #1488)

---
 .../fieldValues/surfaceFieldValue/surfaceFieldValueTemplates.C  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/functionObjects/field/fieldValues/surfaceFieldValue/surfaceFieldValueTemplates.C b/src/functionObjects/field/fieldValues/surfaceFieldValue/surfaceFieldValueTemplates.C
index 452c144bd2..005eab7897 100644
--- a/src/functionObjects/field/fieldValues/surfaceFieldValue/surfaceFieldValueTemplates.C
+++ b/src/functionObjects/field/fieldValues/surfaceFieldValue/surfaceFieldValueTemplates.C
@@ -100,7 +100,7 @@ Foam::functionObjects::fieldValues::surfaceFieldValue::getFieldValues
             {
                 const interpolationCellPoint<Type> interp(fld);
 
-                return sampledPtr_().sample(interp);
+                return sampledPtr_().interpolate(interp);
             }
             else
             {

From 3768773eb8ce53030f2c4ea9a4a01e344f389db1 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Sun, 10 Nov 2019 11:24:07 +0100
Subject: [PATCH 2/9] COMP: add version information to wmake

- wmake -version, --version option (alias for -show-api)
  for consistency with standard system tools
---
 wmake/wmake | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/wmake/wmake b/wmake/wmake
index 5dfed80bb8..da80a88016 100755
--- a/wmake/wmake
+++ b/wmake/wmake
@@ -88,6 +88,7 @@ options:
   -show-cxxflags    Print C++ compiler flags
   -show-cflags-arch     The C compiler arch flag (eg, -m64 etc)
   -show-cxxflags-arch   The C++ compiler arch flag (eg, -m64 etc)
+  -version | --version  Print the api value
   -h | -help        Print the usage
 
 
@@ -196,6 +197,11 @@ do
             update=true
             : ${all:=all}  # implies 'all', unless previous set to 'queue' etc.
             ;;
+        -version | --version)
+            $make -f $WM_DIR/makefiles/info api
+            optShow=true
+            break;
+            ;;
         --)
             shift
             break

From 148317ab68cda6d2d7c2264e80cb9d4e83538f7e Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Mon, 11 Nov 2019 09:08:27 +0100
Subject: [PATCH 3/9] CONFIG: bump patch level

---
 META-INFO/api-info | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/META-INFO/api-info b/META-INFO/api-info
index cd75aebfe1..c2fe52a76e 100644
--- a/META-INFO/api-info
+++ b/META-INFO/api-info
@@ -1,2 +1,2 @@
 api=1906
-patch=191103
+patch=191111

From b40d1d8e4f5ef08d0bf08ad3bea6799636b6de04 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Mon, 18 Nov 2019 16:59:51 +0100
Subject: [PATCH 4/9] BUG: decomposePar fails with csv table in binary (fixes
 #1498)

---
 .../primitives/functions/Function1/CSV/CSV.C  | 37 ++++++++++---------
 .../primitives/functions/Function1/CSV/CSV.H  | 13 ++-----
 .../RAS/chokedNozzle/system/controlDict       |  2 +-
 3 files changed, 23 insertions(+), 29 deletions(-)

diff --git a/src/OpenFOAM/primitives/functions/Function1/CSV/CSV.C b/src/OpenFOAM/primitives/functions/Function1/CSV/CSV.C
index a936bb6e7c..76739c02a2 100644
--- a/src/OpenFOAM/primitives/functions/Function1/CSV/CSV.C
+++ b/src/OpenFOAM/primitives/functions/Function1/CSV/CSV.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2017 OpenFOAM Foundation
-    Copyright (C) 2016-2017 OpenCFD Ltd.
+    Copyright (C) 2016-2019 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -28,7 +28,6 @@ License
 
 #include "CSV.H"
 #include "DynamicList.H"
-//#include "IFstream.H"
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
@@ -36,7 +35,7 @@ template<>
 Foam::label Foam::Function1Types::CSV<Foam::label>::readValue
 (
     const List<string>& splitted
-)
+) const
 {
     if (componentColumns_[0] >= splitted.size())
     {
@@ -54,7 +53,7 @@ template<>
 Foam::scalar Foam::Function1Types::CSV<Foam::scalar>::readValue
 (
     const List<string>& splitted
-)
+) const
 {
     if (componentColumns_[0] >= splitted.size())
     {
@@ -69,7 +68,10 @@ Foam::scalar Foam::Function1Types::CSV<Foam::scalar>::readValue
 
 
 template<class Type>
-Type Foam::Function1Types::CSV<Type>::readValue(const List<string>& splitted)
+Type Foam::Function1Types::CSV<Type>::readValue
+(
+    const List<string>& splitted
+) const
 {
     Type result;
 
@@ -94,7 +96,6 @@ template<class Type>
 void Foam::Function1Types::CSV<Type>::read()
 {
     fileName expandedFile(fName_);
-    //IFstream is(expandedFile.expand());
     autoPtr<ISstream> isPtr(fileHandler().NewIFstream(expandedFile.expand()));
     ISstream& is = isPtr();
 
@@ -214,17 +215,24 @@ Foam::Function1Types::CSV<Type>::CSV
     TableBase<Type>(entryName, dict),
     nHeaderLine_(dict.get<label>("nHeaderLine")),
     refColumn_(dict.get<label>("refColumn")),
-    componentColumns_(dict.lookup("componentColumns")),
-    separator_(dict.lookupOrDefault<string>("separator", ",")[0]),
+    componentColumns_(),
+    separator_(dict.getOrDefault<string>("separator", ",")[0]),
     mergeSeparators_(dict.get<bool>("mergeSeparators")),
     fName_(fName.empty() ? dict.get<fileName>("file") : fName)
 {
+    // Writing of "componentColumns" was forced to be ASCII,
+    // do the same when reading
+    ITstream& is = dict.lookup("componentColumns");
+    is.format(IOstream::ASCII);
+    is >> componentColumns_;
+    dict.checkITstream(is, "componentColumns");
+
     if (componentColumns_.size() != pTraits<Type>::nComponents)
     {
-        FatalErrorInFunction
+        FatalIOErrorInFunction(dict)
             << componentColumns_ << " does not have the expected length of "
-            << pTraits<Type>::nComponents << endl
-            << exit(FatalError);
+            << pTraits<Type>::nComponents << nl
+            << exit(FatalIOError);
     }
 
     read();
@@ -246,13 +254,6 @@ Foam::Function1Types::CSV<Type>::CSV(const CSV<Type>& csv)
 {}
 
 
-// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
-
-template<class Type>
-Foam::Function1Types::CSV<Type>::~CSV()
-{}
-
-
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class Type>
diff --git a/src/OpenFOAM/primitives/functions/Function1/CSV/CSV.H b/src/OpenFOAM/primitives/functions/Function1/CSV/CSV.H
index cce7ead5f7..19d93e036f 100644
--- a/src/OpenFOAM/primitives/functions/Function1/CSV/CSV.H
+++ b/src/OpenFOAM/primitives/functions/Function1/CSV/CSV.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2017 OpenFOAM Foundation
-    Copyright (C) 2017 OpenCFD Ltd.
+    Copyright (C) 2017-2019 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -105,7 +105,7 @@ class CSV
         void read();
 
         //- Read the next value from the splitted string
-        Type readValue(const List<string>&);
+        Type readValue(const List<string>& splitted) const;
 
         //- No copy assignment
         void operator=(const CSV<Type>&) = delete;
@@ -138,7 +138,7 @@ public:
 
 
     //- Destructor
-    virtual ~CSV();
+    virtual ~CSV() = default;
 
 
     // Member Functions
@@ -151,13 +151,6 @@ public:
 };
 
 
-template<>
-label CSV<label>::readValue(const List<string>& splitted);
-
-template<>
-Foam::scalar CSV<scalar>::readValue(const List<string>& splitted);
-
-
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace Function1Types
diff --git a/tutorials/combustion/reactingFoam/RAS/chokedNozzle/system/controlDict b/tutorials/combustion/reactingFoam/RAS/chokedNozzle/system/controlDict
index 26758a3ee3..8fb9c23759 100644
--- a/tutorials/combustion/reactingFoam/RAS/chokedNozzle/system/controlDict
+++ b/tutorials/combustion/reactingFoam/RAS/chokedNozzle/system/controlDict
@@ -33,7 +33,7 @@ writeInterval   0.02;
 
 purgeWrite      0;
 
-writeFormat     ascii;
+writeFormat     binary;
 
 writePrecision  10;
 

From 27956330ac0867352015720eb9e4bde00b1b1ac0 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Tue, 19 Nov 2019 06:58:38 +0100
Subject: [PATCH 5/9] COMP: declare template specialisation (gcc 4.8.5)

---
 src/OpenFOAM/primitives/functions/Function1/CSV/CSV.H | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/OpenFOAM/primitives/functions/Function1/CSV/CSV.H b/src/OpenFOAM/primitives/functions/Function1/CSV/CSV.H
index 19d93e036f..82fc5c9e05 100644
--- a/src/OpenFOAM/primitives/functions/Function1/CSV/CSV.H
+++ b/src/OpenFOAM/primitives/functions/Function1/CSV/CSV.H
@@ -151,6 +151,14 @@ public:
 };
 
 
+// Template specialisations
+template<>
+label CSV<label>::readValue(const List<string>& splitted) const;
+
+template<>
+Foam::scalar CSV<scalar>::readValue(const List<string>& splitted) const;
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace Function1Types

From 4ae61e621fefff7ef4b3b67ea2287b6b5b641859 Mon Sep 17 00:00:00 2001
From: Vaggelis Papoutsis <vaggelisp@gmail.com>
Date: Fri, 15 Nov 2019 20:17:56 +0200
Subject: [PATCH 6/9] BUG: adjointSolverName not set correctly in
 adjointWallVelocityLowRe (fixes #1502)

---
 .../adjointWallVelocityLowReFvPatchVectorField.C            | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/optimisation/adjointOptimisation/adjoint/adjointBoundaryConditions/adjointWallVelocityLowRe/adjointWallVelocityLowReFvPatchVectorField.C b/src/optimisation/adjointOptimisation/adjoint/adjointBoundaryConditions/adjointWallVelocityLowRe/adjointWallVelocityLowReFvPatchVectorField.C
index 2652f4b354..aacded67f8 100644
--- a/src/optimisation/adjointOptimisation/adjoint/adjointBoundaryConditions/adjointWallVelocityLowRe/adjointWallVelocityLowReFvPatchVectorField.C
+++ b/src/optimisation/adjointOptimisation/adjoint/adjointBoundaryConditions/adjointWallVelocityLowRe/adjointWallVelocityLowReFvPatchVectorField.C
@@ -41,7 +41,7 @@ adjointWallVelocityLowReFvPatchVectorField
 )
 :
     fixedValueFvPatchVectorField(p, iF),
-    adjointBoundaryCondition(p, iF, "Ua")
+    adjointBoundaryCondition(p, iF, word::null)
 {}
 
 
@@ -55,7 +55,7 @@ adjointWallVelocityLowReFvPatchVectorField
 )
 :
     fixedValueFvPatchVectorField(ptf, p, iF, mapper),
-    adjointBoundaryCondition(p, iF, "Ua")
+    adjointBoundaryCondition(p, iF, ptf.adjointSolverName_)
 {}
 
 
@@ -68,7 +68,7 @@ adjointWallVelocityLowReFvPatchVectorField
 )
 :
     fixedValueFvPatchVectorField(p, iF),
-    adjointBoundaryCondition(p, iF, "Ua")
+    adjointBoundaryCondition(p, iF, dict.get<word>("solverName"))
 {
     fvPatchField<vector>::operator=
     (

From 30033568980e28b4490c2d7036921ad222d1c862 Mon Sep 17 00:00:00 2001
From: Vaggelis Papoutsis <vaggelisp@gmail.com>
Date: Fri, 15 Nov 2019 19:43:25 +0200
Subject: [PATCH 7/9] BUG: RASModelVariables::SpalartAllmaras cannot be
 combined with an fvMotionSolver diffusivity which depends on wall distances
 (fixes #1501)

---
 .../RAS/SpalartAllmaras/SpalartAllmaras.C                      | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/optimisation/adjointOptimisation/adjoint/turbulenceModels/turbulenceModelVariables/RAS/SpalartAllmaras/SpalartAllmaras.C b/src/optimisation/adjointOptimisation/adjoint/turbulenceModels/turbulenceModelVariables/RAS/SpalartAllmaras/SpalartAllmaras.C
index cf498f0812..3f09ad7a56 100644
--- a/src/optimisation/adjointOptimisation/adjoint/turbulenceModels/turbulenceModelVariables/RAS/SpalartAllmaras/SpalartAllmaras.C
+++ b/src/optimisation/adjointOptimisation/adjoint/turbulenceModels/turbulenceModelVariables/RAS/SpalartAllmaras/SpalartAllmaras.C
@@ -28,6 +28,7 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "SpalartAllmaras.H"
+#include "wallDist.H"
 #include "addToRunTimeSelectionTable.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -77,7 +78,7 @@ SpalartAllmaras::SpalartAllmaras
     nutPtr_ = mesh_.getObjectPtr<volScalarField>("nut");
 
     hasDist_ = true;
-    dPtr_ = mesh_.getObjectPtr<volScalarField>("yWall");
+    dPtr_ = &(const_cast<volScalarField&>(wallDist::New(mesh_).y()));
 
     allocateInitValues();
     allocateMeanFields();

From efebc5db3fc4c68e626aacdf07632a1a11795703 Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Wed, 20 Nov 2019 13:57:57 +0000
Subject: [PATCH 8/9] BUG: arrarySet: incorrect index->location. Fixes #1506

---
 src/sampling/sampledSet/array/arraySet.C | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sampling/sampledSet/array/arraySet.C b/src/sampling/sampledSet/array/arraySet.C
index 5ba94416ab..ca408c105e 100644
--- a/src/sampling/sampledSet/array/arraySet.C
+++ b/src/sampling/sampledSet/array/arraySet.C
@@ -69,7 +69,7 @@ void Foam::arraySet::calcSamples
             for (label i=1; i<=pointsDensity_.x(); ++i)
             {
                 // Local Cartesian
-                point pt(i*dx*i , j*dy, k*dz);
+                point pt(i*dx, j*dy, k*dz);
 
                 // Global Cartesian
                 pt = csys_.globalPosition(pt);

From 29faf6da891a688b0efd6b0a95037bbe924af4e8 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Mon, 25 Nov 2019 15:37:00 +0100
Subject: [PATCH 9/9] BUG: ensightReadFile ignores binary string limits (#1511)

ENH: downgrade error on type-mismatch to a warning

- Ensight data files generated by OpenFOAM will start with the name of
  the data type (Eg, "scalar", "vector" etc), but this convention may
  fail for data files that have been generated elsewhere.
---
 .../ensight/read/ensightReadFile.C            |  34 ++++--
 .../readers/ensight/ensightSurfaceReader.C    | 100 ++++++++++--------
 .../ensight/ensightSurfaceReaderTemplates.C   |   9 +-
 3 files changed, 82 insertions(+), 61 deletions(-)

diff --git a/src/fileFormats/ensight/read/ensightReadFile.C b/src/fileFormats/ensight/read/ensightReadFile.C
index fa02ca5e12..22c7a2bae8 100644
--- a/src/fileFormats/ensight/read/ensightReadFile.C
+++ b/src/fileFormats/ensight/read/ensightReadFile.C
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2016 OpenCFD Ltd.
+    Copyright (C) 2016-2019 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -56,25 +56,37 @@ Foam::Istream& Foam::ensightReadFile::read(string& value)
 {
     if (format() == IOstream::BINARY)
     {
-        char buf[80];
+        auto& iss = stdStream();
 
-        read(reinterpret_cast<char*>(buf), sizeof(buf));
+        // Binary string is *exactly* 80 characters
+        value.resize(80, '\0');
+        iss.read(&value[0], 80);
 
-        string strBuf(value);
-
-        const size_t iEnd = strBuf.find('\0', 0);
-        if (iEnd == string::npos)
+        if (!iss)
         {
-            value = buf;
+            // Truncated - could also exit here, but no real advantage
+            value.erase(iss.gcount());
         }
-        else
+
+        // Truncate at the first embedded '\0'
+        auto endp = value.find('\0');
+
+        if (endp != std::string::npos)
         {
-            value = strBuf.substr(0, iEnd - 1);
+            value.erase(endp);
+        }
+
+        // May have been padded with trailing spaces - remove those
+        endp = value.find_last_not_of(" \t\f\v\n\r");
+
+        if (endp != std::string::npos)
+        {
+            value.erase(endp + 1);
         }
     }
     else
     {
-        value = "";
+        value.clear();
         while (value.empty() && !eof())
         {
             getLine(value);
diff --git a/src/sampling/sampledSurface/readers/ensight/ensightSurfaceReader.C b/src/sampling/sampledSurface/readers/ensight/ensightSurfaceReader.C
index 731a1409de..ce95050bfa 100644
--- a/src/sampling/sampledSurface/readers/ensight/ensightSurfaceReader.C
+++ b/src/sampling/sampledSurface/readers/ensight/ensightSurfaceReader.C
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2015-2016 OpenCFD Ltd.
+    Copyright (C) 2015-2019 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -101,23 +101,23 @@ void Foam::ensightSurfaceReader::readGeometryHeader(ensightReadFile& is) const
 
     // Ensight Geometry File
     is.read(buffer);
-    DebugInfo<< "buffer: " << buffer << nl;
+    DebugInfo<< "buffer [" << buffer.length() << "] " << buffer << nl;
 
     // Description - 1
     is.read(buffer);
-    DebugInfo<< "buffer: " << buffer << nl;
+    DebugInfo<< "buffer [" << buffer.length() << "] " << buffer << nl;
 
     // Node info
     is.read(buffer);
-    DebugInfo<< "buffer: " << buffer << nl;
+    DebugInfo<< "buffer [" << buffer.length() << "] " << buffer << nl;
 
     // Element info
     is.read(buffer);
-    DebugInfo<< "buffer: " << buffer << nl;
+    DebugInfo<< "buffer [" << buffer.length() << "] " << buffer << nl;
 
     // Part
     is.read(buffer);
-    DebugInfo<< "buffer: " << buffer << nl;
+    DebugInfo<< "buffer [" << buffer.length() << "] " << buffer << nl;
 
     // Part number
     label ibuffer;
@@ -126,11 +126,11 @@ void Foam::ensightSurfaceReader::readGeometryHeader(ensightReadFile& is) const
 
     // Description - 2
     is.read(buffer);
-    DebugInfo<< "buffer: " << buffer << nl;
+    DebugInfo<< "buffer [" << buffer.length() << "] " << buffer << nl;
 
     // Coordinates
     is.read(buffer);
-    DebugInfo<< "buffer: " << buffer << nl;
+    DebugInfo<< "buffer [" << buffer.length() << "] " << buffer << nl;
 }
 
 
@@ -280,29 +280,30 @@ const Foam::meshedSurface& Foam::ensightSurfaceReader::geometry()
 
         streamFormat_ = IOstream::BINARY;
         {
-            istream& is = isBinary.stdStream();
+            istream& iss = isBinary.stdStream();
 
-            char buffer[80];
-            is.read(buffer, 80);
+            // Binary string is *exactly* 80 characters
+            string buf(size_t(80), '\0');
+            iss.read(&buf[0], 80);
 
-            char test[80];
-            label nChar = 0;
-            for (label i = 0; i < 80; ++i)
+            if (!iss)
             {
-                if (buffer[i] == '\0')
-                {
-                    break;
-                }
-                test[i] = buffer[i];
-                nChar++;
+                // Truncated?
+                buf.erase(iss.gcount());
             }
 
-            string testStr(test, nChar);
+            // Truncate at the first embedded '\0'
+            const auto endp = buf.find('\0');
+            if (endp != std::string::npos)
+            {
+                buf.erase(endp);
+            }
 
+            // Contains "C Binary" ?
             if
             (
-                (testStr.find("binary", 0) == string::npos)
-             && (testStr.find("Binary", 0) == string::npos)
+                (buf.find("binary") == std::string::npos)
+             && (buf.find("Binary") == std::string::npos)
             )
             {
                 streamFormat_ = IOstream::ASCII;
@@ -354,8 +355,7 @@ const Foam::meshedSurface& Foam::ensightSurfaceReader::geometry()
         // Read faces - may be a mix of tris, quads and polys
         DynamicList<face> faces(ceil(nPoints/3));
         DynamicList<Tuple2<string, label>> schema(faces.size());
-        string faceType = "";
-        label nFace = 0;
+        string faceType;
         while (is.good()) // (is.peek() != EOF)
         {
             is.read(faceType);
@@ -365,20 +365,22 @@ const Foam::meshedSurface& Foam::ensightSurfaceReader::geometry()
                 break;
             }
 
-            DebugInfo
-                << "faceType: " << faceType << endl;
+            label nFace = 0;
 
             if (faceType == "tria3")
             {
                 is.read(nFace);
 
-                const label np = 3;
-                for (label faceI = 0; faceI < nFace; ++faceI)
+                DebugInfo
+                    << "faceType <" << faceType.c_str() << "> count: "
+                    << nFace << nl;
+
+                face f(3);
+                for (label facei = 0; facei < nFace; ++facei)
                 {
-                    face f(np);
-                    for (label fpI = 0; fpI < np; fpI++)
+                    for (label& fp : f)
                     {
-                        is.read(f[fpI]);
+                        is.read(fp);
                     }
 
                     faces.append(f);
@@ -388,13 +390,16 @@ const Foam::meshedSurface& Foam::ensightSurfaceReader::geometry()
             {
                 is.read(nFace);
 
-                const label np = 4;
-                for (label faceI = 0; faceI < nFace; ++faceI)
+                DebugInfo
+                    << "faceType <" << faceType.c_str() << "> count: "
+                    << nFace << nl;
+
+                face f(4);
+                for (label facei = 0; facei < nFace; ++facei)
                 {
-                    face f(np);
-                    for (label fpI = 0; fpI < np; fpI++)
+                    for (label& fp : f)
                     {
-                        is.read(f[fpI]);
+                        is.read(fp);
                     }
 
                     faces.append(f);
@@ -404,17 +409,21 @@ const Foam::meshedSurface& Foam::ensightSurfaceReader::geometry()
             {
                 is.read(nFace);
 
+                DebugInfo
+                    << "faceType <" << faceType.c_str() << "> count: "
+                    << nFace << nl;
+
                 labelList np(nFace);
-                for (label faceI = 0; faceI < nFace; ++faceI)
+                for (label facei = 0; facei < nFace; ++facei)
                 {
-                    is.read(np[faceI]);
+                    is.read(np[facei]);
                 }
-                for (label faceI = 0; faceI < nFace; ++faceI)
+                for (label facei = 0; facei < nFace; ++facei)
                 {
-                    face f(np[faceI]);
-                    for (label fpI = 0; fpI < f.size(); ++fpI)
+                    face f(np[facei]);
+                    for (label& fp : f)
                     {
-                        is.read(f[fpI]);
+                        is.read(fp);
                     }
 
                     faces.append(f);
@@ -425,11 +434,10 @@ const Foam::meshedSurface& Foam::ensightSurfaceReader::geometry()
                 if (debug)
                 {
                     WarningInFunction
-                        << "Unknown face type: " << faceType
-                        << ".  Aborting read and continuing with current "
+                        << "Unknown face type: <" << faceType.c_str()
+                        << ">. Stopping read and continuing with current "
                         << "elements only" << endl;
                 }
-
                 break;
             }
             schema.append(Tuple2<string, label>(faceType, nFace));
diff --git a/src/sampling/sampledSurface/readers/ensight/ensightSurfaceReaderTemplates.C b/src/sampling/sampledSurface/readers/ensight/ensightSurfaceReaderTemplates.C
index 73255d11f4..eb1a244ce8 100644
--- a/src/sampling/sampledSurface/readers/ensight/ensightSurfaceReaderTemplates.C
+++ b/src/sampling/sampledSurface/readers/ensight/ensightSurfaceReaderTemplates.C
@@ -113,10 +113,11 @@ Foam::tmp<Foam::Field<Type>> Foam::ensightSurfaceReader::readField
 
     if (primitiveType != pTraits<Type>::typeName)
     {
-        FatalIOErrorInFunction(is)
-            << "Expected " << pTraits<Type>::typeName << "values "
-            << "but found type " << primitiveType
-            << exit(FatalIOError);
+        IOWarningInFunction(is)
+            << "Expected '" << pTraits<Type>::typeName
+            << "' values but found type " << primitiveType << nl
+            << "    This may be okay, but could also indicate an error"
+            << nl << nl;
     }
 
     scalar value;