From 139faa3cf03f22ec5f0d149634b4909d01e880df Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Fri, 1 Jul 2016 14:45:18 +0100
Subject: [PATCH] vtkUnstructuredReader: corrected prism point ordering Patch
 contributed by Mattijs Janssens Resolves bug-report
 http://bugs.openfoam.org/view.php?id=1885

---
 src/fileFormats/vtk/vtkUnstructuredReader.C | 11 ++++-------
 src/fileFormats/vtk/vtkUnstructuredReader.H |  4 ++++
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/fileFormats/vtk/vtkUnstructuredReader.C b/src/fileFormats/vtk/vtkUnstructuredReader.C
index 017765eca5..3edf53ee3d 100644
--- a/src/fileFormats/vtk/vtkUnstructuredReader.C
+++ b/src/fileFormats/vtk/vtkUnstructuredReader.C
@@ -34,7 +34,7 @@ License
 
 namespace Foam
 {
-    defineTypeNameAndDebug(vtkUnstructuredReader, 1);   //0);
+    defineTypeNameAndDebug(vtkUnstructuredReader, 1);
 
     template<>
     const char*
@@ -97,7 +97,6 @@ void Foam::vtkUnstructuredReader::warnUnhandledType
 }
 
 
-// Split cellTypes into cells, faces and lines
 void Foam::vtkUnstructuredReader::extractCells
 (
     Istream& inFile,
@@ -302,11 +301,11 @@ void Foam::vtkUnstructuredReader::extractCells
                         << nRead << exit(FatalIOError);
                 }
                 prismPoints[0] = cellVertData[dataIndex++];
-                prismPoints[1] = cellVertData[dataIndex++];
                 prismPoints[2] = cellVertData[dataIndex++];
+                prismPoints[1] = cellVertData[dataIndex++];
                 prismPoints[3] = cellVertData[dataIndex++];
-                prismPoints[4] = cellVertData[dataIndex++];
                 prismPoints[5] = cellVertData[dataIndex++];
+                prismPoints[4] = cellVertData[dataIndex++];
                 cellMap_[celli] = i;
                 cells_[celli++] = cellShape(prism, prismPoints, true);
             }
@@ -356,7 +355,6 @@ void Foam::vtkUnstructuredReader::extractCells
 }
 
 
-// Read single field and stores it on the objectRegistry.
 void Foam::vtkUnstructuredReader::readField
 (
     ISstream& inFile,
@@ -434,6 +432,7 @@ void Foam::vtkUnstructuredReader::readField
             );
             // Consume current line.
             inFile.getLine(fieldVals()[0]);
+
             // Read without parsing
             forAll(fieldVals(), i)
             {
@@ -457,8 +456,6 @@ void Foam::vtkUnstructuredReader::readField
 }
 
 
-// Reads fields, stores them on the objectRegistry. Returns a list of
-// read fields
 Foam::wordList Foam::vtkUnstructuredReader::readFieldArray
 (
     ISstream& inFile,
diff --git a/src/fileFormats/vtk/vtkUnstructuredReader.H b/src/fileFormats/vtk/vtkUnstructuredReader.H
index 7ea0a4ae20..db2391bc3b 100644
--- a/src/fileFormats/vtk/vtkUnstructuredReader.H
+++ b/src/fileFormats/vtk/vtkUnstructuredReader.H
@@ -196,6 +196,7 @@ private:
             labelHashSet& warningGiven
         ) const;
 
+        //- Split cellTypes into cells, faces and lines
         void extractCells
         (
             Istream& inFile,
@@ -203,6 +204,7 @@ private:
             const labelList& cellVertData
         );
 
+        //- Read single field and stores it on the objectRegistry.
         void readField
         (
             ISstream& inFile,
@@ -212,6 +214,8 @@ private:
             const label size
         ) const;
 
+        //- Reads fields, stores them on the objectRegistry. Returns a list of
+        //  read fields
         wordList readFieldArray
         (
             ISstream& inFile,