From 12353e71e7b99585bc88c6667683b897814e1615 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Fri, 12 May 2017 15:35:08 +0200
Subject: [PATCH 01/27] ENH: provide OpenFOAM/VTK low-level transcription
 routines

- Zero-copy does not work for several reasons, but this uses the
  OpenFOAM structures to write VTK-compatible formats into external
  arrays.
---
 src/conversion/Make/files                     |   2 +
 src/conversion/vtk/output/foamVtkOutput.H     |  29 +-
 .../vtk/output/foamVtkOutputTemplates.C       |  29 +-
 src/conversion/vtk/part/foamVtkCells.C        | 657 +++--------------
 src/conversion/vtk/part/foamVtkCells.H        | 302 +++-----
 src/conversion/vtk/part/foamVtkCellsI.H       | 191 +----
 src/conversion/vtk/part/foamVtkMeshMaps.C     |  44 ++
 src/conversion/vtk/part/foamVtkMeshMaps.H     | 139 ++++
 src/conversion/vtk/part/foamVtkMeshMapsI.H    |  96 +++
 src/conversion/vtk/part/foamVtuSizing.C       | 578 +++++++++++++++
 src/conversion/vtk/part/foamVtuSizing.H       | 408 +++++++++++
 src/conversion/vtk/part/foamVtuSizingI.H      | 135 ++++
 .../vtk/part/foamVtuSizingTemplates.C         | 670 ++++++++++++++++++
 13 files changed, 2311 insertions(+), 969 deletions(-)
 create mode 100644 src/conversion/vtk/part/foamVtkMeshMaps.C
 create mode 100644 src/conversion/vtk/part/foamVtkMeshMaps.H
 create mode 100644 src/conversion/vtk/part/foamVtkMeshMapsI.H
 create mode 100644 src/conversion/vtk/part/foamVtuSizing.C
 create mode 100644 src/conversion/vtk/part/foamVtuSizing.H
 create mode 100644 src/conversion/vtk/part/foamVtuSizingI.H
 create mode 100644 src/conversion/vtk/part/foamVtuSizingTemplates.C

diff --git a/src/conversion/Make/files b/src/conversion/Make/files
index 3f2c0a0c98..bc77df3454 100644
--- a/src/conversion/Make/files
+++ b/src/conversion/Make/files
@@ -25,6 +25,8 @@ starcd/STARCDMeshWriter.C
 polyDualMesh/polyDualMesh.C
 
 vtk/part/foamVtkCells.C
+vtk/part/foamVtkMeshMaps.C
+vtk/part/foamVtuSizing.C
 vtk/output/foamVtkOutput.C
 
 LIB = $(FOAM_LIBBIN)/libconversion
diff --git a/src/conversion/vtk/output/foamVtkOutput.H b/src/conversion/vtk/output/foamVtkOutput.H
index f0897d6675..b1cbfb2438 100644
--- a/src/conversion/vtk/output/foamVtkOutput.H
+++ b/src/conversion/vtk/output/foamVtkOutput.H
@@ -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-2107 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -80,7 +80,7 @@ public:
 
         //- Write a value component-wise.
         template<class Type>
-        inline static void write(foamVtkFormatter&, const Type&);
+        inline static void write(foamVtkFormatter& fmt, const Type& val);
 
 
         //- Write a list of values.
@@ -88,8 +88,8 @@ public:
         template<class Type>
         static void writeList
         (
-            foamVtkFormatter&,
-            const UList<Type>&
+            foamVtkFormatter& fmt,
+            const UList<Type>& lst
         );
 
 
@@ -98,20 +98,29 @@ public:
         template<class Type>
         static void writeList
         (
-            foamVtkFormatter&,
-            const UList<Type>&,
+            foamVtkFormatter& fmt,
+            const UList<Type>& lst,
             const UList<label>& addressing
         );
 
 
-        //- Write volField with cell values (including decomposed cells).
+        //- Write internalField for mesh
         //  The output includes the payload size and flush.
         template<class Type>
         static void writeField
         (
-            foamVtkFormatter&,
-            const GeometricField<Type, fvPatchField, volMesh>&,
-            const UList<label>& superCells
+            foamVtkFormatter& fmt,
+            const GeometricField<Type, fvPatchField, volMesh>& vf
+        );
+
+        //- Write internalField based on the cellMap
+        //  The output includes the payload size and flush.
+        template<class Type>
+        static void writeField
+        (
+            foamVtkFormatter& fmt,
+            const GeometricField<Type, fvPatchField, volMesh>& vf,
+            const UList<label>& cellMap
         );
 
 };
diff --git a/src/conversion/vtk/output/foamVtkOutputTemplates.C b/src/conversion/vtk/output/foamVtkOutputTemplates.C
index 03c2d56bd9..a05fd4bb0f 100644
--- a/src/conversion/vtk/output/foamVtkOutputTemplates.C
+++ b/src/conversion/vtk/output/foamVtkOutputTemplates.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-2107 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -73,19 +73,36 @@ template<class Type>
 void Foam::foamVtkOutput::writeField
 (
     foamVtkFormatter& fmt,
-    const GeometricField<Type, fvPatchField, volMesh>& vf,
-    const UList<label>& superCells
+    const GeometricField<Type, fvPatchField, volMesh>& vf
 )
 {
     const uint64_t payLoad =
     (
-        (vf.size() + superCells.size())
-      * pTraits<Type>::nComponents * sizeof(float)
+        vf.size() * pTraits<Type>::nComponents * sizeof(float)
     );
 
     fmt.writeSize(payLoad);
     writeList(fmt, vf.internalField());
-    writeList(fmt, vf, superCells);
+
+    fmt.flush();
+}
+
+
+template<class Type>
+void Foam::foamVtkOutput::writeField
+(
+    foamVtkFormatter& fmt,
+    const GeometricField<Type, fvPatchField, volMesh>& vf,
+    const UList<label>& cellMap
+)
+{
+    const uint64_t payLoad =
+    (
+        cellMap.size() * pTraits<Type>::nComponents * sizeof(float)
+    );
+
+    fmt.writeSize(payLoad);
+    writeList(fmt, vf.internalField(), cellMap);
 
     fmt.flush();
 }
diff --git a/src/conversion/vtk/part/foamVtkCells.C b/src/conversion/vtk/part/foamVtkCells.C
index 5846c8442d..b80ae51176 100644
--- a/src/conversion/vtk/part/foamVtkCells.C
+++ b/src/conversion/vtk/part/foamVtkCells.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2016-2017 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -25,624 +25,133 @@ License
 
 #include "foamVtkCells.H"
 #include "polyMesh.H"
-#include "cellShape.H"
-#include "cellModeller.H"
-
-// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
-
-void Foam::foamVtkCells::correct()
-{
-    // Clear derived data
-    // clearGeom();
-
-    const cellModel& tet      = *(cellModeller::lookup("tet"));
-    const cellModel& pyr      = *(cellModeller::lookup("pyr"));
-    const cellModel& prism    = *(cellModeller::lookup("prism"));
-    const cellModel& wedge    = *(cellModeller::lookup("wedge"));
-    const cellModel& tetWedge = *(cellModeller::lookup("tetWedge"));
-    const cellModel& hex      = *(cellModeller::lookup("hex"));
-
-    const cellShapeList& cellShapes = mesh_.cellShapes();
-
-    // face owner is needed to determine the face orientation
-    const labelList& owner = mesh_.faceOwner();
-
-    // Unique vertex labels per polyhedral
-    HashSet<label> hashUniqId(2*256);
-
-    // =======================
-    // PASS 1: Determine sizes
-
-    label nVertLabels = 0;
-    label nFaceLabels = 0;
-    label nAddPoints  = 0;
-    label nAddCells   = 0;
-    label nAddVerts   = 0;
-
-    forAll(cellShapes, cellI)
-    {
-        const cellShape& shape = cellShapes[cellI];
-        const cellModel& model = shape.model();
-
-        if
-        (
-            model == tet
-         || model == pyr
-         || model == prism
-         || model == hex
-        )
-        {
-            // normal primitives
-            nVertLabels += shape.size();
-        }
-        else if (model == tetWedge && decompose_.requested())
-        {
-            // Treat as squeezed prism (VTK_WEDGE)
-            nVertLabels += 6;
-        }
-        else if (model == wedge && decompose_.requested())
-        {
-            // Treat as squeezed hex
-            nVertLabels += 8;
-        }
-        else if (decompose_.requested())
-        {
-            // Polyhedral: Decompose into tets + pyramids.
-
-            // Count vertices in first decomposed cell
-            bool first = true;
-
-            const cell& cFaces = mesh_.cells()[cellI];
-            forAll(cFaces, cFaceI)
-            {
-                const face& f = mesh_.faces()[cFaces[cFaceI]];
-
-                // Face decomposed into triangles and quads
-                // Tri -> Tet, Quad -> Pyr
-                label nTria = 0, nQuad = 0;
-                f.nTrianglesQuads(mesh_.points(), nTria, nQuad);
-
-                nAddCells  += nTria + nQuad;
-                nAddVerts  += (nTria * 4) + (nQuad * 5);
-
-                if (first)
-                {
-                    const label nvrt = (nQuad ? 5 : 4);
-                    nAddCells--;
-                    nAddVerts   -= nvrt;
-                    nVertLabels += nvrt;
-
-                    first = false;
-                }
-            }
-
-            ++nAddPoints;
-        }
-        else
-        {
-            // Polyhedral: Not decomposed.
-
-            const labelList& cFaces = mesh_.cells()[cellI];
-
-            // establish unique node ids used (only needed for XML)
-            hashUniqId.clear();
-
-            // determing sizing for face stream
-            // number of faces, size of each face, vertices per face
-            // [nFaces, nFace0Pts, id1, id2, ..., nFace1Pts, id1, id2, ...]
-
-            forAll(cFaces, cFaceI)
-            {
-                const face& f = mesh_.faces()[cFaces[cFaceI]];
-                nFaceLabels += f.size();
-
-                forAll(f, fp)
-                {
-                    hashUniqId.insert(f[fp]);
-                }
-            }
-
-            nVertLabels += hashUniqId.size();
-            nFaceLabels += 1 + cFaces.size();
-        }
-    }
-
-
-    //
-    // adjust/reserve sizes
-    //
-
-    // Cell types (including added cells) in vtk numbering
-    cellTypes_.setSize(cellShapes.size() + nAddCells);
-
-    // List of vertex labels in VTK ordering
-    vertLabels_.setSize(nVertLabels + nAddVerts);
-
-    vertOffset_.setSize(cellShapes.size() + nAddCells);
-
-    faceLabels_.clear();
-    faceOffset_.clear();
-    if (nFaceLabels)
-    {
-        faceLabels_.setSize(nFaceLabels);
-
-        // only need nCells (without nAddCells)
-        // set to -1 (primitive)
-        faceOffset_.setSize(cellShapes.size(), -1);
-    }
-
-    if (decompose_.requested())
-    {
-        decompose_.addPointCellLabels_.setSize(nAddPoints);
-        decompose_.superCells_.setSize(nAddCells);
-    }
-
-
-    // ======================
-    // PASS 2: Fill in arrays
-
-    // Need this offset later, but only for decomposed polys
-    const label offsetAddVerts = nVertLabels;
-
-    // Reset counters
-    nVertLabels = 0;
-    nFaceLabels = 0;
-    nAddPoints  = 0;
-    nAddCells   = 0;
-    nAddVerts   = 0;
-
-    forAll(cellShapes, cellI)
-    {
-        const cellShape& shape = cellShapes[cellI];
-        const cellModel& model = shape.model();
-
-        if (model == tet)
-        {
-            cellTypes_[cellI] = foamVtkCore::VTK_TETRA;
-            forAll(shape, i)
-            {
-                vertLabels_[nVertLabels++] = shape[i];
-            }
-            vertOffset_[cellI] = nVertLabels;
-        }
-        else if (model == pyr)
-        {
-            cellTypes_[cellI] = foamVtkCore::VTK_PYRAMID;
-            forAll(shape, i)
-            {
-                vertLabels_[nVertLabels++] = shape[i];
-            }
-            vertOffset_[cellI] = nVertLabels;
-        }
-        else if (model == hex)
-        {
-            cellTypes_[cellI] = foamVtkCore::VTK_HEXAHEDRON;
-            forAll(shape, i)
-            {
-                vertLabels_[nVertLabels++] = shape[i];
-            }
-            vertOffset_[cellI] = nVertLabels;
-        }
-        else if (model == prism)
-        {
-            cellTypes_[cellI] = foamVtkCore::VTK_WEDGE;
-
-            // VTK_WEDGE triangles point outwards (swap 1<->2, 4<->5)
-            vertLabels_[nVertLabels++] = shape[0];
-            vertLabels_[nVertLabels++] = shape[2];
-            vertLabels_[nVertLabels++] = shape[1];
-            vertLabels_[nVertLabels++] = shape[3];
-            vertLabels_[nVertLabels++] = shape[5];
-            vertLabels_[nVertLabels++] = shape[4];
-
-            vertOffset_[cellI] = nVertLabels;
-        }
-        else if (model == tetWedge && decompose_.requested())
-        {
-            // Treat as squeezed prism (VTK_WEDGE)
-            cellTypes_[cellI] = foamVtkCore::VTK_WEDGE;
-
-            vertLabels_[nVertLabels++] = shape[0];
-            vertLabels_[nVertLabels++] = shape[2];
-            vertLabels_[nVertLabels++] = shape[1];
-            vertLabels_[nVertLabels++] = shape[3];
-            vertLabels_[nVertLabels++] = shape[4];
-            vertLabels_[nVertLabels++] = shape[3];
-
-            vertOffset_[cellI] = nVertLabels;
-        }
-        else if (model == wedge && decompose_.requested())
-        {
-            // Treat as squeezed hex
-            cellTypes_[cellI] = foamVtkCore::VTK_HEXAHEDRON;
-
-            vertLabels_[nVertLabels++] = shape[0];
-            vertLabels_[nVertLabels++] = shape[1];
-            vertLabels_[nVertLabels++] = shape[2];
-            vertLabels_[nVertLabels++] = shape[2];
-            vertLabels_[nVertLabels++] = shape[3];
-            vertLabels_[nVertLabels++] = shape[4];
-            vertLabels_[nVertLabels++] = shape[5];
-            vertLabels_[nVertLabels++] = shape[6];
-
-            vertOffset_[cellI] = nVertLabels;
-        }
-        else if (decompose_.requested())
-        {
-            // Polyhedral cell - decompose into tet/pyr.
-
-            // Ensure we have the correct orientation for the base of the
-            // primitive cell shape.
-            // If the cell is face owner, the orientation needs to be flipped
-            // to avoid defining negative cells.
-            // VTK doesn't seem to care, but we'll do it anyhow for safety.
-
-            // The new vertex from the cell-centre
-            const label newVertexLabel = mesh_.nPoints() + nAddPoints;
-
-            // Mapping from additional point to cell
-            decompose_.addPointCellLabels_[nAddPoints++] = cellI;
-
-            // Whether to insert cell in place of original or not.
-            bool first = true;
-
-            const labelList& cFaces = mesh_.cells()[cellI];
-            forAll(cFaces, cFaceI)
-            {
-                const face& f = mesh_.faces()[cFaces[cFaceI]];
-                const bool isOwner = (owner[cFaces[cFaceI]] == cellI);
-
-                // Count triangles/quads in decomposition
-                label nTria = 0;
-                label nQuad = 0;
-                f.nTrianglesQuads(mesh_.points(), nTria, nQuad);
-
-                // Do actual decomposition
-                faceList faces3(nTria);
-                faceList faces4(nQuad);
-                nTria = 0, nQuad = 0;
-                f.trianglesQuads(mesh_.points(), nTria, nQuad, faces3, faces4);
-
-                forAll(faces4, fci)
-                {
-                    const face& quad = faces4[fci];
-
-                    label celLoc;
-                    label vrtLoc;
-
-                    if (first)
-                    {
-                        celLoc = cellI;
-                        vrtLoc = nVertLabels;
-                        nVertLabels += 5;
-
-                        vertOffset_[celLoc] = nVertLabels;
-                        first = false;
-                    }
-                    else
-                    {
-                        celLoc = mesh_.nCells() + nAddCells;
-                        vrtLoc = offsetAddVerts  + nAddVerts;
-                        nAddVerts += 5;
-
-                        vertOffset_[celLoc] = nAddVerts;
-                        decompose_.superCells_[nAddCells++] = cellI;
-                    }
-
-                    cellTypes_[celLoc] = foamVtkCore::VTK_PYRAMID;
-
-                    // See note above about the orientation.
-                    if (isOwner)
-                    {
-                        vertLabels_[vrtLoc++] = quad[3];
-                        vertLabels_[vrtLoc++] = quad[2];
-                        vertLabels_[vrtLoc++] = quad[1];
-                        vertLabels_[vrtLoc++] = quad[0];
-                    }
-                    else
-                    {
-                        vertLabels_[vrtLoc++] = quad[0];
-                        vertLabels_[vrtLoc++] = quad[1];
-                        vertLabels_[vrtLoc++] = quad[2];
-                        vertLabels_[vrtLoc++] = quad[3];
-                    }
-
-                    vertLabels_[vrtLoc++] = newVertexLabel;
-                }
-
-                forAll(faces3, fci)
-                {
-                    const face& tria = faces3[fci];
-
-                    label celLoc;
-                    label vrtLoc;
-
-                    if (first)
-                    {
-                        celLoc = cellI;
-                        vrtLoc = nVertLabels;
-                        nVertLabels += 4;
-
-                        vertOffset_[celLoc] = nVertLabels;
-                        first = false;
-                    }
-                    else
-                    {
-                        celLoc = mesh_.nCells() + nAddCells;
-                        vrtLoc = offsetAddVerts + nAddVerts;
-                        nAddVerts += 4;
-
-                        vertOffset_[celLoc] = nAddVerts;
-                        decompose_.superCells_[nAddCells++] = cellI;
-                    }
-
-                    cellTypes_[celLoc] = foamVtkCore::VTK_TETRA;
-
-                    // See note above about the orientation.
-                    if (isOwner)
-                    {
-                        vertLabels_[vrtLoc++] = tria[2];
-                        vertLabels_[vrtLoc++] = tria[1];
-                        vertLabels_[vrtLoc++] = tria[0];
-                    }
-                    else
-                    {
-                        vertLabels_[vrtLoc++] = tria[0];
-                        vertLabels_[vrtLoc++] = tria[1];
-                        vertLabels_[vrtLoc++] = tria[2];
-                    }
-                    vertLabels_[vrtLoc++] = newVertexLabel;
-                }
-            }
-        }
-        else
-        {
-            // Polyhedral cell - not decomposed
-
-            hashUniqId.clear();  // unique node ids used (only needed for XML)
-
-            // face-stream
-            //   [nFaces, nFace0Pts, id1, id2, ..., nFace1Pts, id1, id2, ...]
-
-            cellTypes_[cellI] = foamVtkCore::VTK_POLYHEDRON;
-            const labelList& cFaces = mesh_.cells()[cellI];
-
-            faceLabels_[nFaceLabels++] = cFaces.size();
-
-            forAll(cFaces, cFaceI)
-            {
-                const face& f = mesh_.faces()[cFaces[cFaceI]];
-                const bool isOwner = (owner[cFaces[cFaceI]] == cellI);
-
-                forAll(f, fp)
-                {
-                    hashUniqId.insert(f[fp]);
-                }
-
-                // number of labels for this face
-                faceLabels_[nFaceLabels++] = f.size();
-
-                if (isOwner)
-                {
-                    forAll(f, fp)
-                    {
-                        faceLabels_[nFaceLabels++] = f[fp];
-                    }
-                }
-                else
-                {
-                    // fairly immaterial if we reverse the list
-                    // or use face::reverseFace()
-                    forAllReverse(f, fp)
-                    {
-                        faceLabels_[nFaceLabels++] = f[fp];
-                    }
-                }
-            }
-
-            faceOffset_[cellI] = nFaceLabels;
-
-            const labelList uniq = hashUniqId.sortedToc();
-            forAll(uniq, i)
-            {
-                vertLabels_[nVertLabels++] = uniq[i];
-            }
-
-            vertOffset_[cellI] = nVertLabels;
-        }
-    }
-
-    // ===========================================
-    // PASS 3: Repair offsets for additional cells
-
-//     Info<<"vertOffset: " << vertOffset_.size() << " VS. " << (mesh_.nCells()) << endl;
-//     Info<<"nAddCells: "  << nAddCells << " VS. " << (mesh_.nCells()) << endl;
-
-    if (nAddCells)
-    {
-        const label beg = mesh_.nCells();
-        const label add = vertOffset_[beg-1];
-
-        for (label i = beg; i < vertOffset_.size(); ++i)
-        {
-            vertOffset_[i] += add;
-        }
-    }
-
-    // Some basic programming/sanity checks
-
-    if ((nVertLabels + nAddVerts) != vertOffset_[mesh_.nCells()-1 + nAddCells])
-    {
-        WarningInFunction
-            << "predicted offsets (" << nVertLabels << " + " << nAddVerts << ") != "
-            << vertOffset_[mesh_.nCells()-1 + nAddCells]
-            << endl;
-    }
-
-    if (offsetAddVerts != vertOffset_[mesh_.nCells()-1])
-    {
-        WarningInFunction
-            << "predicted regular offset " << offsetAddVerts
-            << " != " << vertOffset_[mesh_.nCells()]
-            << endl;
-    }
-
-    // nFaceLabels = 0;
-    // nAddPoints  = 0;
-    // nAddCells   = 0;
-
-    // Pout<<"vertLabels: " << vertLabels_.size() << " vs. " << (nVertLabels + nAddVerts) << endl;
-    // Pout<<"faceLabels: " << faceLabels_.size() << " vs. " << nFaceLabels << endl;
-#if 0
-    if (decompose_.requested())
-    {
-        Pout<< "    Original cells:" << mesh_.nCells()
-            << " points:" << mesh_.nPoints()
-            << " Additional cells:" << decompose_.superCells_.size()
-            << " additional points:" << decompose_.addPointCellLabels_.size()
-            << nl << endl;
-    }
-#endif
-}
-
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-Foam::foamVtkCells::decomp::decomp(const bool decomposePoly)
+Foam::foamVtkCells::foamVtkCells
+(
+    const contentType output,
+    const bool decompose
+)
 :
-    addPointCellLabels_(),
-    superCells_(),
-    pointMap_(),
-    requested_(decomposePoly)
+    foamVtuSizing(),
+    output_(output),
+    decomposeRequest_(decompose),
+    cellTypes_(),
+    vertLabels_(),
+    vertOffset_(),
+    faceLabels_(),
+    faceOffset_(),
+    maps_()
 {}
 
 
 Foam::foamVtkCells::foamVtkCells
 (
     const polyMesh& mesh,
-    const bool decomposePoly,
-    const bool lazy
+    const contentType output,
+    const bool decompose
 )
 :
-    mesh_(mesh),
-    cellTypes_(),
-    vertLabels_(),
-    vertOffset_(),
-    faceLabels_(),
-    faceOffset_(),
-    decompose_(decomposePoly),
-    needsUpdate_(true)
+    foamVtkCells(output, decompose)
 {
-    if (!lazy)
-    {
-        correct();
-    }
+    reset(mesh);
 }
 
 
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
 
-Foam::foamVtkCells::decomp::~decomp()
-{}
-
-
 Foam::foamVtkCells::~foamVtkCells()
 {}
 
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-
-void Foam::foamVtkCells::decomp::clear()
+void Foam::foamVtkCells::clear()
 {
-    superCells_.clear();
-    addPointCellLabels_.clear();
-    pointMap_.clear();
+    foamVtuSizing::clear();
+    cellTypes_.clear();
+    vertLabels_.clear();
+    vertOffset_.clear();
+    faceLabels_.clear();
+    faceOffset_.clear();
+
+    maps_.clear();
 }
 
 
-Foam::label Foam::foamVtkCells::nFieldPoints() const
+void Foam::foamVtkCells::reset(const polyMesh& mesh)
 {
-    return mesh_.nPoints() + decompose_.addPointCellLabels_.size();
-}
+    foamVtuSizing::reset(mesh, decomposeRequest_);
 
+    cellTypes_.setSize(nFieldCells());
+    vertLabels_.setSize(slotSize(output_, slotType::CELLS));
+    vertOffset_.setSize(slotSize(output_, slotType::CELLS_OFFSETS));
+    faceLabels_.setSize(slotSize(output_, slotType::FACES));
+    faceOffset_.setSize(slotSize(output_, slotType::FACES_OFFSETS));
 
-Foam::label Foam::foamVtkCells::legacyCellPayLoad() const
-{
-    label payLoad = cellTypes_.size();
-
-    if (faceOffset_.size())
+    switch (output_)
     {
-        // also has polys with face streams
-
-        label begVert = 0;
-        label begFace = 0;
-
-        forAll(faceOffset_, i)
-        {
-            label endFace = faceOffset_[i];
-            label endVert = vertOffset_[i];
-
-            if (endFace > 0)
-            {
-                // poly with face stream
-                payLoad += endFace - begFace;
-
-                begFace = endFace;
-            }
-            else
-            {
-                // primitive without face stream
-                payLoad += endVert - begVert;
-            }
-            begVert = endVert;
-        }
+        case contentType::LEGACY:
+            populateLegacy
+            (
+                mesh,
+                cellTypes_,
+                vertLabels_,
+                maps_
+            );
+            break;
+        case contentType::XML:
+            populateXml
+            (
+                mesh,
+                cellTypes_,
+                vertLabels_,
+                vertOffset_,
+                faceLabels_,
+                faceOffset_,
+                maps_
+            );
+            break;
+        case contentType::INTERNAL:
+            populateInternal
+            (
+                mesh,
+                cellTypes_,
+                vertLabels_,
+                vertOffset_,
+                faceLabels_,
+                faceOffset_,
+                maps_
+            );
+            break;
     }
-    else if (vertOffset_.size())
-    {
-        // primitives only, trivial
-        payLoad += vertOffset_[vertOffset_.size()-1];
-    }
-
-    return payLoad;
 }
 
 
-bool Foam::foamVtkCells::needsUpdate() const
+void Foam::foamVtkCells::reset
+(
+    const polyMesh& mesh,
+    const enum contentType output,
+    const bool decompose
+)
 {
-    return needsUpdate_;
+    output_ = output;
+    decomposeRequest_ = decompose;
+
+    reset(mesh);
 }
 
 
-bool Foam::foamVtkCells::expire()
+void Foam::foamVtkCells::renumberCells(const UList<label>& mapping)
 {
-    // Clear any stored topologies
-
-    // Clear derived data
-    // clearGeom();
-
-    // already marked as expired
-    if (needsUpdate_)
-    {
-        return false;
-    }
-
-    needsUpdate_ = true;
-    return true;
+    maps_.renumberCells(mapping);
 }
 
 
-bool Foam::foamVtkCells::update()
+void Foam::foamVtkCells::renumberPoints(const UList<label>& mapping)
 {
-    if (!needsUpdate_)
-    {
-        return false;
-    }
-
-    correct();
-
-    needsUpdate_ = false;
-    return true;
+    maps_.renumberPoints(mapping);
 }
 
 
diff --git a/src/conversion/vtk/part/foamVtkCells.H b/src/conversion/vtk/part/foamVtkCells.H
index 692614a4b9..b6704e6767 100644
--- a/src/conversion/vtk/part/foamVtkCells.H
+++ b/src/conversion/vtk/part/foamVtkCells.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -25,53 +25,32 @@ Class
     Foam::foamVtkCells
 
 Description
-    The deep-copy description of an OpenFOAM volume mesh in data structures
-    corresponding to an VTK UnstructuredGrid, including the possiblity of
+    A deep-copy description of an OpenFOAM volume mesh in data structures
+    suitable for VTK UnstructuredGrid, including the possibility of
     decomposing polyhedral cells into primitive cell types.
 
     Knowledge of the vtkUnstructuredGrid and the corresponding \c .vtu
     xml file-format aids in understanding this class.
-    For flexibilty, support for the legacy vtk file-format is also provided.
+    The class can be used for the VTK xml format, legacy format, as well as a
+    VTK internal representation. The internal representation is somewhat
+    related to the xml format, but not entirely.
 
-    Primitive cell types are straighforward, polyhedral cells are represented
-    by a face stream:
-    \verbatim
-        [nFaces, nFace0Pts, id1, id2, ..., nFace1Pts, id1, id2, ...]
-    \endverbatim
-
-    For the legacy format, the face stream is simply passed as vertex labels
-    (connectivity).
-
-    For the xml format, the face stream is saved separately:
-    \verbatim
-        "connectivity"
-        == the unique vertex labels used by the cell (optionally sorted).
-
-        "offsets":
-        == offset + sizeof(connectivity)
-
-        "faces":
-        [nFaces, nFace0Pts, id1, id2, ..., nFace1Pts, id1, id2, ...]
-
-        "faceoffsets":
-        == faceoffsets + sizeof(faces)
-    \endverbatim
-
-    The storage of "connectivity" and "offsets" strongly resembles a
-    CompactListList, but the "offsets" point to the end of the respective
-    sub-lists.
+SeeAlso
+    Foam::foamVtuSizing
 
 SourceFiles
     foamVtkCells.C
+    foamVtkCellsI.H
 
 \*---------------------------------------------------------------------------*/
 
 #ifndef foamVtkCells_H
 #define foamVtkCells_H
 
+#include "foamVtkMeshMaps.H"
+#include "foamVtuSizing.H"
 #include "foamVtkCore.H"
 #include "DynamicList.H"
-#include "SubList.H"
 #include "labelList.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -83,119 +62,48 @@ namespace Foam
 class polyMesh;
 
 /*---------------------------------------------------------------------------*\
-                      Class foamVtkCells Declaration
+                        Class foamVtkCells Declaration
 \*---------------------------------------------------------------------------*/
 
 class foamVtkCells
 :
-    public fileFormats::foamVtkCore
+    public fileFormats::foamVtkCore,
+    public foamVtuSizing
 {
-public:
-
-    //- Bookkeeping for polyhedral cell decomposition
-    class decomp
-    {
-    private:
-        friend foamVtkCells;
-
-        // Private data
-
-            //- Cell-centre labels for additional points of decomposed cells
-            DynamicList<label> addPointCellLabels_;
-
-            //- Label of original cell for decomposed cells
-            DynamicList<label> superCells_;
-
-            //- Point labels for subsetted meshes
-            DynamicList<label> pointMap_;
-
-            //- Track if decomposition was requested
-            const bool requested_;
-
-
-        // Private Member Functions
-
-            //- Disallow default bitwise copy construct
-            decomp(const decomp&) = delete;
-
-            //- Disallow default bitwise assignment
-            void operator=(const decomp&) = delete;
-
-    public:
-
-        // Constructors
-
-            //- Construct null
-            decomp(const bool decomposePoly = false);
-
-
-        //- Destructor
-        ~decomp();
-
-
-        // Member Functions
-
-        // Access
-
-            //- Polyhedral decomposition requested
-            inline bool requested() const;
-
-            //- Polyhedral decomposition used
-            inline bool used() const;
-
-            //- Label of original cell for decomposed cells
-            inline const labelList& superCells() const;
-
-            //- Cell-centre labels for additional points of decomposed cells
-            inline const labelList& addPointCellLabels() const;
-
-            //- Point labels for subsetted meshes
-            inline const labelList& pointMap() const;
-
-
-        // Edit
-
-            //- Clear
-            void clear();
-    };
-
-
-private:
-
     // Private data
 
-        //- Reference to underlying mesh or mesh sub-set
-        const polyMesh& mesh_;
+      // Requested output types
+
+        //- Output content type
+        contentType output_;
+
+        //- Bookkeeping for polyhedral cell decomposition
+        bool decomposeRequest_;
+
+      // Storage of output
 
         //- Cell types (including added cells) in vtk numbering
         //  Range is 1-255
         List<uint8_t> cellTypes_;
 
         //- Vertices per cell (including added cells) in vtk ordering
-        DynamicList<label> vertLabels_;
+        List<label> vertLabels_;
 
-        //- Vertices per cell (including added cells) in vtk ordering
-        DynamicList<label> vertOffset_;
+        //- Connectivity (vertices) offset for the end of each cell
+        List<label> vertOffset_;
 
         //- Face lists per polyhedral cell
-        DynamicList<label> faceLabels_;
+        List<label> faceLabels_;
 
         //- Face label offsets
-        DynamicList<label> faceOffset_;
+        List<label> faceOffset_;
 
         //- Bookkeeping for polyhedral cell decomposition
-        decomp decompose_;
-
-        //- Needs update
-        bool needsUpdate_;
-
+        foamVtkMeshMaps maps_;
 
 
     // Private Member Functions
 
-        //- Create the geometry
-        void correct();
-
         //- Disallow default bitwise copy construct
         foamVtkCells(const foamVtkCells&) = delete;
 
@@ -208,13 +116,20 @@ public:
     // Constructors
 
         //- Construct from components.
-        //  Optionally with polyhedral decomposition and/or lazy evaluation.
-        //  A 'lazy' evaluation avoids fully creation within the constructor.
+        //  Optionally with polyhedral decomposition.
         foamVtkCells
         (
-            const polyMesh&,
-            const bool decomposePoly = false,
-            const bool lazy = false
+            const enum contentType output = contentType::XML,
+            const bool decompose = false
+        );
+
+        //- Construct from components and create the output information
+        //  immediately
+        foamVtkCells
+        (
+            const polyMesh& mesh,
+            const enum contentType output = contentType::XML,
+            const bool decompose = false
         );
 
 
@@ -224,113 +139,68 @@ public:
 
     // Member Functions
 
-        // Access
+      // Access
 
-            //- Query the poly decompose flag.
-            inline bool decomposeRequested() const;
+        //- The output content type
+        inline enum contentType content() const;
 
-            //- Values for "connectivity" (XML) or basis for "CELLS" (legacy)
-            //  In the legacy format, the size (offset) must be prefixed.
-            inline const labelList& vertLabels() const;
+        //- Query the polyhedral decompose requested flag.
+        inline bool decomposeRequested() const;
 
-            //- Values for "offsets" (XML)
-            //  or sizes to prefix for for "CELLS" (legacy)
-            inline const labelList& vertOffsets() const;
+        //- True if no cellTypes are populated.
+        inline bool empty() const;
 
-            //- Values for "types" (XML) and "CELL_TYPES" (legacy)
-            inline const List<uint8_t>& cellTypes() const;
-
-            //- Values for "faces" (XML)
-            inline const labelList& faceLabels() const;
-
-            //- Values for "faceoffsets" (XML)
-            inline const labelList& faceOffsets() const;
-
-            //- Additional point addressing (from added point to original cell)
-            inline const labelList& addPointCellLabels() const;
-
-            //- Additional cells mapping (from added cell to original cell)
-            inline const labelList& superCells() const;
+        //- The size of populated cellTypes.
+        inline label size() const;
 
 
-            //- Number of field cells
-            inline label nFieldCells() const;
+      // Edit
 
-            //- Number of field points
-            label nFieldPoints() const;
+        //- Reset all sizes to zero.
+        void clear();
 
-            //- The field size for legacy "CELLS".
-            //  In the legacy format, the size (offset) must be prefixed.
-            label legacyCellPayLoad() const;
+        //- Create the geometry using the previously requested output and
+        //  decomposition types.
+        void reset(const polyMesh& mesh);
+
+        //- Respecify requested output and decomposition type prior to
+        //  creating the geometry
+        void reset
+        (
+            const polyMesh& mesh,
+            const enum contentType output,
+            const bool decompose
+        );
+
+        //- Renumber cell ids to account for subset meshes
+        void renumberCells(const UList<label>& mapping);
+
+        //- Renumber point ids to account for subset meshes
+        void renumberPoints(const UList<label>& mapping);
 
 
-        //- Does the mapping need an update?
-        bool needsUpdate() const;
+      // Storage Access
 
-        //- Mark as needing an update.
-        //  May also free up unneeded data.
-        //  Return false if it was already marked as expired.
-        bool expire();
+        //- Values for "types" (XML) and "CELL_TYPES" (legacy)
+        inline const List<uint8_t>& cellTypes() const;
 
-        //- Update the description (and decomposition) as required.
-        //  Do nothing (and return false) if no update was required
-        bool update();
+        //- Values for "connectivity" (XML) or "CELLS" (legacy)
+        inline const labelList& vertLabels() const;
 
+        //- Values for "offsets" (XML only)
+        inline const labelList& vertOffsets() const;
 
-        //- The const_iterator for foamVtkCells
-        class const_iterator
-        {
-            friend class foamVtkCells;
+        //- Values for "faces" (XML only)
+        inline const labelList& faceLabels() const;
 
-        protected:
+        //- Values for "faceoffset" (XML only)
+        inline const labelList& faceOffsets() const;
 
-            // Protected Data
+        //- Additional point addressing (from added point to original cell)
+        inline const labelList& addPointCellLabels() const;
 
-                //- Reference to parent list
-                const foamVtkCells& parent_;
-
-                //- Element index
-                label index_;
-
-                //- Begin of connectivity sub-list
-                mutable label begVert_;
-
-                //- Begin of faces sub-list
-                mutable label begFace_;
-
-                //- On-demand legacy pointer
-                mutable autoPtr<SubList<label>> legacy_;
-
-
-            // Constructors
-
-                //- Construct begin/end iterator
-                inline const_iterator
-                (
-                    const foamVtkCells&,
-                    bool isEnd = false
-                );
-
-        public:
-
-            // Member operators
-
-                //- On-demand legacy cell labels (primitive or faces)
-                inline const labelUList& legacyCell() const;
-
-                //- Compare position
-                inline bool operator!=(const const_iterator&) const;
-
-                //- Pre-increment iterator
-                inline const_iterator& operator++();
-        };
-
-
-        //- const_iterator set to the beginning
-        inline const_iterator begin() const;
-
-        //- const_iterator set to beyond the end
-        inline const_iterator end() const;
+        //- Original cell ids for all cells (regular and decomposed).
+        inline const labelList& cellMap() const;
 
 };
 
diff --git a/src/conversion/vtk/part/foamVtkCellsI.H b/src/conversion/vtk/part/foamVtkCellsI.H
index 5973f5113e..abf935fc80 100644
--- a/src/conversion/vtk/part/foamVtkCellsI.H
+++ b/src/conversion/vtk/part/foamVtkCellsI.H
@@ -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-2017 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -25,44 +25,37 @@ License
 
 #include "foamVtkCells.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-inline bool Foam::foamVtkCells::decomp::requested() const
+
+inline enum Foam::foamVtkCells::contentType Foam::foamVtkCells::content() const
 {
-    return requested_;
-}
-
-
-inline bool Foam::foamVtkCells::decomp::used() const
-{
-    return !superCells_.empty();
-}
-
-
-inline const Foam::labelList&
-Foam::foamVtkCells::decomp::superCells() const
-{
-    return superCells_;
-}
-
-
-inline const Foam::labelList&
-Foam::foamVtkCells::decomp::addPointCellLabels() const
-{
-    return addPointCellLabels_;
-}
-
-
-inline const Foam::labelList&
-Foam::foamVtkCells::decomp::pointMap() const
-{
-    return pointMap_;
+    return output_;
 }
 
 
 inline bool Foam::foamVtkCells::decomposeRequested() const
 {
-    return decompose_.requested();
+    return decomposeRequest_;
+}
+
+
+inline bool Foam::foamVtkCells::empty() const
+{
+    return cellTypes_.empty();
+}
+
+
+inline Foam::label Foam::foamVtkCells::size() const
+{
+    return cellTypes_.size();
+}
+
+
+inline const Foam::List<uint8_t>&
+Foam::foamVtkCells::cellTypes() const
+{
+    return cellTypes_;
 }
 
 
@@ -80,13 +73,6 @@ Foam::foamVtkCells::vertOffsets() const
 }
 
 
-inline const Foam::List<uint8_t>&
-Foam::foamVtkCells::cellTypes() const
-{
-    return cellTypes_;
-}
-
-
 inline const Foam::labelList&
 Foam::foamVtkCells::faceLabels() const
 {
@@ -104,135 +90,14 @@ Foam::foamVtkCells::faceOffsets() const
 inline const Foam::labelList&
 Foam::foamVtkCells::addPointCellLabels() const
 {
-    return decompose_.addPointCellLabels();
+    return maps_.additionalIds();
 }
 
 
 inline const Foam::labelList&
-Foam::foamVtkCells::superCells() const
+Foam::foamVtkCells::cellMap() const
 {
-    return decompose_.superCells();
-}
-
-
-inline Foam::label
-Foam::foamVtkCells::nFieldCells() const
-{
-    return cellTypes_.size();
-}
-
-
-inline Foam::foamVtkCells::const_iterator
-Foam::foamVtkCells::begin() const
-{
-    return const_iterator(*this);
-}
-
-
-inline Foam::foamVtkCells::const_iterator
-Foam::foamVtkCells::end() const
-{
-    return const_iterator(*this, true);
-}
-
-
-// * * * * * * * * * * * * * * * * Iterators * * * * * * * * * * * * * * * * //
-
-inline Foam::foamVtkCells::const_iterator::const_iterator
-(
-    const foamVtkCells& cells,
-    bool isEnd
-)
-:
-    parent_(cells),
-    index_(0),
-    begVert_(0),
-    begFace_(0),
-    legacy_()
-{
-    if (isEnd)
-    {
-        index_ = parent_.vertOffsets().size();
-    }
-}
-
-
-inline
-Foam::foamVtkCells::const_iterator&
-Foam::foamVtkCells::const_iterator::operator++()
-{
-    ++index_;
-    legacy_.clear();
-
-    return *this;
-}
-
-
-inline
-const Foam::UList<Foam::label>&
-Foam::foamVtkCells::const_iterator::legacyCell() const
-{
-    if
-    (
-        legacy_.valid()
-     || index_ >= parent_.vertOffsets().size()
-    )
-    {
-        return legacy_();
-    }
-
-    const label endVert = parent_.vertOffsets()[index_];
-
-    const label endFace =
-    (
-        parent_.faceOffsets().size()
-      ? parent_.faceOffsets()[index_]
-      : -1
-    );
-
-    if (endFace > 0)
-    {
-        // poly with face stream
-
-        legacy_.reset
-        (
-            new SubList<label>
-            (
-                parent_.faceLabels(),
-                endFace - begFace_,
-                begFace_
-            )
-        );
-
-        begFace_ = endFace;
-    }
-    else
-    {
-        // primitive without face stream
-        legacy_.reset
-        (
-            new SubList<label>
-            (
-                parent_.vertLabels(),
-                endVert - begVert_,
-                begVert_
-            )
-        );
-    }
-
-    begVert_ = endVert;
-
-    return legacy_();
-}
-
-
-inline bool
-Foam::foamVtkCells::const_iterator::operator!=
-(
-    const const_iterator& rhs
-) const
-{
-    return (index_ != rhs.index_);
+    return maps_.cellMap();
 }
 
 
diff --git a/src/conversion/vtk/part/foamVtkMeshMaps.C b/src/conversion/vtk/part/foamVtkMeshMaps.C
new file mode 100644
index 0000000000..badc422df5
--- /dev/null
+++ b/src/conversion/vtk/part/foamVtkMeshMaps.C
@@ -0,0 +1,44 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2017 OpenCFD Ltd.
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "foamVtkMeshMaps.H"
+#include "ListOps.H"
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+void Foam::foamVtkMeshMaps::renumberCells(const UList<label>& mapping)
+{
+    inplaceRenumber(mapping, cellMap_);
+    inplaceRenumber(mapping, additionalIds_);
+}
+
+
+void Foam::foamVtkMeshMaps::renumberPoints(const UList<label>& mapping)
+{
+    inplaceRenumber(mapping, pointMap_);
+}
+
+
+// ************************************************************************* //
diff --git a/src/conversion/vtk/part/foamVtkMeshMaps.H b/src/conversion/vtk/part/foamVtkMeshMaps.H
new file mode 100644
index 0000000000..63390ef34b
--- /dev/null
+++ b/src/conversion/vtk/part/foamVtkMeshMaps.H
@@ -0,0 +1,139 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2017 OpenCFD Ltd.
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::foamVtkMeshMaps
+
+Description
+    Bookkeeping for mesh subsetting and/or polyhedral cell decomposition.
+
+    The cellMap is a local-to-global lookup for normal and decomposed cells.
+    The pointMap is an optional local-to-global lookup for point ids.
+    The additional ids is typically used to store the cell-centre labels
+    for additional points of decomposed cells
+
+SourceFiles
+    foamVtkMeshMapsI.H
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef foamVtkMeshMaps_H
+#define foamVtkMeshMaps_H
+
+#include "DynamicList.H"
+#include "labelList.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+                       Class foamVtkMeshMaps Declaration
+\*---------------------------------------------------------------------------*/
+
+class foamVtkMeshMaps
+{
+    // Private data
+
+        //- Original cell ids for all cells (regular and decomposed)
+        DynamicList<label> cellMap_;
+
+        //- Point labels for subsetted meshes
+        DynamicList<label> pointMap_;
+
+        //- Any additional (user) labels.
+        //  Eg, cell-centre labels for additional points of decomposed cells
+        DynamicList<label> additionalIds_;
+
+public:
+
+    // Constructors
+
+        //- Construct null
+        inline foamVtkMeshMaps(const label size = 0);
+
+
+    //- Destructor
+    inline ~foamVtkMeshMaps();
+
+
+    // Member Functions
+
+      // Access
+
+        //- Original cell ids for all cells (regular and decomposed).
+        //  A regular mesh comprising only primitive cell types, this will just
+        //  be an identity list. However, for subsetted meshes and decomposed
+        //  cells this becomes a useful means of mapping from the original mesh.
+        inline const labelList& cellMap() const;
+
+        //- Point labels for subsetted meshes
+        inline const labelList& pointMap() const;
+
+        //- Any additional (user) labels.
+        //  Eg, cell-centre labels for additional points of decomposed cells
+        inline const labelList& additionalIds() const;
+
+
+      // Edit
+
+        //- Clear
+        inline void clear();
+
+        //- Renumber cell ids to account for subset meshes
+        void renumberCells(const UList<label>& mapping);
+
+        //- Renumber point ids to account for subset meshes
+        void renumberPoints(const UList<label>& mapping);
+
+
+        //- Original cell ids for all cells (regular and decomposed).
+        //  A regular mesh comprising only primitive cell types, this will just
+        //  be an identity list. However, for subsetted meshes and decomposed
+        //  cells this becomes a useful means of mapping from the original mesh.
+        inline DynamicList<label>& cellMap();
+
+        //- Point labels for subsetted meshes
+        inline DynamicList<label>& pointMap();
+
+        //- Any additional (user) labels.
+        //  Eg, cell-centre labels for additional points of decomposed cells
+        inline DynamicList<label>& additionalIds();
+
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#include "foamVtkMeshMapsI.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/conversion/vtk/part/foamVtkMeshMapsI.H b/src/conversion/vtk/part/foamVtkMeshMapsI.H
new file mode 100644
index 0000000000..5f53fb25b2
--- /dev/null
+++ b/src/conversion/vtk/part/foamVtkMeshMapsI.H
@@ -0,0 +1,96 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2017 OpenCFD Ltd.
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "foamVtkMeshMaps.H"
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+inline Foam::foamVtkMeshMaps::foamVtkMeshMaps(const label size)
+:
+    cellMap_(size),
+    pointMap_(size),
+    additionalIds_(size)
+{}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+inline Foam::foamVtkMeshMaps::~foamVtkMeshMaps()
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+inline void Foam::foamVtkMeshMaps::clear()
+{
+    cellMap_.clear();
+    pointMap_.clear();
+    additionalIds_.clear();
+}
+
+
+inline const Foam::labelList&
+Foam::foamVtkMeshMaps::cellMap() const
+{
+    return cellMap_;
+}
+
+
+inline Foam::DynamicList<Foam::label>&
+Foam::foamVtkMeshMaps::cellMap()
+{
+    return cellMap_;
+}
+
+
+inline const Foam::labelList&
+Foam::foamVtkMeshMaps::pointMap() const
+{
+    return pointMap_;
+}
+
+
+inline Foam::DynamicList<Foam::label>&
+Foam::foamVtkMeshMaps::pointMap()
+{
+    return pointMap_;
+}
+
+
+inline const Foam::labelList&
+Foam::foamVtkMeshMaps::additionalIds() const
+{
+    return additionalIds_;
+}
+
+
+inline Foam::DynamicList<Foam::label>&
+Foam::foamVtkMeshMaps::additionalIds()
+{
+    return additionalIds_;
+}
+
+
+// ************************************************************************* //
diff --git a/src/conversion/vtk/part/foamVtuSizing.C b/src/conversion/vtk/part/foamVtuSizing.C
new file mode 100644
index 0000000000..a9f0451f02
--- /dev/null
+++ b/src/conversion/vtk/part/foamVtuSizing.C
@@ -0,0 +1,578 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2016-2017 OpenCFD Ltd.
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "foamVtuSizing.H"
+#include "foamVtkCore.H"
+#include "polyMesh.H"
+#include "cellShape.H"
+#include "cellModeller.H"
+
+// only used in this file
+#include "foamVtuSizingTemplates.C"
+
+// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
+
+void Foam::foamVtuSizing::presizeMaps(foamVtkMeshMaps& maps) const
+{
+    maps.cellMap().setSize(this->nFieldCells());
+    maps.additionalIds().setSize(this->nAddPoints());
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::foamVtuSizing::foamVtuSizing
+(
+    const polyMesh& mesh,
+    const bool decompose
+)
+{
+    clear();
+    reset(mesh, decompose);
+}
+
+
+Foam::foamVtuSizing::foamVtuSizing()
+{
+    clear();
+}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+Foam::foamVtuSizing::~foamVtuSizing()
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+void Foam::foamVtuSizing::reset
+(
+    const polyMesh& mesh,
+    const bool decompose
+)
+{
+    const cellModel& tet      = *(cellModeller::lookup("tet"));
+    const cellModel& pyr      = *(cellModeller::lookup("pyr"));
+    const cellModel& prism    = *(cellModeller::lookup("prism"));
+    const cellModel& wedge    = *(cellModeller::lookup("wedge"));
+    const cellModel& tetWedge = *(cellModeller::lookup("tetWedge"));
+    const cellModel& hex      = *(cellModeller::lookup("hex"));
+
+    const cellShapeList& shapes = mesh.cellShapes();
+
+    // Unique vertex labels per polyhedral
+    HashSet<label> hashUniqId(2*256);
+
+    decompose_ = decompose;
+    nCells_    = mesh.nCells();
+    nPoints_   = mesh.nPoints();
+    nAddCells_ = 0;
+    nAddVerts_ = 0;
+
+    nCellsPoly_  = nCells_;
+    nVertLabels_ = 0;
+    nFaceLabels_ = 0;
+    nVertPoly_   = 0;
+
+    forAll(shapes, celli)
+    {
+        const cellShape& shape = shapes[celli];
+        const cellModel& model = shape.model();
+
+        if
+        (
+            model == tet
+         || model == pyr
+         || model == prism
+         || model == hex
+        )
+        {
+            // Normal primitive - not a poly
+            --nCellsPoly_;
+            nVertLabels_ += shape.size();
+        }
+        else if (model == tetWedge && decompose)
+        {
+            nVertLabels_ += 6;  // Treat as squeezed prism (VTK_WEDGE)
+        }
+        else if (model == wedge && decompose)
+        {
+            nVertLabels_ += 8;  // Treat as squeezed hex
+        }
+        else if (decompose)
+        {
+            // Polyhedral: Decompose into tets + pyramids.
+            ++nAddPoints_;
+
+            // Count vertices into first decomposed cell
+            bool first = true;
+
+            const cell& cFaces = mesh.cells()[celli];
+            forAll(cFaces, cFaceI)
+            {
+                const face& f = mesh.faces()[cFaces[cFaceI]];
+
+                // Face decomposed into triangles and quads
+                // Tri -> Tet, Quad -> Pyr
+                label nTria = 0, nQuad = 0;
+                f.nTrianglesQuads(mesh.points(), nTria, nQuad);
+
+                nAddCells_ += nTria + nQuad;
+                nAddVerts_ += (nTria * 4) + (nQuad * 5);
+
+                if (first)
+                {
+                    first = false;
+                    --nAddCells_;
+
+                    const label nvrt = (nQuad ? 5 : 4);
+                    nAddVerts_   -= nvrt;
+                    nVertLabels_ += nvrt;
+                }
+            }
+        }
+        else
+        {
+            // Polyhedral: Not decomposed
+
+            const labelList& cFaces = mesh.cells()[celli];
+
+            // Unique node ids used (only needed for XML)
+            hashUniqId.clear();
+
+            // Face stream sizing:
+            // number of faces, size of each face, vertices per face
+            // [nFaces, nFace0Pts, id1, id2, ..., nFace1Pts, id1, id2, ...]
+
+            forAll(cFaces, cFaceI)
+            {
+                const face& f = mesh.faces()[cFaces[cFaceI]];
+                nFaceLabels_ += f.size();
+
+                hashUniqId.insert(f);
+            }
+
+            // Legacy format only uses the face-stream.
+            // - track what *NOT* to use for legacy
+            nVertLabels_ += hashUniqId.size();
+            nVertPoly_   += hashUniqId.size();
+
+            nFaceLabels_ += 1 + cFaces.size();
+        }
+    }
+
+    // decompose requested and needed
+    decompose_ = (decompose && nCellsPoly_);
+}
+
+
+Foam::label Foam::foamVtuSizing::slotSize
+(
+    const enum contentType output,
+    const enum slotType slot
+) const
+{
+    switch (output)
+    {
+        case contentType::LEGACY:
+        {
+            switch (slot)
+            {
+                case slotType::CELLS:
+                    // legacy uses connectivity for primitives, but directly
+                    // stores face streams into connectivity as well.
+                    // size-prefix per cell
+                    return
+                    (
+                        nVertLabels() + nAddVerts() - nVertPoly() // primitives
+                      + nFaceLabels()     // face-stream (poly)
+                      + nFieldCells()     // nFieldCells (size prefix)
+                    );
+                    break;
+
+                default:
+                    break;
+            }
+            break;
+        }
+        case contentType::XML:
+        {
+            switch (slot)
+            {
+                case slotType::CELLS:
+                    return (nVertLabels() + nAddVerts());
+                    break;
+
+                case slotType::CELLS_OFFSETS:
+                    return nFieldCells();
+                    break;
+
+                case slotType::FACES:
+                    return nFaceLabels();
+                    break;
+
+                case slotType::FACES_OFFSETS:
+                    return nFaceLabels() ? nFieldCells() : 0;
+                    break;
+            }
+            break;
+        }
+        case contentType::INTERNAL:
+        {
+            switch (slot)
+            {
+                case slotType::CELLS:
+                    // size-prefix per cell
+                    return (nVertLabels() + nAddVerts() + nFieldCells());
+                    break;
+
+                case slotType::CELLS_OFFSETS:
+                    return nFieldCells();
+                    break;
+
+                case slotType::FACES:
+                    return nFaceLabels();
+                    break;
+
+                case slotType::FACES_OFFSETS:
+                    return nFaceLabels() ? nFieldCells() : 0;
+                    break;
+            }
+            break;
+        }
+    }
+
+    return 0;
+}
+
+
+void Foam::foamVtuSizing::populateLegacy
+(
+    const polyMesh& mesh,
+    UList<uint8_t>& cellTypes,
+    UList<label>& vertLabels,
+    foamVtkMeshMaps& maps
+) const
+{
+    // Leave as zero-sized so that populateArrays doesn't fill it.
+    List<label> unused;
+
+    presizeMaps(maps);
+
+    populateArrays
+    (
+        mesh,
+        *this,
+        cellTypes,
+        vertLabels,
+        unused, // offsets
+        unused, // faces
+        unused, // facesOffsets
+        contentType::LEGACY,
+        maps.cellMap(),
+        maps.additionalIds()
+    );
+}
+
+
+void Foam::foamVtuSizing::populateXml
+(
+    const polyMesh& mesh,
+    UList<uint8_t>& cellTypes,
+    UList<label>& connectivity,
+    UList<label>& offsets,
+    UList<label>& faces,
+    UList<label>& facesOffsets,
+    foamVtkMeshMaps& maps
+) const
+{
+    presizeMaps(maps);
+
+    populateArrays
+    (
+        mesh,
+        *this,
+        cellTypes,
+        connectivity,
+        offsets,
+        faces,
+        facesOffsets,
+        contentType::XML,
+        maps.cellMap(),
+        maps.additionalIds()
+    );
+}
+
+
+void Foam::foamVtuSizing::populateInternal
+(
+    const polyMesh& mesh,
+    UList<uint8_t>& cellTypes,
+    UList<int>& connectivity,
+    UList<int>& offsets,
+    UList<int>& faces,
+    UList<int>& facesOffsets,
+    foamVtkMeshMaps& maps
+) const
+{
+    presizeMaps(maps);
+
+    populateArrays
+    (
+        mesh,
+        *this,
+        cellTypes,
+        connectivity,
+        offsets,
+        faces,
+        facesOffsets,
+        contentType::INTERNAL,
+        maps.cellMap(),
+        maps.additionalIds()
+    );
+}
+
+
+void Foam::foamVtuSizing::populateInternal
+(
+    const polyMesh& mesh,
+    UList<uint8_t>& cellTypes,
+    UList<long>& connectivity,
+    UList<long>& offsets,
+    UList<long>& faces,
+    UList<long>& facesOffsets,
+    foamVtkMeshMaps& maps
+) const
+{
+    presizeMaps(maps);
+
+    populateArrays
+    (
+        mesh,
+        *this,
+        cellTypes,
+        connectivity,
+        offsets,
+        faces,
+        facesOffsets,
+        contentType::INTERNAL,
+        maps.cellMap(),
+        maps.additionalIds()
+    );
+}
+
+
+void Foam::foamVtuSizing::populateInternal
+(
+    const polyMesh& mesh,
+    UList<uint8_t>& cellTypes,
+    UList<long long>& connectivity,
+    UList<long long>& offsets,
+    UList<long long>& faces,
+    UList<long long>& facesOffsets,
+    foamVtkMeshMaps& maps
+) const
+{
+    presizeMaps(maps);
+
+    populateArrays
+    (
+        mesh,
+        *this,
+        cellTypes,
+        connectivity,
+        offsets,
+        faces,
+        facesOffsets,
+        contentType::INTERNAL,
+        maps.cellMap(),
+        maps.additionalIds()
+    );
+}
+
+
+void Foam::foamVtuSizing::populateInternal
+(
+    const polyMesh& mesh,
+    UList<uint8_t>& cellTypes,
+    UList<int>& connectivity,
+    UList<int>& offsets,
+    UList<int>& faces,
+    UList<int>& facesOffsets,
+    UList<label>& cellMap,
+    UList<label>& addPointsIds
+) const
+{
+    populateArrays
+    (
+        mesh,
+        *this,
+        cellTypes,
+        connectivity,
+        offsets,
+        faces,
+        facesOffsets,
+        contentType::INTERNAL,
+        cellMap,
+        addPointsIds
+    );
+}
+
+
+void Foam::foamVtuSizing::populateInternal
+(
+    const polyMesh& mesh,
+    UList<uint8_t>& cellTypes,
+    UList<long>& connectivity,
+    UList<long>& offsets,
+    UList<long>& faces,
+    UList<long>& facesOffsets,
+    UList<label>& cellMap,
+    UList<label>& addPointsIds
+) const
+{
+    populateArrays
+    (
+        mesh,
+        *this,
+        cellTypes,
+        connectivity,
+        offsets,
+        faces,
+        facesOffsets,
+        contentType::INTERNAL,
+        cellMap,
+        addPointsIds
+    );
+}
+
+
+void Foam::foamVtuSizing::populateInternal
+(
+    const polyMesh& mesh,
+    UList<uint8_t>& cellTypes,
+    UList<long long>& connectivity,
+    UList<long long>& offsets,
+    UList<long long>& faces,
+    UList<long long>& facesOffsets,
+    UList<label>& cellMap,
+    UList<label>& addPointsIds
+) const
+{
+    populateArrays
+    (
+        mesh,
+        *this,
+        cellTypes,
+        connectivity,
+        offsets,
+        faces,
+        facesOffsets,
+        contentType::INTERNAL,
+        cellMap,
+        addPointsIds
+    );
+}
+
+
+void Foam::foamVtuSizing::clear()
+{
+    decompose_   = false;
+    nCells_      = 0;
+    nPoints_     = 0;
+    nVertLabels_ = 0;
+
+    nFaceLabels_ = 0;
+    nCellsPoly_  = 0;
+    nVertPoly_   = 0;
+
+    nAddCells_   = 0;
+    nAddPoints_  = 0;
+    nAddVerts_   = 0;
+}
+
+
+void Foam::foamVtuSizing::info(Ostream& os) const
+{
+    os  << "nFieldCells:" << nFieldCells();
+    if (nAddCells_)
+    {
+        os  << " (" << nCells_
+            << "+" << nAddCells_ << ")";
+    }
+    else
+    {
+        os  << " (poly:" << nCellsPoly_ << ")";
+    }
+
+    os  << " nFieldPoints:" << nFieldPoints();
+    if (nAddPoints_)
+    {
+        os  << " (" << nPoints_ << "+" << nAddPoints_ << ")";
+    }
+
+    os  << " nVertLabels:" << (nVertLabels_ + nAddVerts_);
+    if (nAddVerts_)
+    {
+        os  << " (" << nVertLabels_ << "+" << nAddVerts_ << ")";
+    }
+    else if (nVertPoly_)
+    {
+        os  << " (poly:" << nVertPoly_ << ")";
+    }
+
+    os << " nFaceLabels:" << nFaceLabels_;
+    os << " legacy-count:" << sizeLegacy();
+}
+
+
+// * * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * //
+
+bool Foam::foamVtuSizing::operator==(const foamVtuSizing& rhs) const
+{
+    return
+    (
+        decompose()   == rhs.decompose()
+     && nCells()      == rhs.nCells()
+     && nPoints()     == rhs.nPoints()
+     && nVertLabels() == rhs.nVertLabels()
+     && nFaceLabels() == rhs.nFaceLabels()
+     && nCellsPoly()  == rhs.nCellsPoly()
+     && nVertPoly()   == rhs.nVertPoly()
+     && nAddCells()   == rhs.nAddCells()
+     && nAddPoints()  == rhs.nAddPoints()
+     && nAddVerts()   == rhs.nAddVerts()
+    );
+}
+
+
+bool Foam::foamVtuSizing::operator!=(const foamVtuSizing& rhs) const
+{
+    return !operator==(rhs);
+}
+
+
+// ************************************************************************* //
diff --git a/src/conversion/vtk/part/foamVtuSizing.H b/src/conversion/vtk/part/foamVtuSizing.H
new file mode 100644
index 0000000000..a5b1d98be6
--- /dev/null
+++ b/src/conversion/vtk/part/foamVtuSizing.H
@@ -0,0 +1,408 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2016-2017 OpenCFD Ltd.
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::foamVtuSizing
+
+Description
+    Sizing descriptions and routines for transcribing an OpenFOAM volume mesh
+    into a VTK unstructured grid, with possible decomposition of polyhedral
+    cells into primitive cell types.
+
+    This class is intended to populate externally allocated arrays with content
+    that is compatible with what VTK expects. This approach allows an improved
+    separation of the OpenFOAM mesh description and the storage, and allows
+    support of alternative storage containers (eg, std::vector, vtkDataArray).
+    The ideal goal would be a zero-copy mechanism, but this does not work for
+    several reasons:
+    \par
+    - OpenFOAM and VTK have different point ordering for prism
+    - polyhedral decomposition
+    - face-stream are required for VTK
+    - VTK internal storage includes list size as part of the data
+    - VTK includes storage may be a different base size (eg, long long)
+      compared to the OpenFOAM label.
+
+    \par Data Entries (slots)
+
+    These are the storage entries normally associate with each output-type:
+    \table
+        legacy output
+        \c types    | vtk cell type (1-255)
+        \c cells    | nLabels and unique vertex labels used by the cell, or
+                    | [nLabels nFaces, nFace0Pts, id1, id2, ..., nFace1Pts, id1, id2, ...]
+    \endtable
+
+    \table
+        xml output
+        \c types        | vtk cell type (1-255)
+        \c connectivity | unique vertex labels used by the cell
+        \c offsets      | end offset for each of \c connectivity
+        \c faces        | face stream for polyhedral cells
+                        | [nFaces, nFace0Pts, id1, id2, ..., nFace1Pts, id1, id2, ...]
+        \c faceoffsets  | end offset for each of \c faces, with -1 for primitive cells
+    \endtable
+
+    \table
+        internal storage
+        \c types        | vtk cell type (1-255)
+        \c connectivity | nLabels and unique vertex labels used by the cell
+        \c location     | begin location for each of \c connectivity
+        \c faces        | face stream for polyhedral cells
+                        | [nFaces, nFace0Pts, id1, id2, ..., nFace1Pts, id1, id2, ...]
+        \c facelocation | begin location for each of \c faces, with -1 for primitive cells
+    \endtable
+
+    The VTK storage concept for "connectivity" and "faces" somewhat resemble
+    a CompactListList.
+
+SourceFiles
+    foamVtuSizing.C
+    foamVtuSizingI.H
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef foamVtuSizing_H
+#define foamVtuSizing_H
+
+#include "label.H"
+#include "labelList.H"
+#include "foamVtkMeshMaps.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// Forward declaration of classes
+class polyMesh;
+
+/*---------------------------------------------------------------------------*\
+                        Class foamVtuSizing Declaration
+\*---------------------------------------------------------------------------*/
+
+class foamVtuSizing
+{
+public:
+
+    // Public data
+
+        //- Types of content that the storage may represent
+        enum contentType
+        {
+            LEGACY,     //!< Legacy VTK content
+            XML,        //!< XML (VTU) content
+            INTERNAL    //!< Internal vtkUnstructuredGrid content
+        };
+
+        //- The storage 'slots' required
+        enum slotType
+        {
+            CELLS,         //!< Cell connectivity (ALL)
+            CELLS_OFFSETS, //!< Begin (XML) or end (INTERNAL) offsets into cells
+            FACES,         //!< Face-stream (XML, INTERNAL)
+            FACES_OFFSETS  //!< Begin (XML) or end (INTERNAL) offsets into faces
+        };
+
+private:
+
+    // Private Member Data
+
+        //- Polyhedral decomposition requested
+        bool decompose_;
+
+        //- Number of cells in the mesh
+        label nCells_;
+
+        //- Number of points in the mesh
+        label nPoints_;
+
+        //- Number of vertex labels to represent the mesh
+        label nVertLabels_;
+
+      // Polyhedrals
+
+        //- Number of polyhedral face labels for the mesh
+        label nFaceLabels_;
+
+        //- Number of polyhedral cells (informational)
+        label nCellsPoly_;
+
+        //- Number of vertex labels used by polyhedrals
+        label nVertPoly_;
+
+      // Decomposed polyhedrals
+
+        //- Number of additional (decomposed) cells for the mesh
+        label nAddCells_;
+
+        //- Number of additional (decomposed) points for the mesh
+        label nAddPoints_;
+
+        //- Number of additional (decomposed) vertices for the mesh
+        label nAddVerts_;
+
+
+    // Private Member Functions
+
+        //- set-size for cellMap and additionalIds
+        void presizeMaps(foamVtkMeshMaps& maps) const;
+
+        //- Populate lists for internal VTK representation
+        template<class LabelType, class LabelType2>
+        static void populateArrays
+        (
+            const polyMesh& mesh,
+            const foamVtuSizing& sizing,
+            UList<uint8_t>& cellTypes,
+            UList<LabelType>& vertLabels,
+            UList<LabelType>& vertOffset,
+            UList<LabelType>& faceLabels,
+            UList<LabelType>& faceOffset,
+            const enum contentType output,
+            UList<LabelType2>& cellMap,
+            UList<LabelType2>& addPointsIds
+        );
+
+        // Allow default bitwise copy/assignment
+
+public:
+
+    // Constructors
+
+        //- Construct null.
+        foamVtuSizing();
+
+        //- Construct sizes by analyzing the mesh,
+        //  optionally with polyhedral decomposition.
+        foamVtuSizing(const polyMesh& mesh, const bool decompose=false);
+
+
+    //- Destructor
+    ~foamVtuSizing();
+
+
+    // Member Functions
+
+      // Edit
+
+        //- Construct sizes by analyzing the mesh,
+        //  optionally with polyhedral decomposition.
+        void reset(const polyMesh& mesh, const bool decompose=false);
+
+        //- Reset all sizes to zero.
+        void clear();
+
+
+      // Access
+
+        //- Query the decompose flag
+        inline bool decompose() const;
+
+        //- Number of cells for the mesh
+        inline label nCells() const;
+
+        //- Number of points for the mesh
+        inline label nPoints() const;
+
+        //- Number of vertex labels for the mesh
+        inline label nVertLabels() const;
+
+        //- Number of polyhedral face labels for the mesh
+        inline label nFaceLabels() const;
+
+        //- Number of polyhedral cells for the mesh
+        inline label nCellsPoly() const;
+
+        //- Number of vertex labels for polyhedral cells of the mesh
+        inline label nVertPoly() const;
+
+        //- Number of additional (decomposed) cells for the mesh
+        inline label nAddCells() const;
+
+        //- Number of additional (decomposed) points for the mesh
+        inline label nAddPoints() const;
+
+        //- Number of additional (decomposed) vertices for the mesh
+        inline label nAddVerts() const;
+
+
+        //- Number of field cells = nCells + nAddCells
+        inline label nFieldCells() const;
+
+        //- Number of field points = nPoints + nAddPoints
+        inline label nFieldPoints() const;
+
+
+      // Derived sizes
+
+        //- Return the required size for the storage slot
+        label slotSize
+        (
+            const enum contentType output,
+            const enum slotType slot
+        ) const;
+
+
+        //- The calculated size for legacy storage
+        inline label sizeLegacy() const;
+
+        //- The calculated size for legacy storage of the specified slot
+        inline label sizeLegacy(const enum slotType slot) const;
+
+        //- The calculated size for xml storage of the specified slot
+        inline label sizeXml(const enum slotType slot) const;
+
+        //- The calculated size for vtk-internal storage of the specified slot
+        inline label sizeInternal(const enum slotType slot) const;
+
+
+      // Utilty routines
+
+        //- Populate lists for Legacy output
+        void populateLegacy
+        (
+            const polyMesh& mesh,
+            UList<uint8_t>& cellTypes,
+            UList<label>& connectivity,
+            foamVtkMeshMaps& maps
+        ) const;
+
+        //- Populate lists for XML output
+        void populateXml
+        (
+            const polyMesh& mesh,
+            UList<uint8_t>& cellTypes,
+            UList<label>& connectivity,
+            UList<label>& offsets,
+            UList<label>& faces,
+            UList<label>& facesOffsets,
+            foamVtkMeshMaps& maps
+        ) const;
+
+        //- Populate lists for Internal VTK format
+        void populateInternal
+        (
+            const polyMesh& mesh,
+            UList<uint8_t>& cellTypes,
+            UList<int>& connectivity,
+            UList<int>& offsets,
+            UList<int>& faces,
+            UList<int>& facesOffsets,
+            foamVtkMeshMaps& maps
+        ) const;
+
+        //- Populate lists for Internal VTK format
+        void populateInternal
+        (
+            const polyMesh& mesh,
+            UList<uint8_t>& cellTypes,
+            UList<long>& connectivity,
+            UList<long>& offsets,
+            UList<long>& faces,
+            UList<long>& facesOffsets,
+            foamVtkMeshMaps& maps
+        ) const;
+
+        //- Populate lists for Internal VTK format
+        void populateInternal
+        (
+            const polyMesh& mesh,
+            UList<uint8_t>& cellTypes,
+            UList<long long>& connectivity,
+            UList<long long>& offsets,
+            UList<long long>& faces,
+            UList<long long>& facesOffsets,
+            foamVtkMeshMaps& maps
+        ) const;
+
+        //- Populate lists for Internal VTK format
+        void populateInternal
+        (
+            const polyMesh& mesh,
+            UList<uint8_t>& cellTypes,
+            UList<int>& connectivity,
+            UList<int>& offsets,
+            UList<int>& faces,
+            UList<int>& facesOffsets,
+            UList<label>& cellMap,
+            UList<label>& addPointsIds
+        ) const;
+
+        //- Populate lists for Internal VTK format
+        void populateInternal
+        (
+            const polyMesh& mesh,
+            UList<uint8_t>& cellTypes,
+            UList<long>& connectivity,
+            UList<long>& offsets,
+            UList<long>& faces,
+            UList<long>& facesOffsets,
+            UList<label>& cellMap,
+            UList<label>& addPointsIds
+        ) const;
+
+        //- Populate lists for Internal VTK format
+        void populateInternal
+        (
+            const polyMesh& mesh,
+            UList<uint8_t>& cellTypes,
+            UList<long long>& connectivity,
+            UList<long long>& offsets,
+            UList<long long>& faces,
+            UList<long long>& facesOffsets,
+            UList<label>& cellMap,
+            UList<label>& addPointsIds
+        ) const;
+
+
+      // Write
+
+        //- Report some information
+        void info(Ostream& os) const;
+
+
+      // Member Operators
+
+        //- Test equality
+        bool operator==(const foamVtuSizing& rhs) const;
+
+        //- Test inequality
+        bool operator!=(const foamVtuSizing& rhs) const;
+
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#include "foamVtuSizingI.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/conversion/vtk/part/foamVtuSizingI.H b/src/conversion/vtk/part/foamVtuSizingI.H
new file mode 100644
index 0000000000..25bee49abc
--- /dev/null
+++ b/src/conversion/vtk/part/foamVtuSizingI.H
@@ -0,0 +1,135 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2017 OpenCFD Ltd.
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "foamVtuSizing.H"
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+inline bool Foam::foamVtuSizing::decompose() const
+{
+    return decompose_;
+}
+
+
+inline Foam::label Foam::foamVtuSizing::nCells() const
+{
+    return nCells_;
+}
+
+
+inline Foam::label Foam::foamVtuSizing::nPoints() const
+{
+    return nPoints_;
+}
+
+
+inline Foam::label Foam::foamVtuSizing::nVertLabels() const
+{
+    return nVertLabels_;
+}
+
+
+inline Foam::label Foam::foamVtuSizing::nFaceLabels() const
+{
+    return nFaceLabels_;
+}
+
+
+inline Foam::label Foam::foamVtuSizing::nCellsPoly() const
+{
+    return nCellsPoly_;
+}
+
+
+inline Foam::label Foam::foamVtuSizing::nVertPoly() const
+{
+    return nVertPoly_;
+}
+
+
+inline Foam::label Foam::foamVtuSizing::nAddCells() const
+{
+    return nAddCells_;
+}
+
+
+inline Foam::label Foam::foamVtuSizing::nAddPoints() const
+{
+    return nAddPoints_;
+}
+
+
+inline Foam::label Foam::foamVtuSizing::nAddVerts() const
+{
+    return nAddVerts_;
+}
+
+
+inline Foam::label Foam::foamVtuSizing::nFieldCells() const
+{
+    return nCells_ + nAddCells_;
+}
+
+
+inline Foam::label Foam::foamVtuSizing::nFieldPoints() const
+{
+    return nPoints_ + nAddPoints_;
+}
+
+
+inline Foam::label Foam::foamVtuSizing::sizeLegacy() const
+{
+    return slotSize(contentType::LEGACY, slotType::CELLS);
+}
+
+
+inline Foam::label Foam::foamVtuSizing::sizeLegacy
+(
+    const enum slotType slot
+) const
+{
+    return slotSize(contentType::LEGACY, slot);
+}
+
+
+inline Foam::label Foam::foamVtuSizing::sizeXml
+(
+    const enum slotType slot
+) const
+{
+    return slotSize(contentType::XML, slot);
+}
+
+
+inline Foam::label Foam::foamVtuSizing::sizeInternal
+(
+    const enum slotType slot
+) const
+{
+    return slotSize(contentType::INTERNAL, slot);
+}
+
+
+// ************************************************************************* //
diff --git a/src/conversion/vtk/part/foamVtuSizingTemplates.C b/src/conversion/vtk/part/foamVtuSizingTemplates.C
new file mode 100644
index 0000000000..a30f88de85
--- /dev/null
+++ b/src/conversion/vtk/part/foamVtuSizingTemplates.C
@@ -0,0 +1,670 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2016-2017 OpenCFD Ltd.
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "foamVtuSizing.H"
+#include "foamVtkCore.H"
+#include "polyMesh.H"
+#include "cellShape.H"
+#include "cellModeller.H"
+
+// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
+
+template<class LabelType, class LabelType2>
+void Foam::foamVtuSizing::populateArrays
+(
+    const polyMesh& mesh,
+    const foamVtuSizing& sizing,
+    UList<uint8_t>& cellTypes,
+    UList<LabelType>& vertLabels,
+    UList<LabelType>& vertOffset,
+    UList<LabelType>& faceLabels,
+    UList<LabelType>& faceOffset,
+    const enum contentType output,
+    UList<LabelType2>& cellMap,
+    UList<LabelType2>& addPointsIds
+)
+{
+    using vtkTypes = fileFormats::foamVtkCore::vtkTypes;
+
+    // STAGE 1: Verify storage sizes
+
+    if (cellTypes.size() != sizing.nFieldCells())
+    {
+        FatalErrorInFunction
+            << " cellTypes size=" << cellTypes.size()
+            << " expected " << sizing.nFieldCells()
+            << exit(FatalError);
+    }
+
+    if (cellMap.size() != sizing.nFieldCells())
+    {
+        FatalErrorInFunction
+            << " cellMap size=" << cellMap.size()
+            << " expected " << sizing.nFieldCells()
+            << exit(FatalError);
+    }
+
+    if (addPointsIds.size() != sizing.nAddPoints())
+    {
+        FatalErrorInFunction
+            << " addPointsIds size=" << addPointsIds.size()
+            << " expected " << sizing.nAddPoints()
+            << exit(FatalError);
+    }
+
+    // Prefix vertLabels with the size too?
+    // Also use as the size of the prefixed information
+    const int prefix = (output != contentType::XML) ? 1 : 0;
+
+    switch (output)
+    {
+        case contentType::LEGACY:
+        {
+            if (vertLabels.size() != sizing.sizeLegacy())
+            {
+                FatalErrorInFunction
+                    << " legacy size=" << vertLabels.size()
+                    << " expected " << sizing.sizeLegacy()
+                    << exit(FatalError);
+            }
+            break;
+        }
+        case contentType::XML:
+        {
+            // XML uses connectivity/offset pair.
+            if
+            (
+                vertLabels.size()
+             != sizing.sizeXml(slotType::CELLS)
+            )
+            {
+                FatalErrorInFunction
+                    << " connectivity size=" << vertLabels.size()
+                    << " expected "
+                    << sizing.sizeXml(slotType::CELLS)
+                    << exit(FatalError);
+            }
+
+            if
+            (
+                vertOffset.size()
+             != sizing.sizeXml(slotType::CELLS_OFFSETS)
+            )
+            {
+                FatalErrorInFunction
+                    << " offsets size=" << vertOffset.size()
+                    << " expected "
+                    << sizing.sizeXml(slotType::CELLS_OFFSETS)
+                    << exit(FatalError);
+            }
+
+            if (sizing.nFaceLabels())
+            {
+                if
+                (
+                    faceLabels.size()
+                 != sizing.sizeXml(slotType::FACES)
+                )
+                {
+                    FatalErrorInFunction
+                        << " faces size=" << faceLabels.size()
+                        << " expected "
+                        << sizing.sizeXml(slotType::FACES)
+                        << exit(FatalError);
+                }
+
+                if
+                (
+                    faceOffset.size()
+                 != sizing.sizeXml(slotType::FACES_OFFSETS)
+                )
+                {
+                    FatalErrorInFunction
+                        << " facesOffsets size=" << faceOffset.size()
+                        << " expected "
+                        << sizing.sizeXml(slotType::FACES_OFFSETS)
+                        << exit(FatalError);
+                }
+            }
+            break;
+        }
+        case contentType::INTERNAL:
+        {
+            // VTK-internal connectivity/offset pair.
+            if
+            (
+                vertLabels.size()
+             != sizing.sizeInternal(slotType::CELLS)
+            )
+            {
+                FatalErrorInFunction
+                    << " connectivity size=" << vertLabels.size()
+                    << " expected "
+                    << sizing.sizeInternal(slotType::CELLS)
+                    << exit(FatalError);
+            }
+
+            if
+            (
+                vertOffset.size()
+             != sizing.sizeInternal(slotType::CELLS_OFFSETS)
+            )
+            {
+                FatalErrorInFunction
+                    << " offsets size=" << vertOffset.size()
+                    << " expected "
+                    << sizing.sizeInternal(slotType::CELLS_OFFSETS)
+                    << exit(FatalError);
+            }
+
+            if (sizing.nFaceLabels())
+            {
+                if
+                (
+                    faceLabels.size()
+                 != sizing.sizeInternal(slotType::FACES)
+                )
+                {
+                    FatalErrorInFunction
+                        << " faces size=" << faceLabels.size()
+                        << " expected "
+                        << sizing.sizeInternal(slotType::FACES)
+                        << exit(FatalError);
+                }
+
+                if
+                (
+                    faceOffset.size()
+                 != sizing.sizeInternal(slotType::FACES_OFFSETS)
+                )
+                {
+                    FatalErrorInFunction
+                        << " facesOffsets size=" << faceOffset.size()
+                        << " expected "
+                        << sizing.sizeInternal(slotType::FACES_OFFSETS)
+                        << exit(FatalError);
+                }
+            }
+            break;
+        }
+    }
+
+
+    faceOffset = -1;
+
+    const cellModel& tet      = *(cellModeller::lookup("tet"));
+    const cellModel& pyr      = *(cellModeller::lookup("pyr"));
+    const cellModel& prism    = *(cellModeller::lookup("prism"));
+    const cellModel& wedge    = *(cellModeller::lookup("wedge"));
+    const cellModel& tetWedge = *(cellModeller::lookup("tetWedge"));
+    const cellModel& hex      = *(cellModeller::lookup("hex"));
+
+    const cellShapeList& shapes = mesh.cellShapes();
+
+    // face owner is needed to determine the face orientation
+    const labelList& owner = mesh.faceOwner();
+
+    // Unique vertex labels per polyhedral
+    HashSet<label> hashUniqId(2*256);
+
+    // Index into vertLabels, faceLabels for normal cells
+    label nVertLabels = 0;
+    label nFaceLabels = 0;
+
+    // Index into vertLabels for decomposed polys
+    label nVertDecomp = sizing.nVertLabels() + prefix*sizing.nCells();
+
+    // Placement of decomposed cells
+    label nCellDecomp = mesh.nCells();
+
+    // Placement of additional point labels
+    label nPointDecomp = 0;
+
+    // Non-decomposed polyhedral are represented as a face-stream.
+    // For legacy format, this stream replaces the normal connectivity
+    // information. Use references to alias where the face output should land.
+
+    UList<LabelType>& faceOutput =
+    (
+        output == contentType::LEGACY
+      ? vertLabels
+      : faceLabels
+    );
+
+    label& faceIndexer =
+    (
+        output == contentType::LEGACY
+      ? nVertLabels
+      : nFaceLabels
+    );
+
+    // ===========================================
+    // STAGE 2: Rewrite in VTK form
+    // During this stage, the vertOffset contains the *size* associated with
+    // the per-cell vertLabels entries, and the faceOffset contains the *size*
+    // associated with the per-cell faceLabels.
+
+    forAll(shapes, celli)
+    {
+        const cellShape& shape = shapes[celli];
+        const cellModel& model = shape.model();
+
+        cellMap[celli] = celli;
+
+        if (model == tet)
+        {
+            cellTypes[celli] = vtkTypes::VTK_TETRA;
+            if (vertOffset.size())
+            {
+                vertOffset[celli] = shape.size();
+            }
+            if (prefix)
+            {
+                vertLabels[nVertLabels++] = shape.size();
+            }
+
+            forAll(shape, i)
+            {
+                vertLabels[nVertLabels++] = shape[i];
+            }
+        }
+        else if (model == pyr)
+        {
+            cellTypes[celli] = vtkTypes::VTK_PYRAMID;
+            if (vertOffset.size())
+            {
+                vertOffset[celli] = shape.size();
+            }
+            if (prefix)
+            {
+                vertLabels[nVertLabels++] = shape.size();
+            }
+
+            forAll(shape, i)
+            {
+                vertLabels[nVertLabels++] = shape[i];
+            }
+        }
+        else if (model == hex)
+        {
+            cellTypes[celli] = vtkTypes::VTK_HEXAHEDRON;
+            if (vertOffset.size())
+            {
+                vertOffset[celli] = shape.size();
+            }
+            if (prefix)
+            {
+                vertLabels[nVertLabels++] = shape.size();
+            }
+
+            forAll(shape, i)
+            {
+                vertLabels[nVertLabels++] = shape[i];
+            }
+        }
+        else if (model == prism)
+        {
+            cellTypes[celli] = vtkTypes::VTK_WEDGE;
+            if (vertOffset.size())
+            {
+                vertOffset[celli] = shape.size();
+            }
+            if (prefix)
+            {
+                vertLabels[nVertLabels++] = shape.size();
+            }
+
+            // VTK_WEDGE triangles point outwards (swap 1<->2, 4<->5)
+            vertLabels[nVertLabels++] = shape[0];
+            vertLabels[nVertLabels++] = shape[2];
+            vertLabels[nVertLabels++] = shape[1];
+            vertLabels[nVertLabels++] = shape[3];
+            vertLabels[nVertLabels++] = shape[5];
+            vertLabels[nVertLabels++] = shape[4];
+        }
+        else if (model == tetWedge && sizing.decompose())
+        {
+            // Treat as squeezed prism
+            cellTypes[celli] = vtkTypes::VTK_WEDGE;
+            if (vertOffset.size())
+            {
+                vertOffset[celli] = 6;
+            }
+            if (prefix)
+            {
+                vertLabels[nVertLabels++] = 6;
+            }
+
+            vertLabels[nVertLabels++] = shape[0];
+            vertLabels[nVertLabels++] = shape[2];
+            vertLabels[nVertLabels++] = shape[1];
+            vertLabels[nVertLabels++] = shape[3];
+            vertLabels[nVertLabels++] = shape[4];
+            vertLabels[nVertLabels++] = shape[3];
+        }
+        else if (model == wedge && sizing.decompose())
+        {
+            // Treat as squeezed hex
+            cellTypes[celli] = vtkTypes::VTK_HEXAHEDRON;
+            if (vertOffset.size())
+            {
+                vertOffset[celli] = 8;
+            }
+            if (prefix)
+            {
+                vertLabels[nVertLabels++] = 8;
+            }
+
+            vertLabels[nVertLabels++] = shape[0];
+            vertLabels[nVertLabels++] = shape[1];
+            vertLabels[nVertLabels++] = shape[2];
+            vertLabels[nVertLabels++] = shape[2];
+            vertLabels[nVertLabels++] = shape[3];
+            vertLabels[nVertLabels++] = shape[4];
+            vertLabels[nVertLabels++] = shape[5];
+            vertLabels[nVertLabels++] = shape[6];
+        }
+        else if (sizing.decompose())
+        {
+            // Polyhedral cell - decompose into tet/pyr.
+
+            // Ensure we have the correct orientation for the base of the
+            // primitive cell shape.
+            // If the cell is face owner, the orientation needs to be flipped
+            // to avoid defining negative cells.
+            // VTK may not care, but we'll do it anyhow for safety.
+
+            // Mapping from additional point to cell, and the new vertex from
+            // the cell-centre
+            const label newVertexLabel = mesh.nPoints() + nPointDecomp;
+
+            addPointsIds[nPointDecomp++] = celli;
+
+            // Whether to insert cell in place of original or not.
+            bool first = true;
+
+            const labelList& cFaces = mesh.cells()[celli];
+            forAll(cFaces, cFaceI)
+            {
+                const face& f = mesh.faces()[cFaces[cFaceI]];
+                const bool isOwner = (owner[cFaces[cFaceI]] == celli);
+
+                // Count triangles/quads in decomposition
+                label nTria = 0, nQuad = 0;
+                f.nTrianglesQuads(mesh.points(), nTria, nQuad);
+
+                // Do actual decomposition
+                faceList faces3(nTria);
+                faceList faces4(nQuad);
+                nTria = 0, nQuad = 0;
+                f.trianglesQuads(mesh.points(), nTria, nQuad, faces3, faces4);
+
+                forAll(faces4, fci)
+                {
+                    // Quad becomes a pyramid
+                    const face& quad = faces4[fci];
+                    const label nShapePoints = 5;  // pyr (5 vertices)
+
+                    label celLoc, vrtLoc;
+                    if (first)
+                    {
+                        first = false;
+                        celLoc = celli;
+                        vrtLoc = nVertLabels;
+                        nVertLabels += prefix + nShapePoints;
+                    }
+                    else
+                    {
+                        celLoc = nCellDecomp++;
+                        vrtLoc = nVertDecomp;
+                        nVertDecomp += prefix + nShapePoints;
+                    }
+                    cellMap[celLoc] = celli;
+
+                    cellTypes[celLoc] = vtkTypes::VTK_PYRAMID;
+                    if (vertOffset.size())
+                    {
+                        vertOffset[celLoc] = nShapePoints;
+                    }
+                    if (prefix)
+                    {
+                        vertLabels[vrtLoc++] = nShapePoints;
+                    }
+
+                    // See note above about the orientation.
+                    if (isOwner)
+                    {
+                        vertLabels[vrtLoc++] = quad[3];
+                        vertLabels[vrtLoc++] = quad[2];
+                        vertLabels[vrtLoc++] = quad[1];
+                        vertLabels[vrtLoc++] = quad[0];
+                    }
+                    else
+                    {
+                        vertLabels[vrtLoc++] = quad[0];
+                        vertLabels[vrtLoc++] = quad[1];
+                        vertLabels[vrtLoc++] = quad[2];
+                        vertLabels[vrtLoc++] = quad[3];
+                    }
+
+                    vertLabels[vrtLoc++] = newVertexLabel; // apex
+                }
+
+                forAll(faces3, fci)
+                {
+                    // Triangle becomes a tetrahedral
+                    const face& tria = faces3[fci];
+                    const label nShapePoints = 4;  // tet (4 vertices)
+
+                    label celLoc, vrtLoc;
+                    if (first)
+                    {
+                        first = false;
+                        celLoc = celli;
+                        vrtLoc = nVertLabels;
+                        nVertLabels += prefix + nShapePoints;
+                    }
+                    else
+                    {
+                        celLoc = nCellDecomp++;
+                        vrtLoc = nVertDecomp;
+                        nVertDecomp += prefix + nShapePoints;
+                    }
+                    cellMap[celLoc] = celli;
+
+                    cellTypes[celLoc] = vtkTypes::VTK_TETRA;
+                    if (vertOffset.size())
+                    {
+                        vertOffset[celLoc] = nShapePoints;
+                    }
+                    if (prefix)
+                    {
+                        vertLabels[vrtLoc++] = nShapePoints;
+                    }
+
+                    cellTypes[celLoc] = vtkTypes::VTK_TETRA;
+
+                    // See note above about the orientation.
+                    if (isOwner)
+                    {
+                        vertLabels[vrtLoc++] = tria[2];
+                        vertLabels[vrtLoc++] = tria[1];
+                        vertLabels[vrtLoc++] = tria[0];
+                    }
+                    else
+                    {
+                        vertLabels[vrtLoc++] = tria[0];
+                        vertLabels[vrtLoc++] = tria[1];
+                        vertLabels[vrtLoc++] = tria[2];
+                    }
+                    vertLabels[vrtLoc++] = newVertexLabel; // apex
+                }
+            }
+        }
+        else
+        {
+            // Polyhedral cell - not decomposed
+            hashUniqId.clear();  // unique node ids used (XML, INTERNAL)
+
+            // face-stream
+            //   [nFaces, nFace0Pts, id1, id2, ..., nFace1Pts, id1, id2, ...]
+            cellTypes[celli] = vtkTypes::VTK_POLYHEDRON;
+            const labelList& cFaces = mesh.cells()[celli];
+
+            const label startLabel = faceIndexer;
+
+            if (output == contentType::LEGACY)
+            {
+                faceOutput[startLabel] = 0; // placeholder for size
+                ++faceIndexer;
+            }
+
+            faceOutput[faceIndexer++] = cFaces.size();
+
+            forAll(cFaces, cFaceI)
+            {
+                const face& f = mesh.faces()[cFaces[cFaceI]];
+                const bool isOwner = (owner[cFaces[cFaceI]] == celli);
+
+                forAll(f, fp)
+                {
+                    hashUniqId.insert(f[fp]);
+                }
+
+                // number of labels for this face
+                faceOutput[faceIndexer++] = f.size();
+
+                if (isOwner)
+                {
+                    forAll(f, fp)
+                    {
+                        faceOutput[faceIndexer++] = f[fp];
+                    }
+                }
+                else
+                {
+                    // fairly immaterial if we reverse the list
+                    // or use face::reverseFace()
+                    forAllReverse(f, fp)
+                    {
+                        faceOutput[faceIndexer++] = f[fp];
+                    }
+                }
+            }
+
+            if (output == contentType::LEGACY)
+            {
+                // Update size for legacy face stream
+                faceOutput[startLabel] = (faceIndexer - startLabel);
+            }
+            else
+            {
+                // Size for face stream
+                faceOffset[celli] = (faceIndexer - startLabel);
+
+                vertOffset[celli] = hashUniqId.size();
+                if (prefix)
+                {
+                    vertLabels[nVertLabels++] = hashUniqId.size();
+                }
+
+                const labelList uniq = hashUniqId.sortedToc();
+                forAll(uniq, i)
+                {
+                    vertLabels[nVertLabels++] = uniq[i];
+                }
+            }
+        }
+    }
+
+    // ===========================================
+    // STAGE 3: Adjust vertOffset for all cells
+    // A second pass is needed for several reasons.
+    // - Additional (decomposed) cells are placed out of sequence
+    // - Internal format has the size prefixed, XML format does not.
+    // - XML format expects end-offsets, Internal expects begin-offsets
+
+    switch (output)
+    {
+        case contentType::LEGACY: // nothing to do
+            break;
+
+        case contentType::XML:
+        {
+            // No prefix, determine end offsets
+            // vertOffset[0] already contains its size
+            for (label i = 1; i < vertOffset.size(); ++i)
+            {
+                vertOffset[i] += vertOffset[i-1];
+            }
+
+            if (sizing.nFaceLabels())
+            {
+                // End face offsets, leaving -1 untouched
+                label prev = 0;
+                forAll(faceOffset, i)
+                {
+                    const label sz = faceOffset[i];
+                    if (sz > 0)
+                    {
+                        prev += sz;
+                        faceOffset[i] = prev;
+                    }
+                }
+            }
+            break;
+        }
+        case contentType::INTERNAL:
+        {
+            // Has prefix, determine begin offsets
+            label beg = 0;
+            forAll(vertOffset, i)
+            {
+                const label sz = vertOffset[i];
+                vertOffset[i] = beg;
+                beg += 1 + sz;
+            }
+
+            // Begin face offsets, leaving -1 untouched
+            if (sizing.nFaceLabels())
+            {
+                beg = 0;
+                forAll(faceOffset, i)
+                {
+                    const label sz = faceOffset[i];
+                    if (sz > 0)
+                    {
+                        faceOffset[i] = beg;
+                        beg += sz;
+                    }
+                }
+            }
+            break;
+        }
+    }
+}
+
+
+// ************************************************************************* //

From c685f70c820011a0cc013633635c11ccfa1c8bc5 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Fri, 19 May 2017 12:11:49 +0200
Subject: [PATCH 02/27] ENH: rationalize VTK output classes and structures

- relocated to dedicated foamVtkOutput namespace. Make it easier to
  obtain a formatter directly without a foamVtkOutput::outputOptions.
  Make the logic clear within outputOptions (avoid previous, cryptic
  bit masking). foamVtkOutput::legacy also becomes a namespace instead
  of a class. Relocate commonly used things into src/fileFormats, leave
  volField-related parts in src/conversion.
---
 src/conversion/Make/files                     |   1 -
 src/conversion/vtk/output/foamVtkOutput.H     | 231 -----------------
 .../vtk/output/foamVtkOutputFields.H          | 105 ++++++++
 .../vtk/output/foamVtkOutputFieldsTemplates.C | 107 ++++++++
 src/fileFormats/Make/files                    |  12 +-
 .../vtk/format/foamVtkAppendBase64Formatter.C |   8 +-
 .../vtk/format/foamVtkAppendBase64Formatter.H |  23 +-
 .../vtk/format/foamVtkAppendRawFormatter.C    |  28 +--
 .../vtk/format/foamVtkAppendRawFormatter.H    |  27 +-
 .../vtk/format/foamVtkAsciiFormatter.C        |  34 +--
 .../vtk/format/foamVtkAsciiFormatter.H        |  30 ++-
 .../vtk/format/foamVtkBase64Formatter.C       |  10 +-
 .../vtk/format/foamVtkBase64Formatter.H       |  24 +-
 .../vtk/format/foamVtkBase64Layer.C           |  29 ++-
 .../vtk/format/foamVtkBase64Layer.H           |  11 +-
 src/fileFormats/vtk/format/foamVtkFormatter.C |  80 +++---
 src/fileFormats/vtk/format/foamVtkFormatter.H |  99 +++++---
 .../vtk/format/foamVtkFormatterTemplates.C    |  13 +-
 ...tionsI.H => foamVtkLegacyAsciiFormatter.C} |  64 +++--
 .../vtk/format/foamVtkLegacyAsciiFormatter.H  | 108 ++++++++
 ...ormatter.C => foamVtkLegacyRawFormatter.C} |  50 ++--
 ...ormatter.H => foamVtkLegacyRawFormatter.H} |  35 ++-
 .../vtk/format/foamVtkOutputOptions.C         | 235 ------------------
 .../vtk/output/foamVtkOutput.C                |  86 +++++--
 src/fileFormats/vtk/output/foamVtkOutput.H    | 211 ++++++++++++++++
 .../vtk/output/foamVtkOutputOptions.C         | 131 ++++++++++
 .../{format => output}/foamVtkOutputOptions.H |  74 +++---
 .../vtk/output/foamVtkOutputOptionsI.H        | 102 ++++++++
 .../vtk/output/foamVtkOutputTemplates.C       |  46 +---
 src/fileFormats/vtk/type/foamVtkOutputTypes.H |  77 ++++++
 30 files changed, 1301 insertions(+), 790 deletions(-)
 delete mode 100644 src/conversion/vtk/output/foamVtkOutput.H
 create mode 100644 src/conversion/vtk/output/foamVtkOutputFields.H
 create mode 100644 src/conversion/vtk/output/foamVtkOutputFieldsTemplates.C
 rename src/fileFormats/vtk/format/{foamVtkOutputOptionsI.H => foamVtkLegacyAsciiFormatter.C} (53%)
 create mode 100644 src/fileFormats/vtk/format/foamVtkLegacyAsciiFormatter.H
 rename src/fileFormats/vtk/format/{foamVtkLegacyFormatter.C => foamVtkLegacyRawFormatter.C} (76%)
 rename src/fileFormats/vtk/format/{foamVtkLegacyFormatter.H => foamVtkLegacyRawFormatter.H} (78%)
 delete mode 100644 src/fileFormats/vtk/format/foamVtkOutputOptions.C
 rename src/{conversion => fileFormats}/vtk/output/foamVtkOutput.C (54%)
 create mode 100644 src/fileFormats/vtk/output/foamVtkOutput.H
 create mode 100644 src/fileFormats/vtk/output/foamVtkOutputOptions.C
 rename src/fileFormats/vtk/{format => output}/foamVtkOutputOptions.H (65%)
 create mode 100644 src/fileFormats/vtk/output/foamVtkOutputOptionsI.H
 rename src/{conversion => fileFormats}/vtk/output/foamVtkOutputTemplates.C (69%)
 create mode 100644 src/fileFormats/vtk/type/foamVtkOutputTypes.H

diff --git a/src/conversion/Make/files b/src/conversion/Make/files
index bc77df3454..7e3d56e5df 100644
--- a/src/conversion/Make/files
+++ b/src/conversion/Make/files
@@ -27,6 +27,5 @@ polyDualMesh/polyDualMesh.C
 vtk/part/foamVtkCells.C
 vtk/part/foamVtkMeshMaps.C
 vtk/part/foamVtuSizing.C
-vtk/output/foamVtkOutput.C
 
 LIB = $(FOAM_LIBBIN)/libconversion
diff --git a/src/conversion/vtk/output/foamVtkOutput.H b/src/conversion/vtk/output/foamVtkOutput.H
deleted file mode 100644
index b1cbfb2438..0000000000
--- a/src/conversion/vtk/output/foamVtkOutput.H
+++ /dev/null
@@ -1,231 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2016-2107 OpenCFD Ltd.
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-License
-    This file is part of OpenFOAM.
-
-    OpenFOAM is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
-
-Class
-    foamVtkOutput
-
-Description
-    A collection of functions for writing vtk file content.
-
-SourceFiles
-    foamVtkOutput.C
-    foamVtkOutputTemplates.C
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef foamVtkOutput_H
-#define foamVtkOutput_H
-
-#include "floatScalar.H"
-#include "volFields.H"
-#include "foamVtkFormatter.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-/*---------------------------------------------------------------------------*\
-                        Class foamVtkOutput Declaration
-\*---------------------------------------------------------------------------*/
-
-class foamVtkOutput
-{
-    // Private Member Functions
-
-        //- Disallow construction
-        foamVtkOutput() = delete;
-
-public:
-
-    // Public typedefs
-
-        //- Use UInt64 for header data
-        typedef foamVtkFormatter::headerType headerType;
-
-
-    // Forward declarations
-    class legacy;
-
-
-    // Static Members
-
-        //- Write vtm datasets for specified files
-        static Foam::label writeVtmFile
-        (
-            std::ostream& os,
-            const UList<fileName>& files
-        );
-
-
-        //- Write a value component-wise.
-        template<class Type>
-        inline static void write(foamVtkFormatter& fmt, const Type& val);
-
-
-        //- Write a list of values.
-        //  The output does not include the payload size.
-        template<class Type>
-        static void writeList
-        (
-            foamVtkFormatter& fmt,
-            const UList<Type>& lst
-        );
-
-
-        //- Write a list of values via indirect addressing.
-        //  The output does not include the payload size.
-        template<class Type>
-        static void writeList
-        (
-            foamVtkFormatter& fmt,
-            const UList<Type>& lst,
-            const UList<label>& addressing
-        );
-
-
-        //- Write internalField for mesh
-        //  The output includes the payload size and flush.
-        template<class Type>
-        static void writeField
-        (
-            foamVtkFormatter& fmt,
-            const GeometricField<Type, fvPatchField, volMesh>& vf
-        );
-
-        //- Write internalField based on the cellMap
-        //  The output includes the payload size and flush.
-        template<class Type>
-        static void writeField
-        (
-            foamVtkFormatter& fmt,
-            const GeometricField<Type, fvPatchField, volMesh>& vf,
-            const UList<label>& cellMap
-        );
-
-};
-
-
-/*---------------------------------------------------------------------------*\
-                    Class foamVtkOutput::legacy Declaration
-\*---------------------------------------------------------------------------*/
-
-//- Basic support for legacy files
-class foamVtkOutput::legacy
-{
-    // Private Member Functions
-
-        //- Disallow construction
-        legacy() = delete;
-
-public:
-
-    // Static data members
-
-        //- file extension for legacy files (vtk)
-        static const Foam::word EXT;
-
-
-    // Static Members
-
-        //- Emit header for legacy file
-        static std::ostream& writeHeader
-        (
-            std::ostream&,
-            const std::string& title,
-            const bool binary = false
-        );
-
-
-        //- Emit header for legacy CELL_DATA
-        static std::ostream& writeCellDataHeader
-        (
-            std::ostream& os,
-            const label nCells,
-            const label nFields
-        );
-
-
-        //- Emit header for legacy POINT_DATA
-        static std::ostream& writePointDataHeader
-        (
-            std::ostream& os,
-            const label nPoints,
-            const label nFields
-        );
-
-};
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-
-//- Template specialization for label
-template<>
-inline void Foam::foamVtkOutput::write<label>
-(
-    foamVtkFormatter& fmt,
-    const label& val
-)
-{
-    fmt.write(val);
-}
-
-
-//- Template specialization for float
-template<>
-inline void Foam::foamVtkOutput::write<float>
-(
-    foamVtkFormatter& fmt,
-    const float& val
-)
-{
-    fmt.write(val);
-}
-
-
-//- Template specialization for double
-template<>
-inline void Foam::foamVtkOutput::write<double>
-(
-    foamVtkFormatter& fmt,
-    const double& val
-)
-{
-    fmt.write(val);
-}
-
-} // End namespace Foam
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#ifdef NoRepository
-    #include "foamVtkOutputTemplates.C"
-#endif
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/conversion/vtk/output/foamVtkOutputFields.H b/src/conversion/vtk/output/foamVtkOutputFields.H
new file mode 100644
index 0000000000..52bed6d037
--- /dev/null
+++ b/src/conversion/vtk/output/foamVtkOutputFields.H
@@ -0,0 +1,105 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2016-2107 OpenCFD Ltd.
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+InNamespace
+    Foam::foamVtkOutput
+
+Description
+    Additional functions for writing fields in VTK format.
+
+SourceFiles
+    foamVtkOutputFieldsTemplates.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef foamVtkOutputFields_H
+#define foamVtkOutputFields_H
+
+#include "foamVtkOutput.H"
+#include "volFields.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace foamVtkOutput
+{
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+    //- Write internalField for mesh
+    //  The output includes the payload size and flush.
+    template<class Type>
+    void writeField
+    (
+        foamVtkOutput::formatter& fmt,
+        const GeometricField<Type, fvPatchField, volMesh>& fld
+    );
+
+    //- Write internalField based on the cellMap
+    //  The output includes the payload size and flush.
+    template<class Type>
+    void writeField
+    (
+        foamVtkOutput::formatter& fmt,
+        const GeometricField<Type, fvPatchField, volMesh>& fld,
+        const UList<label>& cellMap
+    );
+
+    //- Write DimensionedField for mesh
+    //  The output includes the payload size and flush.
+    template<class Type>
+    void writeField
+    (
+        foamVtkOutput::formatter& fmt,
+        const DimensionedField<Type, volMesh>& fld
+    );
+
+    //- Write DimensionedField based on the cellMap
+    //  The output includes the payload size and flush.
+    template<class Type>
+    void writeField
+    (
+        foamVtkOutput::formatter& fmt,
+        const DimensionedField<Type, volMesh>& fld,
+        const UList<label>& cellMap
+    );
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace foamVtkOutput
+} // End namespace Foam
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#ifdef NoRepository
+    #include "foamVtkOutputFieldsTemplates.C"
+#endif
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/conversion/vtk/output/foamVtkOutputFieldsTemplates.C b/src/conversion/vtk/output/foamVtkOutputFieldsTemplates.C
new file mode 100644
index 0000000000..43f784ae61
--- /dev/null
+++ b/src/conversion/vtk/output/foamVtkOutputFieldsTemplates.C
@@ -0,0 +1,107 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2016-2107 OpenCFD Ltd.
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+
+template<class Type>
+void Foam::foamVtkOutput::writeField
+(
+    foamVtkOutput::formatter& fmt,
+    const GeometricField<Type, fvPatchField, volMesh>& fld
+)
+{
+    const uint64_t payLoad =
+    (
+        fld.size() * pTraits<Type>::nComponents * sizeof(float)
+    );
+
+    fmt.writeSize(payLoad);
+    writeList(fmt, fld.internalField());
+
+    fmt.flush();
+}
+
+
+template<class Type>
+void Foam::foamVtkOutput::writeField
+(
+    foamVtkOutput::formatter& fmt,
+    const GeometricField<Type, fvPatchField, volMesh>& fld,
+    const UList<label>& cellMap
+)
+{
+    const uint64_t payLoad =
+    (
+        cellMap.size() * pTraits<Type>::nComponents * sizeof(float)
+    );
+
+    fmt.writeSize(payLoad);
+    writeList(fmt, fld.internalField(), cellMap);
+
+    fmt.flush();
+}
+
+
+template<class Type>
+void Foam::foamVtkOutput::writeField
+(
+    foamVtkOutput::formatter& fmt,
+    const DimensionedField<Type, volMesh>& fld
+)
+{
+    const uint64_t payLoad =
+    (
+        fld.size() * pTraits<Type>::nComponents * sizeof(float)
+    );
+
+    fmt.writeSize(payLoad);
+    writeList(fmt, fld);
+
+    fmt.flush();
+}
+
+
+template<class Type>
+void Foam::foamVtkOutput::writeField
+(
+    foamVtkOutput::formatter& fmt,
+    const DimensionedField<Type, volMesh>& fld,
+    const UList<label>& cellMap
+)
+{
+    const uint64_t payLoad =
+    (
+        cellMap.size() * pTraits<Type>::nComponents * sizeof(float)
+    );
+
+    fmt.writeSize(payLoad);
+    writeList(fmt, fld, cellMap);
+
+    fmt.flush();
+}
+
+
+// ************************************************************************* //
diff --git a/src/fileFormats/Make/files b/src/fileFormats/Make/files
index ab7fe26dc2..cff7f7c33f 100644
--- a/src/fileFormats/Make/files
+++ b/src/fileFormats/Make/files
@@ -15,14 +15,16 @@ stl/STLReader.C
 stl/STLReaderASCII.L
 
 vtk/foamVtkCore.C
-vtk/format/foamVtkAppendBase64Formatter.C
-vtk/format/foamVtkAppendRawFormatter.C
+vtk/format/foamVtkFormatter.C
 vtk/format/foamVtkAsciiFormatter.C
 vtk/format/foamVtkBase64Formatter.C
+vtk/format/foamVtkAppendBase64Formatter.C
+vtk/format/foamVtkAppendRawFormatter.C
 vtk/format/foamVtkBase64Layer.C
-vtk/format/foamVtkLegacyFormatter.C
-vtk/format/foamVtkFormatter.C
-vtk/format/foamVtkOutputOptions.C
+vtk/format/foamVtkLegacyAsciiFormatter.C
+vtk/format/foamVtkLegacyRawFormatter.C
+vtk/output/foamVtkOutput.C
+vtk/output/foamVtkOutputOptions.C
 vtk/read/vtkUnstructuredReader.C
 vtk/type/foamVtkPTraits.C
 
diff --git a/src/fileFormats/vtk/format/foamVtkAppendBase64Formatter.C b/src/fileFormats/vtk/format/foamVtkAppendBase64Formatter.C
index 3805b61812..bacc45c1a5 100644
--- a/src/fileFormats/vtk/format/foamVtkAppendBase64Formatter.C
+++ b/src/fileFormats/vtk/format/foamVtkAppendBase64Formatter.C
@@ -27,12 +27,12 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-const char* Foam::foamVtkAppendBase64Formatter::name_ = "append";
+const char* Foam::foamVtkOutput::appendBase64Formatter::name_ = "append";
 
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-Foam::foamVtkAppendBase64Formatter::foamVtkAppendBase64Formatter
+Foam::foamVtkOutput::appendBase64Formatter::appendBase64Formatter
 (
     std::ostream& os
 )
@@ -43,7 +43,7 @@ Foam::foamVtkAppendBase64Formatter::foamVtkAppendBase64Formatter
 
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
 
-Foam::foamVtkAppendBase64Formatter::~foamVtkAppendBase64Formatter()
+Foam::foamVtkOutput::appendBase64Formatter::~appendBase64Formatter()
 {
     base64Layer::close();
 }
@@ -51,7 +51,7 @@ Foam::foamVtkAppendBase64Formatter::~foamVtkAppendBase64Formatter()
 
 // * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
 
-const char* Foam::foamVtkAppendBase64Formatter::name() const
+const char* Foam::foamVtkOutput::appendBase64Formatter::name() const
 {
     return name_;
 }
diff --git a/src/fileFormats/vtk/format/foamVtkAppendBase64Formatter.H b/src/fileFormats/vtk/format/foamVtkAppendBase64Formatter.H
index db3e1d6694..2cd289b6e4 100644
--- a/src/fileFormats/vtk/format/foamVtkAppendBase64Formatter.H
+++ b/src/fileFormats/vtk/format/foamVtkAppendBase64Formatter.H
@@ -22,7 +22,7 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
-    foamVtkAppendBase64Formatter
+    Foam::foamVtkOutput::appendBase64Formatter
 
 Description
     Appended base-64 encoded binary output.
@@ -42,12 +42,14 @@ SourceFiles
 
 namespace Foam
 {
+namespace foamVtkOutput
+{
 
 /*---------------------------------------------------------------------------*\
-                Class foamVtkAppendBase64Formatter Declaration
+                    Class appendBase64Formatter Declaration
 \*---------------------------------------------------------------------------*/
 
-class foamVtkAppendBase64Formatter
+class appendBase64Formatter
 :
     public foamVtkBase64Layer
 {
@@ -59,10 +61,10 @@ class foamVtkAppendBase64Formatter
     // Private Member Functions
 
     //- Disallow default bitwise copy construct
-    foamVtkAppendBase64Formatter(const foamVtkAppendBase64Formatter&) = delete;
+    appendBase64Formatter(const appendBase64Formatter&) = delete;
 
     //- Disallow default bitwise assignment
-    void operator=(const foamVtkAppendBase64Formatter&) = delete;
+    void operator=(const appendBase64Formatter&) = delete;
 
 
 public:
@@ -70,15 +72,21 @@ public:
     // Constructors
 
         //- Construct and attach to an output stream
-        foamVtkAppendBase64Formatter(std::ostream& os);
+        appendBase64Formatter(std::ostream& os);
 
 
     //- Destructor
-    virtual ~foamVtkAppendBase64Formatter();
+    virtual ~appendBase64Formatter();
 
 
     // Member Functions
 
+        //- The output formatType is APPEND_BASE64.
+        virtual enum formatType format() const
+        {
+            return formatType::APPEND_BASE64;
+        }
+
         //- Output name for XML type ("append")
         virtual const char* name() const;
 
@@ -86,6 +94,7 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+} // End namespace foamVtkOutput
 } // End namespace Foam
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/fileFormats/vtk/format/foamVtkAppendRawFormatter.C b/src/fileFormats/vtk/format/foamVtkAppendRawFormatter.C
index ae565323b8..cc587aae50 100644
--- a/src/fileFormats/vtk/format/foamVtkAppendRawFormatter.C
+++ b/src/fileFormats/vtk/format/foamVtkAppendRawFormatter.C
@@ -27,13 +27,13 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-const char* Foam::foamVtkAppendRawFormatter::name_     = "append";
-const char* Foam::foamVtkAppendRawFormatter::encoding_ = "raw";
+const char* Foam::foamVtkOutput::appendRawFormatter::name_     = "append";
+const char* Foam::foamVtkOutput::appendRawFormatter::encoding_ = "raw";
 
 
 // * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * //
 
-void Foam::foamVtkAppendRawFormatter::write
+void Foam::foamVtkOutput::appendRawFormatter::write
 (
     const char* s,
     std::streamsize n
@@ -45,59 +45,59 @@ void Foam::foamVtkAppendRawFormatter::write
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-Foam::foamVtkAppendRawFormatter::foamVtkAppendRawFormatter(std::ostream& os)
+Foam::foamVtkOutput::appendRawFormatter::appendRawFormatter(std::ostream& os)
 :
-    foamVtkFormatter(os)
+    formatter(os)
 {}
 
 
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
 
-Foam::foamVtkAppendRawFormatter::~foamVtkAppendRawFormatter()
+Foam::foamVtkOutput::appendRawFormatter::~appendRawFormatter()
 {}
 
 
 // * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
 
-const char* Foam::foamVtkAppendRawFormatter::name() const
+const char* Foam::foamVtkOutput::appendRawFormatter::name() const
 {
     return name_;
 }
 
 
-const char* Foam::foamVtkAppendRawFormatter::encoding() const
+const char* Foam::foamVtkOutput::appendRawFormatter::encoding() const
 {
     return encoding_;
 }
 
 
-void Foam::foamVtkAppendRawFormatter::writeSize(const uint64_t nBytes)
+void Foam::foamVtkOutput::appendRawFormatter::writeSize(const uint64_t nBytes)
 {
     write(reinterpret_cast<const char*>(&nBytes), sizeof(uint64_t));
 }
 
 
-void Foam::foamVtkAppendRawFormatter::write(const uint8_t val)
+void Foam::foamVtkOutput::appendRawFormatter::write(const uint8_t val)
 {
     write(reinterpret_cast<const char*>(&val), sizeof(uint8_t));
 }
 
 
-void Foam::foamVtkAppendRawFormatter::write(const label val)
+void Foam::foamVtkOutput::appendRawFormatter::write(const label val)
 {
     // std::cerr<<"label:" << sizeof(val) << "=" << val << '\n';
     write(reinterpret_cast<const char*>(&val), sizeof(label));
 }
 
 
-void Foam::foamVtkAppendRawFormatter::write(const float val)
+void Foam::foamVtkOutput::appendRawFormatter::write(const float val)
 {
     // std::cerr<<"float:" << sizeof(val) << "=" << val << '\n';
     write(reinterpret_cast<const char*>(&val), sizeof(float));
 }
 
 
-void Foam::foamVtkAppendRawFormatter::write(const double val)
+void Foam::foamVtkOutput::appendRawFormatter::write(const double val)
 {
     // std::cerr<<"double as float=" << val << '\n';
     float copy(val);
@@ -105,7 +105,7 @@ void Foam::foamVtkAppendRawFormatter::write(const double val)
 }
 
 
-void Foam::foamVtkAppendRawFormatter::flush()
+void Foam::foamVtkOutput::appendRawFormatter::flush()
 {/*nop*/}
 
 
diff --git a/src/fileFormats/vtk/format/foamVtkAppendRawFormatter.H b/src/fileFormats/vtk/format/foamVtkAppendRawFormatter.H
index 1dcb9b8d55..11de7e9b64 100644
--- a/src/fileFormats/vtk/format/foamVtkAppendRawFormatter.H
+++ b/src/fileFormats/vtk/format/foamVtkAppendRawFormatter.H
@@ -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-2017 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -22,7 +22,7 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
-    foamVtkAppendRawFormatter
+    Foam::foamVtkOutput::appendRawFormatter
 
 Description
     Appended raw binary output.
@@ -41,14 +41,16 @@ SourceFiles
 
 namespace Foam
 {
+namespace foamVtkOutput
+{
 
 /*---------------------------------------------------------------------------*\
-                  Class foamVtkAppendRawFormatter Declaration
+                     Class appendRawFormatter Declaration
 \*---------------------------------------------------------------------------*/
 
-class foamVtkAppendRawFormatter
+class appendRawFormatter
 :
-    public foamVtkFormatter
+    public formatter
 {
     // Private Data Members
 
@@ -58,10 +60,10 @@ class foamVtkAppendRawFormatter
     // Private Member Functions
 
         //- Disallow default bitwise copy construct
-        foamVtkAppendRawFormatter(const foamVtkAppendRawFormatter&) = delete;
+        appendRawFormatter(const appendRawFormatter&) = delete;
 
         //- Disallow default bitwise assignment
-        void operator=(const foamVtkAppendRawFormatter&) = delete;
+        void operator=(const appendRawFormatter&) = delete;
 
 
 protected:
@@ -77,15 +79,21 @@ public:
     // Constructors
 
         //- Construct and attach to an output stream
-        foamVtkAppendRawFormatter(std::ostream& os);
+        appendRawFormatter(std::ostream& os);
 
 
     //- Destructor
-    virtual ~foamVtkAppendRawFormatter();
+    virtual ~appendRawFormatter();
 
 
     // Member Functions
 
+        //- The output formatType is APPEND_BINARY.
+        virtual enum formatType format() const
+        {
+            return formatType::APPEND_BINARY;
+        }
+
         //- Output name for XML type ("append")
         virtual const char* name() const;
 
@@ -108,6 +116,7 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+} // End namespace foamVtkOutput
 } // End namespace Foam
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/fileFormats/vtk/format/foamVtkAsciiFormatter.C b/src/fileFormats/vtk/format/foamVtkAsciiFormatter.C
index 9ed22db233..b19a3762db 100644
--- a/src/fileFormats/vtk/format/foamVtkAsciiFormatter.C
+++ b/src/fileFormats/vtk/format/foamVtkAsciiFormatter.C
@@ -27,12 +27,12 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-const char* Foam::foamVtkAsciiFormatter::name_ = "ascii";
+const char* Foam::foamVtkOutput::asciiFormatter::name_ = "ascii";
 
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
-inline void Foam::foamVtkAsciiFormatter::next()
+inline void Foam::foamVtkOutput::asciiFormatter::next()
 {
     if (pos_ == 6)
     {
@@ -47,7 +47,7 @@ inline void Foam::foamVtkAsciiFormatter::next()
 }
 
 
-inline void Foam::foamVtkAsciiFormatter::done()
+inline void Foam::foamVtkOutput::asciiFormatter::done()
 {
     if (pos_)
     {
@@ -59,20 +59,20 @@ inline void Foam::foamVtkAsciiFormatter::done()
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-Foam::foamVtkAsciiFormatter::foamVtkAsciiFormatter(std::ostream& os)
+Foam::foamVtkOutput::asciiFormatter::asciiFormatter(std::ostream& os)
 :
-    foamVtkFormatter(os),
+    formatter(os),
     pos_(0)
 {}
 
 
-Foam::foamVtkAsciiFormatter::foamVtkAsciiFormatter
+Foam::foamVtkOutput::asciiFormatter::asciiFormatter
 (
     std::ostream& os,
     unsigned precision
 )
 :
-    foamVtkFormatter(os),
+    formatter(os),
     pos_(0)
 {
     os.precision(precision);
@@ -81,7 +81,7 @@ Foam::foamVtkAsciiFormatter::foamVtkAsciiFormatter
 
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
 
-Foam::foamVtkAsciiFormatter::~foamVtkAsciiFormatter()
+Foam::foamVtkOutput::asciiFormatter::~asciiFormatter()
 {
     done();
 }
@@ -89,58 +89,58 @@ Foam::foamVtkAsciiFormatter::~foamVtkAsciiFormatter()
 
 // * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
 
-const char* Foam::foamVtkAsciiFormatter::name() const
+const char* Foam::foamVtkOutput::asciiFormatter::name() const
 {
     return name_;
 }
 
 
-const char* Foam::foamVtkAsciiFormatter::encoding() const
+const char* Foam::foamVtkOutput::asciiFormatter::encoding() const
 {
     return name_;
 }
 
 
-void Foam::foamVtkAsciiFormatter::writeSize(const uint64_t ignored)
+void Foam::foamVtkOutput::asciiFormatter::writeSize(const uint64_t ignored)
 {/*nop*/}
 
 
-void Foam::foamVtkAsciiFormatter::write(const uint8_t val)
+void Foam::foamVtkOutput::asciiFormatter::write(const uint8_t val)
 {
     next();
     os()<< int(val);
 }
 
 
-void Foam::foamVtkAsciiFormatter::write(const label val)
+void Foam::foamVtkOutput::asciiFormatter::write(const label val)
 {
     next();
     os()<< val;
 }
 
 
-void Foam::foamVtkAsciiFormatter::write(const float val)
+void Foam::foamVtkOutput::asciiFormatter::write(const float val)
 {
     next();
     os()<< val;
 }
 
 
-void Foam::foamVtkAsciiFormatter::write(const double val)
+void Foam::foamVtkOutput::asciiFormatter::write(const double val)
 {
     next();
     os()<< float(val);
 }
 
 
-void Foam::foamVtkAsciiFormatter::flush()
+void Foam::foamVtkOutput::asciiFormatter::flush()
 {
     done();
 }
 
 
 std::size_t
-Foam::foamVtkAsciiFormatter::encodedLength(std::size_t ignored) const
+Foam::foamVtkOutput::asciiFormatter::encodedLength(std::size_t ignored) const
 {
     return 0;
 }
diff --git a/src/fileFormats/vtk/format/foamVtkAsciiFormatter.H b/src/fileFormats/vtk/format/foamVtkAsciiFormatter.H
index 8b8e06b2a2..6289e0fd83 100644
--- a/src/fileFormats/vtk/format/foamVtkAsciiFormatter.H
+++ b/src/fileFormats/vtk/format/foamVtkAsciiFormatter.H
@@ -22,10 +22,10 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
-    foamVtkAsciiFormatter
+    Foam::foamVtkOutput::asciiFormatter
 
 Description
-    Inline ASCII binary output.
+    Inline ASCII output.
     Adds spaces between entries and a newline every 6 items
     (for consistency with what VTK itself outputs).
 
@@ -43,14 +43,16 @@ SourceFiles
 
 namespace Foam
 {
+namespace foamVtkOutput
+{
 
 /*---------------------------------------------------------------------------*\
-                    Class foamVtkAsciiFormatter Declaration
+                       Class asciiFormatter Declaration
 \*---------------------------------------------------------------------------*/
 
-class foamVtkAsciiFormatter
+class asciiFormatter
 :
-    public foamVtkFormatter
+    public formatter
 {
     // Private Data Members
 
@@ -70,10 +72,10 @@ class foamVtkAsciiFormatter
 
 
         //- Disallow default bitwise copy construct
-        foamVtkAsciiFormatter(const foamVtkAsciiFormatter&) = delete;
+        asciiFormatter(const asciiFormatter&) = delete;
 
         //- Disallow default bitwise assignment
-        void operator=(const foamVtkAsciiFormatter&) = delete;
+        void operator=(const asciiFormatter&) = delete;
 
 
 public:
@@ -81,20 +83,25 @@ public:
     // Constructors
 
         //- Construct and attach to an output stream, use default precision
-        foamVtkAsciiFormatter(std::ostream& os);
+        asciiFormatter(std::ostream& os);
 
         //- Construct and attach to an output stream, use specified precision
-        foamVtkAsciiFormatter(std::ostream& os, unsigned precision);
+        asciiFormatter(std::ostream& os, unsigned precision);
 
 
     //- Destructor
-    virtual ~foamVtkAsciiFormatter();
+    virtual ~asciiFormatter();
 
 
     // Member Functions
 
+        //- The output formatType is INLINE_ASCII.
+        virtual enum formatType format() const
+        {
+            return formatType::INLINE_ASCII;
+        }
+
         //- Name for the XML output type ("ascii")
-        //  The legacy output type is an uppercase version of this.
         virtual const char* name() const;
 
         //- Name for the XML append encoding - unused.
@@ -120,6 +127,7 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+} // End namespace foamVtkOutput
 } // End namespace Foam
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/fileFormats/vtk/format/foamVtkBase64Formatter.C b/src/fileFormats/vtk/format/foamVtkBase64Formatter.C
index f87efbb19f..a27d14c129 100644
--- a/src/fileFormats/vtk/format/foamVtkBase64Formatter.C
+++ b/src/fileFormats/vtk/format/foamVtkBase64Formatter.C
@@ -27,12 +27,12 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-const char* Foam::foamVtkBase64Formatter::name_ = "binary";
+const char* Foam::foamVtkOutput::base64Formatter::name_ = "binary";
 
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-Foam::foamVtkBase64Formatter::foamVtkBase64Formatter(std::ostream& os)
+Foam::foamVtkOutput::base64Formatter::base64Formatter(std::ostream& os)
 :
     foamVtkBase64Layer(os)
 {}
@@ -40,7 +40,7 @@ Foam::foamVtkBase64Formatter::foamVtkBase64Formatter(std::ostream& os)
 
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
 
-Foam::foamVtkBase64Formatter::~foamVtkBase64Formatter()
+Foam::foamVtkOutput::base64Formatter::~base64Formatter()
 {
     if (base64Layer::close())
     {
@@ -51,13 +51,13 @@ Foam::foamVtkBase64Formatter::~foamVtkBase64Formatter()
 
 // * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
 
-const char* Foam::foamVtkBase64Formatter::name() const
+const char* Foam::foamVtkOutput::base64Formatter::name() const
 {
     return name_;
 }
 
 
-void Foam::foamVtkBase64Formatter::flush()
+void Foam::foamVtkOutput::base64Formatter::flush()
 {
     if (base64Layer::close())
     {
diff --git a/src/fileFormats/vtk/format/foamVtkBase64Formatter.H b/src/fileFormats/vtk/format/foamVtkBase64Formatter.H
index e92fa4f9e3..52f7d025f1 100644
--- a/src/fileFormats/vtk/format/foamVtkBase64Formatter.H
+++ b/src/fileFormats/vtk/format/foamVtkBase64Formatter.H
@@ -22,7 +22,7 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
-    foamVtkBase64Formatter
+    Foam::foamVtkOutput::base64Formatter
 
 Description
     Inline base-64 encoded binary output.
@@ -39,12 +39,14 @@ Description
 
 namespace Foam
 {
+namespace foamVtkOutput
+{
 
 /*---------------------------------------------------------------------------*\
-                   Class foamVtkBase64Formatter Declaration
+                       Class base64Formatter Declaration
 \*---------------------------------------------------------------------------*/
 
-class foamVtkBase64Formatter
+class base64Formatter
 :
     public foamVtkBase64Layer
 {
@@ -57,27 +59,32 @@ class foamVtkBase64Formatter
     // Private Member Functions
 
         //- Disallow default bitwise copy construct
-        foamVtkBase64Formatter(const foamVtkBase64Formatter&) = delete;
+        base64Formatter(const base64Formatter&) = delete;
 
         //- Disallow default bitwise assignment
-        void operator=(const foamVtkBase64Formatter&) = delete;
+        void operator=(const base64Formatter&) = delete;
 
 public:
 
     // Constructors
 
         //- Construct and attach to an output stream
-        foamVtkBase64Formatter(std::ostream& os);
+        base64Formatter(std::ostream& os);
 
 
     //- Destructor
-    virtual ~foamVtkBase64Formatter();
+    virtual ~base64Formatter();
 
 
     // Member Functions
 
+        //- The output formatType is INLINE_BASE64.
+        virtual enum formatType format() const
+        {
+            return formatType::INLINE_BASE64;
+        }
+
         //- Name for the XML output type ("binary")
-        //  The lowercase version of the Legacy output type.
         virtual const char* name() const;
 
 
@@ -89,6 +96,7 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+} // End namespace foamVtkOutput
 } // End namespace Foam
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/fileFormats/vtk/format/foamVtkBase64Layer.C b/src/fileFormats/vtk/format/foamVtkBase64Layer.C
index d66970d522..32d2d81642 100644
--- a/src/fileFormats/vtk/format/foamVtkBase64Layer.C
+++ b/src/fileFormats/vtk/format/foamVtkBase64Layer.C
@@ -27,12 +27,12 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-const char* Foam::foamVtkBase64Layer::encoding_ = "base64";
+const char* Foam::foamVtkOutput::foamVtkBase64Layer::encoding_ = "base64";
 
 
 // * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * //
 
-void Foam::foamVtkBase64Layer::write
+void Foam::foamVtkOutput::foamVtkBase64Layer::write
 (
     const char* s,
     std::streamsize n
@@ -44,16 +44,16 @@ void Foam::foamVtkBase64Layer::write
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-Foam::foamVtkBase64Layer::foamVtkBase64Layer(std::ostream& os)
+Foam::foamVtkOutput::foamVtkBase64Layer::foamVtkBase64Layer(std::ostream& os)
 :
-    foamVtkFormatter(os),
+    formatter(os),
     base64Layer(os)
 {}
 
 
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
 
-Foam::foamVtkBase64Layer::~foamVtkBase64Layer()
+Foam::foamVtkOutput::foamVtkBase64Layer::~foamVtkBase64Layer()
 {
     base64Layer::close();
 }
@@ -61,39 +61,39 @@ Foam::foamVtkBase64Layer::~foamVtkBase64Layer()
 
 // * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
 
-const char* Foam::foamVtkBase64Layer::encoding() const
+const char* Foam::foamVtkOutput::foamVtkBase64Layer::encoding() const
 {
     return encoding_;
 }
 
 
-void Foam::foamVtkBase64Layer::writeSize(const uint64_t nBytes)
+void Foam::foamVtkOutput::foamVtkBase64Layer::writeSize(const uint64_t nBytes)
 {
     write(reinterpret_cast<const char*>(&nBytes), sizeof(uint64_t));
 }
 
 
-void Foam::foamVtkBase64Layer::write(const uint8_t val)
+void Foam::foamVtkOutput::foamVtkBase64Layer::write(const uint8_t val)
 {
     base64Layer::add(val);
 }
 
 
-void Foam::foamVtkBase64Layer::write(const label val)
+void Foam::foamVtkOutput::foamVtkBase64Layer::write(const label val)
 {
     // std::cerr<<"label:" << sizeof(val) << "=" << val << '\n';
     write(reinterpret_cast<const char*>(&val), sizeof(label));
 }
 
 
-void Foam::foamVtkBase64Layer::write(const float val)
+void Foam::foamVtkOutput::foamVtkBase64Layer::write(const float val)
 {
     // std::cerr<<"float:" << sizeof(val) << "=" << val << '\n';
     write(reinterpret_cast<const char*>(&val), sizeof(float));
 }
 
 
-void Foam::foamVtkBase64Layer::write(const double val)
+void Foam::foamVtkOutput::foamVtkBase64Layer::write(const double val)
 {
     // std::cerr<<"double as float=" << val << '\n';
     float copy(val);
@@ -101,13 +101,16 @@ void Foam::foamVtkBase64Layer::write(const double val)
 }
 
 
-void Foam::foamVtkBase64Layer::flush()
+void Foam::foamVtkOutput::foamVtkBase64Layer::flush()
 {
     base64Layer::close();
 }
 
 
-std::size_t Foam::foamVtkBase64Layer::encodedLength(std::size_t n) const
+std::size_t Foam::foamVtkOutput::foamVtkBase64Layer::encodedLength
+(
+    std::size_t n
+) const
 {
     return base64Layer::encodedLength(n);
 }
diff --git a/src/fileFormats/vtk/format/foamVtkBase64Layer.H b/src/fileFormats/vtk/format/foamVtkBase64Layer.H
index 61527a11bc..da541bbde2 100644
--- a/src/fileFormats/vtk/format/foamVtkBase64Layer.H
+++ b/src/fileFormats/vtk/format/foamVtkBase64Layer.H
@@ -22,10 +22,10 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
-    foamVtkBase64Layer
+    Foam::foamVtkOutput::foamVtkBase64Layer
 
 Description
-    Base-64 encoded output.
+    Base-64 encoded output layer - normally only used indirectly by formatters.
 
 \*---------------------------------------------------------------------------*/
 
@@ -39,14 +39,16 @@ Description
 
 namespace Foam
 {
+namespace foamVtkOutput
+{
 
 /*---------------------------------------------------------------------------*\
-                   Class foamVtkBase64Layer Declaration
+                     Class foamVtkBase64Layer Declaration
 \*---------------------------------------------------------------------------*/
 
 class foamVtkBase64Layer
 :
-    public foamVtkFormatter,
+    public formatter,
     protected base64Layer
 {
     // Private Data Members
@@ -105,6 +107,7 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+} // End namespace foamVtkOutput
 } // End namespace Foam
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/fileFormats/vtk/format/foamVtkFormatter.C b/src/fileFormats/vtk/format/foamVtkFormatter.C
index 5b9fded769..79a420e585 100644
--- a/src/fileFormats/vtk/format/foamVtkFormatter.C
+++ b/src/fileFormats/vtk/format/foamVtkFormatter.C
@@ -26,7 +26,7 @@ License
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-Foam::foamVtkFormatter::foamVtkFormatter(std::ostream& os)
+Foam::foamVtkOutput::formatter::formatter(std::ostream& os)
 :
     os_(os),
     xmlTags_(),
@@ -36,19 +36,19 @@ Foam::foamVtkFormatter::foamVtkFormatter(std::ostream& os)
 
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
 
-Foam::foamVtkFormatter::~foamVtkFormatter()
+Foam::foamVtkOutput::formatter::~formatter()
 {}
 
 
 // * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
 
-std::size_t Foam::foamVtkFormatter::encodedLength(std::size_t n) const
+std::size_t Foam::foamVtkOutput::formatter::encodedLength(std::size_t n) const
 {
     return n;
 }
 
 
-void Foam::foamVtkFormatter::indent()
+void Foam::foamVtkOutput::formatter::indent()
 {
     label n = xmlTags_.size() * 2;
     while (n--)
@@ -58,8 +58,8 @@ void Foam::foamVtkFormatter::indent()
 }
 
 
-Foam::foamVtkFormatter&
-Foam::foamVtkFormatter::xmlHeader()
+Foam::foamVtkOutput::formatter&
+Foam::foamVtkOutput::formatter::xmlHeader()
 {
     if (inTag_)
     {
@@ -74,8 +74,8 @@ Foam::foamVtkFormatter::xmlHeader()
 }
 
 
-Foam::foamVtkFormatter&
-Foam::foamVtkFormatter::comment(const std::string& text)
+Foam::foamVtkOutput::formatter&
+Foam::foamVtkOutput::formatter::comment(const std::string& text)
 {
     if (inTag_)
     {
@@ -91,8 +91,8 @@ Foam::foamVtkFormatter::comment(const std::string& text)
 }
 
 
-Foam::foamVtkFormatter&
-Foam::foamVtkFormatter::openTag(const word& tag)
+Foam::foamVtkOutput::formatter&
+Foam::foamVtkOutput::formatter::openTag(const word& tag)
 {
     if (inTag_)
     {
@@ -111,8 +111,8 @@ Foam::foamVtkFormatter::openTag(const word& tag)
 }
 
 
-Foam::foamVtkFormatter&
-Foam::foamVtkFormatter::closeTag(const bool isEmpty)
+Foam::foamVtkOutput::formatter&
+Foam::foamVtkOutput::formatter::closeTag(const bool isEmpty)
 {
     if (!inTag_)
     {
@@ -135,8 +135,8 @@ Foam::foamVtkFormatter::closeTag(const bool isEmpty)
 }
 
 
-Foam::foamVtkFormatter&
-Foam::foamVtkFormatter::endTag(const word& tag)
+Foam::foamVtkOutput::formatter&
+Foam::foamVtkOutput::formatter::endTag(const word& tag)
 {
     const word curr = xmlTags_.pop();
     indent();
@@ -166,8 +166,8 @@ Foam::foamVtkFormatter::endTag(const word& tag)
 }
 
 
-Foam::foamVtkFormatter&
-Foam::foamVtkFormatter::tag(const word& tag)
+Foam::foamVtkOutput::formatter&
+Foam::foamVtkOutput::formatter::tag(const word& tag)
 {
     openTag(tag);
     closeTag();
@@ -176,8 +176,8 @@ Foam::foamVtkFormatter::tag(const word& tag)
 }
 
 
-Foam::foamVtkFormatter&
-Foam::foamVtkFormatter::beginVTKFile
+Foam::foamVtkOutput::formatter&
+Foam::foamVtkOutput::formatter::beginVTKFile
 (
     const word& contentType,
     const word& contentVersion,
@@ -201,8 +201,8 @@ Foam::foamVtkFormatter::beginVTKFile
 }
 
 
-Foam::foamVtkFormatter&
-Foam::foamVtkFormatter::beginAppendedData()
+Foam::foamVtkOutput::formatter&
+Foam::foamVtkOutput::formatter::beginAppendedData()
 {
     openTag("AppendedData");
     xmlAttr("encoding", encoding());
@@ -213,8 +213,8 @@ Foam::foamVtkFormatter::beginAppendedData()
 }
 
 
-Foam::foamVtkFormatter&
-Foam::foamVtkFormatter::xmlAttr
+Foam::foamVtkOutput::formatter&
+Foam::foamVtkOutput::formatter::xmlAttr
 (
     const word& k,
     const std::string& v,
@@ -234,8 +234,8 @@ Foam::foamVtkFormatter::xmlAttr
 }
 
 
-Foam::foamVtkFormatter&
-Foam::foamVtkFormatter::xmlAttr
+Foam::foamVtkOutput::formatter&
+Foam::foamVtkOutput::formatter::xmlAttr
 (
     const word& k,
     const int32_t v,
@@ -246,8 +246,8 @@ Foam::foamVtkFormatter::xmlAttr
 }
 
 
-Foam::foamVtkFormatter&
-Foam::foamVtkFormatter::xmlAttr
+Foam::foamVtkOutput::formatter&
+Foam::foamVtkOutput::formatter::xmlAttr
 (
     const word& k,
     const int64_t v,
@@ -258,8 +258,8 @@ Foam::foamVtkFormatter::xmlAttr
 }
 
 
-Foam::foamVtkFormatter&
-Foam::foamVtkFormatter::xmlAttr
+Foam::foamVtkOutput::formatter&
+Foam::foamVtkOutput::formatter::xmlAttr
 (
     const word& k,
     const uint64_t v,
@@ -270,8 +270,8 @@ Foam::foamVtkFormatter::xmlAttr
 }
 
 
-Foam::foamVtkFormatter&
-Foam::foamVtkFormatter::xmlAttr
+Foam::foamVtkOutput::formatter&
+Foam::foamVtkOutput::formatter::xmlAttr
 (
     const word& k,
     const scalar v,
@@ -284,36 +284,36 @@ Foam::foamVtkFormatter::xmlAttr
 
 // * * * * * * * * * * * * * * Member Operators * * * * * * * * * * * * * * //
 
-Foam::foamVtkFormatter&
-Foam::foamVtkFormatter::operator()(const word& k, const std::string& v)
+Foam::foamVtkOutput::formatter&
+Foam::foamVtkOutput::formatter::operator()(const word& k, const std::string& v)
 {
     return xmlAttr(k, v);
 }
 
 
-Foam::foamVtkFormatter&
-Foam::foamVtkFormatter::operator()(const word& k, const int32_t v)
+Foam::foamVtkOutput::formatter&
+Foam::foamVtkOutput::formatter::operator()(const word& k, const int32_t v)
 {
     return xmlAttr(k, v);
 }
 
 
-Foam::foamVtkFormatter&
-Foam::foamVtkFormatter::operator()(const word& k, const int64_t v)
+Foam::foamVtkOutput::formatter&
+Foam::foamVtkOutput::formatter::operator()(const word& k, const int64_t v)
 {
     return xmlAttr(k, v);
 }
 
 
-Foam::foamVtkFormatter&
-Foam::foamVtkFormatter::operator()(const word& k, const uint64_t v)
+Foam::foamVtkOutput::formatter&
+Foam::foamVtkOutput::formatter::operator()(const word& k, const uint64_t v)
 {
     return xmlAttr(k, v);
 }
 
 
-Foam::foamVtkFormatter&
-Foam::foamVtkFormatter::operator()(const word& k, const scalar v)
+Foam::foamVtkOutput::formatter&
+Foam::foamVtkOutput::formatter::operator()(const word& k, const scalar v)
 {
     return xmlAttr(k, v);
 }
diff --git a/src/fileFormats/vtk/format/foamVtkFormatter.H b/src/fileFormats/vtk/format/foamVtkFormatter.H
index 9e37f2c625..572316e562 100644
--- a/src/fileFormats/vtk/format/foamVtkFormatter.H
+++ b/src/fileFormats/vtk/format/foamVtkFormatter.H
@@ -22,7 +22,7 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
-    foamVtkFormatter
+    Foam::foamVtkOutput::formatter
 
 Description
     Abstract class for a VTK output stream formatter.
@@ -31,6 +31,7 @@ Description
 
 SourceFiles
     foamVtkFormatter.C
+    foamVtkFormatterTemplates.C
 
 \*---------------------------------------------------------------------------*/
 
@@ -44,6 +45,7 @@ SourceFiles
 #include "UList.H"
 #include "LIFOStack.H"
 #include "foamVtkPTraits.H"
+#include "foamVtkOutputTypes.H"
 
 #include <iostream>
 
@@ -51,12 +53,14 @@ SourceFiles
 
 namespace Foam
 {
+namespace foamVtkOutput
+{
 
 /*---------------------------------------------------------------------------*\
-                      Class foamVtkFormatter Declaration
+                          Class formatter Declaration
 \*---------------------------------------------------------------------------*/
 
-class foamVtkFormatter
+class formatter
 {
     // Private Data
 
@@ -72,7 +76,7 @@ class foamVtkFormatter
 
         //- Write XML attribute
         template<class Type>
-        foamVtkFormatter& xmlAttribute
+        formatter& xmlAttribute
         (
             const word& k,
             const Type& v,
@@ -85,7 +89,7 @@ protected:
     // Protected Member Functions
 
         //- Construct and attach to an output stream
-        foamVtkFormatter(std::ostream& os);
+        formatter(std::ostream& os);
 
 public:
 
@@ -96,11 +100,13 @@ public:
 
 
     //- Destructor
-    virtual ~foamVtkFormatter();
+    virtual ~formatter();
 
 
     // Member Functions
 
+      // Access
+
         //- Access to the underlying output stream
         inline std::ostream& os()
         {
@@ -108,8 +114,10 @@ public:
         }
 
 
-        //- Name for the XML output type.
-        //  Possibly the lowercase version of the Legacy output type
+        //- The output formatType.
+        virtual enum formatType format() const = 0;
+
+        //- Name for the XML output type or the legacy output type.
         virtual const char* name() const = 0;
 
         //- Name for the XML append encoding
@@ -134,64 +142,78 @@ public:
 
     // Member Functions
 
+      // Output
+
         //- Indent according to the currently nested XML tags
         void indent();
 
         //- Write XML header
-        foamVtkFormatter& xmlHeader();
+        //  \return formatter for chaining
+        formatter& xmlHeader();
 
         //- Write XML comment (at the current indentation level)
-        foamVtkFormatter& comment(const std::string& text);
+        //  \return formatter for chaining
+        formatter& comment(const std::string& text);
 
 
         //- Open XML tag
-        foamVtkFormatter& openTag(const word& tag);
+        //  \return formatter for chaining
+        formatter& openTag(const word& tag);
 
         //- Close XML tag, optional as an empty container.
         //  Always adds a trailing newline.
-        foamVtkFormatter& closeTag(const bool isEmpty = false);
+        //  \return formatter for chaining
+        formatter& closeTag(const bool isEmpty = false);
 
         //- End XML tag, optional with sanity check
         //  Always adds a trailing newline.
-        foamVtkFormatter& endTag(const word& tag = word::null);
+        //  \return formatter for chaining
+        formatter& endTag(const word& tag = word::null);
 
         //- Write XML tag without any attributes. Combines openTag/closeTag.
-        foamVtkFormatter& tag(const word& tag);
+        //  \return formatter for chaining
+        formatter& tag(const word& tag);
 
         //- Add a "VTKFile" XML tag for contentType, followed by a tag for
         //  the contentType itself. Optionally leave the contentType tag
         //  open for adding additional attributes.
-        foamVtkFormatter& beginVTKFile
+        //  \return formatter for chaining
+        formatter& beginVTKFile
         (
             const word& contentType,
             const word& contentVersion,
             const bool leaveOpen = false
         );
 
-        //- Add a "AppendedData" XML tag with the current encoding and  output
+        //- Add a "AppendedData" XML tag with the current encoding and output
         //  the requisite '_' prefix.
-        foamVtkFormatter& beginAppendedData();
+        //  \return formatter for chaining
+        formatter& beginAppendedData();
 
 
         //- Open "DataArray" XML tag
+        //  \return formatter for chaining
         template<class Type, int nComp=0>
-        foamVtkFormatter& openDataArray(const word& dataName);
+        formatter& openDataArray(const word& dataName);
 
 
         //- Insert a single "PDataArray" XML entry tag.
         //  For some entries, the name is optional.
+        //  \return formatter for chaining
         template<class Type, int nComp=0>
-        foamVtkFormatter& PDataArray(const word& dataName);
+        formatter& PDataArray(const word& dataName);
 
 
         //- End "DataArray" XML tag
-        inline foamVtkFormatter& endDataArray()
+        //  \return formatter for chaining
+        inline formatter& endDataArray()
         {
             return endTag("DataArray");
         }
 
         //- End "AppendedData" XML tag
-        inline foamVtkFormatter& endAppendedData()
+        //  \return formatter for chaining
+        inline formatter& endAppendedData()
         {
             flush();     // flush any pending encoded content
             os_ << '\n'; // clear separation from content.
@@ -199,14 +221,16 @@ public:
         }
 
         //- End "VTKFile" XML tag
-        inline foamVtkFormatter& endVTKFile()
+        //  \return formatter for chaining
+        inline formatter& endVTKFile()
         {
             return endTag("VTKFile");
         }
 
 
         //- Write XML attribute
-        foamVtkFormatter& xmlAttr
+        //  \return formatter for chaining
+        formatter& xmlAttr
         (
             const word& k,
             const std::string& v,
@@ -214,7 +238,8 @@ public:
         );
 
         //- Write XML attribute
-        foamVtkFormatter& xmlAttr
+        //  \return formatter for chaining
+        formatter& xmlAttr
         (
             const word& k,
             const int32_t v,
@@ -222,7 +247,8 @@ public:
         );
 
         //- Write XML attribute
-        foamVtkFormatter& xmlAttr
+        //  \return formatter for chaining
+        formatter& xmlAttr
         (
             const word& k,
             const int64_t v,
@@ -230,7 +256,8 @@ public:
         );
 
         //- Write XML attribute
-        foamVtkFormatter& xmlAttr
+        //  \return formatter for chaining
+        formatter& xmlAttr
         (
             const word& k,
             const uint64_t v,
@@ -238,7 +265,8 @@ public:
         );
 
         //- Write XML attribute
-        foamVtkFormatter& xmlAttr
+        //  \return formatter for chaining
+        formatter& xmlAttr
         (
             const word& k,
             const scalar v,
@@ -246,29 +274,34 @@ public:
         );
 
 
-
     // Member Operators
 
         //- Write XML attribute
-        foamVtkFormatter& operator()(const word& k, const std::string& v);
+        //  \return formatter for chaining
+        formatter& operator()(const word& k, const std::string& v);
 
         //- Write XML attribute
-        foamVtkFormatter& operator()(const word& k, const int32_t v);
+        //  \return formatter for chaining
+        formatter& operator()(const word& k, const int32_t v);
 
         //- Write XML attribute
-        foamVtkFormatter& operator()(const word& k, const int64_t v);
+        //  \return formatter for chaining
+        formatter& operator()(const word& k, const int64_t v);
 
         //- Write XML attribute
-        foamVtkFormatter& operator()(const word& k, const uint64_t v);
+        //  \return formatter for chaining
+        formatter& operator()(const word& k, const uint64_t v);
 
         //- Write XML attribute
-        foamVtkFormatter& operator()(const word& k, const scalar v);
+        //  \return formatter for chaining
+        formatter& operator()(const word& k, const scalar v);
 
 };
 
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+} // End namespace foamVtkOutput
 } // End namespace Foam
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/fileFormats/vtk/format/foamVtkFormatterTemplates.C b/src/fileFormats/vtk/format/foamVtkFormatterTemplates.C
index 1cde34a61e..1c1ec9b35f 100644
--- a/src/fileFormats/vtk/format/foamVtkFormatterTemplates.C
+++ b/src/fileFormats/vtk/format/foamVtkFormatterTemplates.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-2017 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -27,8 +27,8 @@ License
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 template<class Type>
-Foam::foamVtkFormatter&
-Foam::foamVtkFormatter::xmlAttribute
+Foam::foamVtkOutput::formatter&
+Foam::foamVtkOutput::formatter::xmlAttribute
 (
     const word& k,
     const Type& v,
@@ -49,7 +49,8 @@ Foam::foamVtkFormatter::xmlAttribute
 
 
 template<class Type, int nComp>
-Foam::foamVtkFormatter& Foam::foamVtkFormatter::openDataArray
+Foam::foamVtkOutput::formatter&
+Foam::foamVtkOutput::formatter::openDataArray
 (
     const word& dataName
 )
@@ -68,7 +69,8 @@ Foam::foamVtkFormatter& Foam::foamVtkFormatter::openDataArray
 
 
 template<class Type, int nComp>
-Foam::foamVtkFormatter& Foam::foamVtkFormatter::PDataArray
+Foam::foamVtkOutput::formatter&
+Foam::foamVtkOutput::formatter::PDataArray
 (
     const word& dataName
 )
@@ -89,4 +91,5 @@ Foam::foamVtkFormatter& Foam::foamVtkFormatter::PDataArray
     return *this;
 }
 
+
 // ************************************************************************* //
diff --git a/src/fileFormats/vtk/format/foamVtkOutputOptionsI.H b/src/fileFormats/vtk/format/foamVtkLegacyAsciiFormatter.C
similarity index 53%
rename from src/fileFormats/vtk/format/foamVtkOutputOptionsI.H
rename to src/fileFormats/vtk/format/foamVtkLegacyAsciiFormatter.C
index 0205f2f98e..226ee3a48f 100644
--- a/src/fileFormats/vtk/format/foamVtkOutputOptionsI.H
+++ b/src/fileFormats/vtk/format/foamVtkLegacyAsciiFormatter.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) 2017 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -23,33 +23,51 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-inline bool Foam::foamVtkOutputOptions::legacy() const
+#include "foamVtkLegacyAsciiFormatter.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+const char* Foam::foamVtkOutput::legacyAsciiFormatter::legacyName_ = "ASCII";
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::foamVtkOutput::legacyAsciiFormatter::legacyAsciiFormatter
+(
+    std::ostream& os
+)
+:
+    asciiFormatter(os)
+{}
+
+
+Foam::foamVtkOutput::legacyAsciiFormatter::legacyAsciiFormatter
+(
+    std::ostream& os,
+    unsigned precision
+)
+:
+    asciiFormatter(os, precision)
+{}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+Foam::foamVtkOutput::legacyAsciiFormatter::~legacyAsciiFormatter()
+{}
+
+
+// * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
+
+const char* Foam::foamVtkOutput::legacyAsciiFormatter::name() const
 {
-    return (type_ & LEGACY);
+    return legacyName_;
 }
 
 
-inline bool Foam::foamVtkOutputOptions::xml() const
+const char* Foam::foamVtkOutput::legacyAsciiFormatter::encoding() const
 {
-    return !legacy();
-}
-
-
-inline bool Foam::foamVtkOutputOptions::append() const
-{
-    return (type_ & APPEND);
-}
-
-
-inline bool Foam::foamVtkOutputOptions::insitu() const
-{
-    return !(type_ & APPEND);
-}
-
-
-inline bool Foam::foamVtkOutputOptions::ascii() const
-{
-    return !(type_ & (BINARY | BASE64));
+    return legacyName_;
 }
 
 
diff --git a/src/fileFormats/vtk/format/foamVtkLegacyAsciiFormatter.H b/src/fileFormats/vtk/format/foamVtkLegacyAsciiFormatter.H
new file mode 100644
index 0000000000..248c848cc1
--- /dev/null
+++ b/src/fileFormats/vtk/format/foamVtkLegacyAsciiFormatter.H
@@ -0,0 +1,108 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2017 OpenCFD Ltd.
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::foamVtkOutput::legacyAsciiFormatter
+
+Description
+    Formatting as per Foam::foamVtkOutput::asciiFormatter, but with
+    naming for legacy output.
+
+SourceFiles
+    foamVtkLegacyAsciiFormatter.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef foamVtkLegacyAsciiFormatter_H
+#define foamVtkLegacyAsciiFormatter_H
+
+#include "foamVtkAsciiFormatter.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace foamVtkOutput
+{
+
+/*---------------------------------------------------------------------------*\
+                    Class legacyAsciiFormatter Declaration
+\*---------------------------------------------------------------------------*/
+
+class legacyAsciiFormatter
+:
+    public asciiFormatter
+{
+    // Private Data Members
+
+        static const char* legacyName_;
+
+        //- Disallow default bitwise copy construct
+        legacyAsciiFormatter(const legacyAsciiFormatter&) = delete;
+
+        //- Disallow default bitwise assignment
+        void operator=(const legacyAsciiFormatter&) = delete;
+
+
+public:
+
+    // Constructors
+
+        //- Construct and attach to an output stream, use default precision
+        legacyAsciiFormatter(std::ostream& os);
+
+        //- Construct and attach to an output stream, use specified precision
+        legacyAsciiFormatter(std::ostream& os, unsigned precision);
+
+
+    //- Destructor
+    virtual ~legacyAsciiFormatter();
+
+
+    // Member Functions
+
+        //- The output formatType is LEGACY_ASCII.
+        virtual enum formatType format() const
+        {
+            return formatType::LEGACY_ASCII;
+        }
+
+        //- Name for the legacy ascii output type ("ASCII")
+        virtual const char* name() const;
+
+        //- Name for the XML append encoding (unused).
+        //  Currently identical to name(), but do not rely on this.
+        virtual const char* encoding() const;
+
+};
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace foamVtkOutput
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/fileFormats/vtk/format/foamVtkLegacyFormatter.C b/src/fileFormats/vtk/format/foamVtkLegacyRawFormatter.C
similarity index 76%
rename from src/fileFormats/vtk/format/foamVtkLegacyFormatter.C
rename to src/fileFormats/vtk/format/foamVtkLegacyRawFormatter.C
index a3e87264f8..733d7a4ab0 100644
--- a/src/fileFormats/vtk/format/foamVtkLegacyFormatter.C
+++ b/src/fileFormats/vtk/format/foamVtkLegacyRawFormatter.C
@@ -23,17 +23,17 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "foamVtkLegacyFormatter.H"
+#include "foamVtkLegacyRawFormatter.H"
 #include "endian.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-const char* Foam::foamVtkLegacyFormatter::name_ = "BINARY";
+const char* Foam::foamVtkOutput::legacyRawFormatter::legacyName_ = "BINARY";
 
 
 // * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * //
 
-void Foam::foamVtkLegacyFormatter::write
+void Foam::foamVtkOutput::legacyRawFormatter::write
 (
     const char* s,
     std::streamsize n
@@ -45,37 +45,46 @@ void Foam::foamVtkLegacyFormatter::write
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-Foam::foamVtkLegacyFormatter::foamVtkLegacyFormatter(std::ostream& os)
+Foam::foamVtkOutput::legacyRawFormatter::legacyRawFormatter
+(
+    std::ostream& os
+)
 :
-    foamVtkFormatter(os)
+    formatter(os)
 {}
 
 
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
 
-Foam::foamVtkLegacyFormatter::~foamVtkLegacyFormatter()
+Foam::foamVtkOutput::legacyRawFormatter::~legacyRawFormatter()
 {}
 
 
 // * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
 
-const char* Foam::foamVtkLegacyFormatter::name() const
+const char* Foam::foamVtkOutput::legacyRawFormatter::name() const
 {
-    return name_;
+    return legacyName_;
 }
 
 
-const char* Foam::foamVtkLegacyFormatter::encoding() const
+const char* Foam::foamVtkOutput::legacyRawFormatter::encoding() const
 {
-    return name_;
+    return legacyName_;
 }
 
 
-void Foam::foamVtkLegacyFormatter::writeSize(const uint64_t ignored)
+void Foam::foamVtkOutput::legacyRawFormatter::writeSize
+(
+    const uint64_t ignored
+)
 {/*nop*/}
 
 
-void Foam::foamVtkLegacyFormatter::write(const uint8_t val)
+void Foam::foamVtkOutput::legacyRawFormatter::write
+(
+    const uint8_t val
+)
 {
     // Legacy can only handle 32-bit integers.
     // Nonetheless promote to 'label' (32 or 64 bit) and deal with it later
@@ -84,7 +93,10 @@ void Foam::foamVtkLegacyFormatter::write(const uint8_t val)
 }
 
 
-void Foam::foamVtkLegacyFormatter::write(const label val)
+void Foam::foamVtkOutput::legacyRawFormatter::write
+(
+    const label val
+)
 {
     // std::cerr<<"label is:" << sizeof(val) << '\n';
 
@@ -104,7 +116,10 @@ void Foam::foamVtkLegacyFormatter::write(const label val)
 }
 
 
-void Foam::foamVtkLegacyFormatter::write(const float val)
+void Foam::foamVtkOutput::legacyRawFormatter::write
+(
+    const float val
+)
 {
     // std::cerr<<"float is:" << sizeof(val) << '\n';
 
@@ -122,7 +137,10 @@ void Foam::foamVtkLegacyFormatter::write(const float val)
 }
 
 
-void Foam::foamVtkLegacyFormatter::write(const double val)
+void Foam::foamVtkOutput::legacyRawFormatter::write
+(
+    const double val
+)
 {
     // Legacy cannot support Float64 anyhow.
     // std::cerr<<"write double as float:" << val << '\n';
@@ -131,7 +149,7 @@ void Foam::foamVtkLegacyFormatter::write(const double val)
 }
 
 
-void Foam::foamVtkLegacyFormatter::flush()
+void Foam::foamVtkOutput::legacyRawFormatter::flush()
 {
     os()<< '\n';
 }
diff --git a/src/fileFormats/vtk/format/foamVtkLegacyFormatter.H b/src/fileFormats/vtk/format/foamVtkLegacyRawFormatter.H
similarity index 78%
rename from src/fileFormats/vtk/format/foamVtkLegacyFormatter.H
rename to src/fileFormats/vtk/format/foamVtkLegacyRawFormatter.H
index 6ec5ba7e8d..47717a598b 100644
--- a/src/fileFormats/vtk/format/foamVtkLegacyFormatter.H
+++ b/src/fileFormats/vtk/format/foamVtkLegacyRawFormatter.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2016-2017 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2017 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -22,7 +22,7 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
-    foamVtkLegacyFormatter
+    Foam::foamVtkOutput::legacyRawFormatter
 
 Description
     Binary output for the VTK legacy format, always written as big-endian
@@ -31,12 +31,12 @@ Description
     This format should never be used for OpenFOAM with 64-bit label sizes.
 
 SourceFiles
-    foamVtkLegacyFormatter.C
+    foamVtkLegacyRawFormatter.C
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef foamVtkLegacyFormatter_H
-#define foamVtkLegacyFormatter_H
+#ifndef foamVtkLegacyRawFormatter_H
+#define foamVtkLegacyRawFormatter_H
 
 #include "foamVtkFormatter.H"
 
@@ -44,27 +44,29 @@ SourceFiles
 
 namespace Foam
 {
+namespace foamVtkOutput
+{
 
 /*---------------------------------------------------------------------------*\
-                   Class foamVtkLegacyFormatter Declaration
+                       Class legacyRawFormatter Declaration
 \*---------------------------------------------------------------------------*/
 
-class foamVtkLegacyFormatter
+class legacyRawFormatter
 :
-    public foamVtkFormatter
+    public formatter
 {
     // Private Data Members
 
-        static const char* name_;
+        static const char* legacyName_;
 
 
     // Private Member Functions
 
         //- Disallow default bitwise copy construct
-        foamVtkLegacyFormatter(const foamVtkLegacyFormatter&) = delete;
+        legacyRawFormatter(const legacyRawFormatter&) = delete;
 
         //- Disallow default bitwise assignment
-        void operator=(const foamVtkLegacyFormatter&) = delete;
+        void operator=(const legacyRawFormatter&) = delete;
 
 
 protected:
@@ -80,15 +82,21 @@ public:
     // Constructors
 
         //- Construct and attach to an output stream
-        foamVtkLegacyFormatter(std::ostream& os);
+        legacyRawFormatter(std::ostream& os);
 
 
     //- Destructor
-    virtual ~foamVtkLegacyFormatter();
+    virtual ~legacyRawFormatter();
 
 
     // Member Functions
 
+        //- The output formatType is LEGACY_BINARY.
+        virtual enum formatType format() const
+        {
+            return formatType::LEGACY_BINARY;
+        }
+
         //- Name for the legacy binary output type ("BINARY")
         virtual const char* name() const;
 
@@ -112,6 +120,7 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+} // End namespace foamVtkOutput
 } // End namespace Foam
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/fileFormats/vtk/format/foamVtkOutputOptions.C b/src/fileFormats/vtk/format/foamVtkOutputOptions.C
deleted file mode 100644
index c88d334594..0000000000
--- a/src/fileFormats/vtk/format/foamVtkOutputOptions.C
+++ /dev/null
@@ -1,235 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2016-2017 OpenCFD Ltd.
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-License
-    This file is part of OpenFOAM.
-
-    OpenFOAM is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "foamVtkOutputOptions.H"
-
-#include "foamVtkAppendBase64Formatter.H"
-#include "foamVtkAppendRawFormatter.H"
-#include "foamVtkAsciiFormatter.H"
-#include "foamVtkBase64Formatter.H"
-#include "foamVtkLegacyFormatter.H"
-
-#include "IOstream.H"
-
-
-// * * * * * * * * * * * * * * Constructor * * * * * * * * * * * * * //
-
-Foam::foamVtkOutputOptions::foamVtkOutputOptions()
-:
-    type_(ASCII),
-    precision_(IOstream::defaultPrecision())
-{}
-
-
-// * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * * //
-
-Foam::autoPtr<Foam::foamVtkFormatter>
-Foam::foamVtkOutputOptions::newFormatter(std::ostream& os) const
-{
-    switch (type_)
-    {
-        case (LEGACY | BINARY):
-            return autoPtr<foamVtkFormatter>
-            (
-                new foamVtkLegacyFormatter(os)
-            );
-
-        case BASE64:  // xml insitu
-            return autoPtr<foamVtkFormatter>
-            (
-                new foamVtkBase64Formatter(os)
-            );
-
-        case (APPEND | BASE64):
-            return autoPtr<foamVtkFormatter>
-            (
-                new foamVtkAppendBase64Formatter(os)
-            );
-
-        case (APPEND | BINARY):
-            return autoPtr<foamVtkFormatter>
-            (
-                new foamVtkAppendRawFormatter(os)
-            );
-
-        default:   // ASCII (legacy or xml) must always work
-            return autoPtr<foamVtkFormatter>
-            (
-                new foamVtkAsciiFormatter(os, precision_)
-            );
-    }
-}
-
-
-// * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
-
-void Foam::foamVtkOutputOptions::ascii(bool on)
-{
-    if (on)
-    {
-        // Force ASCII:
-
-        if (type_ & APPEND)
-        {
-            // Append: ascii = base64 (vs raw binary)
-            type_ = (APPEND | BASE64);
-        }
-        else if (type_ & LEGACY)
-        {
-            // Legacy: ascii = ascii
-            type_ = (LEGACY | ASCII);
-        }
-        else
-        {
-            // XML: ascii = ascii
-            type_ = ASCII;
-        }
-    }
-    else
-    {
-        // Non-ASCII:
-
-        if (type_ & APPEND)
-        {
-            // Append: binary == (raw) binary
-            type_ = APPEND | BINARY;
-        }
-        else if (type_ & LEGACY)
-        {
-            // Legacy: binary = binary
-            type_ = LEGACY | BINARY;
-        }
-        else
-        {
-            // XML: binary == (inline) binary == base64
-            type_ = BASE64;
-        }
-    }
-}
-
-
-void Foam::foamVtkOutputOptions::append(bool on)
-{
-    if (on)
-    {
-        if (!(type_ & APPEND))
-        {
-            // XML:    base64 -> raw binary, ascii -> base64
-            // Legacy: binary -> raw binary, ascii -> base64
-            type_ = APPEND | ((type_ & (BASE64 | BINARY)) ? BINARY : BASE64);
-        }
-    }
-    else if (type_ & APPEND)
-    {
-        // Only revert back to inline XML base64 versions
-        // ASCII needs another step.
-
-        type_ = BASE64;
-    }
-}
-
-
-void Foam::foamVtkOutputOptions::legacy(bool on)
-{
-    if (on)
-    {
-        if (type_ & APPEND)
-        {
-            // Append: base64 -> ascii, binary -> binary
-            type_ = (LEGACY | ((type_ & BINARY) ? BINARY : ASCII));
-        }
-        else if (type_ & LEGACY)
-        {
-            // no-op
-        }
-        else
-        {
-            // XML: ascii -> ascii, base64 -> binary
-            type_ = (LEGACY | ((type_ & BASE64) ? BINARY : ASCII));
-        }
-    }
-    else if (type_ & LEGACY)
-    {
-        // Legacy: ascii -> xml ascii, binary -> xml base64
-        type_ = (type_ & BINARY) ? BASE64 : ASCII;
-    }
-}
-
-
-void Foam::foamVtkOutputOptions::precision(unsigned prec) const
-{
-    precision_ = prec;
-}
-
-
-Foam::Ostream& Foam::foamVtkOutputOptions::info(Ostream& os) const
-{
-    os << "type: " << type_;
-
-    switch (type_)
-    {
-        case (LEGACY | ASCII):
-            os << " legacy ascii";
-            break;
-
-        case (LEGACY | BINARY):
-            os << " legacy binary";
-            break;
-
-        case BASE64:
-            os << " xml insitu base64";
-            break;
-
-        case (APPEND | BASE64):
-            os << " xml-append base64";
-            break;
-
-        case (APPEND | BINARY):
-            os << " xml-append binary";
-            break;
-
-        case ASCII:
-            os << " xml insitu ascii";
-            break;
-
-        case BINARY:
-            os << " xml insitu binary - WRONG";
-            break;
-
-        default:
-            os << " unknown";
-            break;
-    }
-
-    if (legacy()) os << " legacy";
-    if (xml())    os << " xml";
-    if (append()) os << " append";
-    if (ascii())  os << " ascii";
-
-    return os;
-}
-
-
-// ************************************************************************* //
diff --git a/src/conversion/vtk/output/foamVtkOutput.C b/src/fileFormats/vtk/output/foamVtkOutput.C
similarity index 54%
rename from src/conversion/vtk/output/foamVtkOutput.C
rename to src/fileFormats/vtk/output/foamVtkOutput.C
index fc2d298841..b4577fb948 100644
--- a/src/conversion/vtk/output/foamVtkOutput.C
+++ b/src/fileFormats/vtk/output/foamVtkOutput.C
@@ -24,32 +24,64 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "foamVtkOutput.H"
-#include "foamVtkAsciiFormatter.H"
 
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+#include "foamVtkFormatter.H"
+#include "foamVtkAsciiFormatter.H"
+#include "foamVtkBase64Formatter.H"
+#include "foamVtkAppendBase64Formatter.H"
+#include "foamVtkAppendRawFormatter.H"
+#include "foamVtkLegacyAsciiFormatter.H"
+#include "foamVtkLegacyRawFormatter.H"
+#include "typeInfo.H"
+
+// * * * * * * * * * * * * * * * Static Data * * * * * * * * * * * * * * * * //
 
 const Foam::word Foam::foamVtkOutput::legacy::EXT = "vtk";
 
 
-//! \cond fileScope
-static inline std::ostream& legacyDataHeader
+// * * * * * * * * * * * * * * Global Functions  * * * * * * * * * * * * * * //
+
+Foam::autoPtr<Foam::foamVtkOutput::formatter>
+Foam::foamVtkOutput::newFormatter
 (
     std::ostream& os,
-    const char* tag,
-    const Foam::label nItems,
-    const Foam::label nFields
+    const enum formatType fmtType,
+    unsigned prec
 )
 {
-    os  << tag << ' ' << nItems << '\n'
-        << "FIELD attributes " << nFields << '\n';
+    autoPtr<foamVtkOutput::formatter> fmt;
 
-    return os;
+    switch (fmtType)
+    {
+        case INLINE_ASCII:
+            fmt.set(new foamVtkOutput::asciiFormatter(os, prec));
+            break;
+
+        case INLINE_BASE64:
+            fmt.set(new foamVtkOutput::base64Formatter(os));
+            break;
+
+        case APPEND_BASE64:
+            fmt.set(new foamVtkOutput::appendBase64Formatter(os));
+            break;
+
+        case APPEND_BINARY:
+            fmt.set(new foamVtkOutput::appendRawFormatter(os));
+            break;
+
+        case LEGACY_ASCII:
+            fmt.set(new foamVtkOutput::legacyAsciiFormatter(os, prec));
+            break;
+
+        case LEGACY_BINARY:
+            fmt.set(new foamVtkOutput::legacyRawFormatter(os));
+            break;
+    }
+
+    return fmt;
 }
-//! \endcond
 
 
-// * * * * * * * * * * * * * Static Member Functions * * * * * * * * * * * * //
-
 Foam::label Foam::foamVtkOutput::writeVtmFile
 (
     std::ostream& os,
@@ -58,7 +90,7 @@ Foam::label Foam::foamVtkOutput::writeVtmFile
 {
     const word& content = "vtkMultiBlockDataSet";
 
-    foamVtkAsciiFormatter vtmFile(os);
+    asciiFormatter vtmFile(os);
 
     vtmFile
         .xmlHeader()
@@ -79,7 +111,7 @@ Foam::label Foam::foamVtkOutput::writeVtmFile
 }
 
 
-std::ostream& Foam::foamVtkOutput::legacy::writeHeader
+std::ostream& Foam::foamVtkOutput::legacy::fileHeader
 (
     std::ostream& os,
     const std::string& title,
@@ -94,25 +126,41 @@ std::ostream& Foam::foamVtkOutput::legacy::writeHeader
 }
 
 
-std::ostream& Foam::foamVtkOutput::legacy::writeCellDataHeader
+std::ostream& Foam::foamVtkOutput::legacy::fileHeader
+(
+    foamVtkOutput::formatter& fmt,
+    const std::string& title
+)
+{
+    return fileHeader(fmt.os(), title, isType<legacyRawFormatter>(fmt));
+}
+
+
+std::ostream& Foam::foamVtkOutput::legacy::cellDataHeader
 (
     std::ostream& os,
     const label nCells,
     const label nFields
 )
 {
-    return legacyDataHeader(os, "CELL_DATA", nCells, nFields);
+    os  << "CELL_DATA " << nCells << nl
+        << "FIELD attributes " << nFields << nl;
+
+    return os;
 }
 
 
-std::ostream& Foam::foamVtkOutput::legacy::writePointDataHeader
+std::ostream& Foam::foamVtkOutput::legacy::pointDataHeader
 (
     std::ostream& os,
     const label nPoints,
     const label nFields
 )
 {
-    return legacyDataHeader(os, "POINT_DATA", nPoints, nFields);
+    os  << "POINT_DATA " << nPoints << nl
+        << "FIELD attributes " << nFields << nl;
+
+    return os;
 }
 
 
diff --git a/src/fileFormats/vtk/output/foamVtkOutput.H b/src/fileFormats/vtk/output/foamVtkOutput.H
new file mode 100644
index 0000000000..f9d44d15e4
--- /dev/null
+++ b/src/fileFormats/vtk/output/foamVtkOutput.H
@@ -0,0 +1,211 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2016-2017 OpenCFD Ltd.
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Namespace
+    Foam::foamVtkOutput
+
+Description
+    Namespace for handling VTK output.
+    Contains classes and functions for writing VTK file content.
+
+Namespace
+    Foam::foamVtkOutput::legacy
+
+Description
+    Namespace for legacy VTK output functions.
+
+SourceFiles
+    foamVtkOutput.C
+    foamVtkOutputTemplates.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef foamVtkOutput_H
+#define foamVtkOutput_H
+
+#include "autoPtr.H"
+#include "foamVtkOutputTypes.H"
+#include "foamVtkFormatter.H"
+#include "floatScalar.H"
+#include "IOstream.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace foamVtkOutput
+{
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+  // Typedefs
+
+    //- Use UInt64 for header data
+    typedef formatter::headerType headerType;
+
+
+  // General Functions
+
+    //- Return a default asciiFormatter
+    autoPtr<foamVtkOutput::formatter> newFormatter(std::ostream& os);
+
+
+    //- Return a new formatter based on the specified format type
+    autoPtr<foamVtkOutput::formatter> newFormatter
+    (
+        std::ostream& os,
+        const enum formatType fmtType,
+        unsigned prec = IOstream::defaultPrecision()
+    );
+
+
+    //- Write vtm datasets for specified files
+    label writeVtmFile(std::ostream& os, const UList<fileName>& files);
+
+
+    //- Write a value component-wise.
+    template<class Type>
+    inline void write
+    (
+        foamVtkOutput::formatter& fmt,
+        const Type& val
+    );
+
+
+    //- Write a list of values.
+    //  The output does not include the payload size.
+    template<class Type>
+    void writeList
+    (
+        foamVtkOutput::formatter& fmt,
+        const UList<Type>& lst
+    );
+
+
+    //- Write a list of values via indirect addressing.
+    //  The output does not include the payload size.
+    template<class Type>
+    void writeList
+    (
+        foamVtkOutput::formatter& fmt,
+        const UList<Type>& lst,
+        const UList<label>& addressing
+    );
+
+
+/*---------------------------------------------------------------------------*\
+                               Namespace legacy
+\*---------------------------------------------------------------------------*/
+
+//- Some minimal additional support for writing legacy files
+namespace legacy
+{
+  // Constants
+
+    //- File extension for legacy files (vtk)
+    extern const Foam::word EXT;
+
+
+  // Functions
+
+    //- Emit header for legacy file.
+    //  Writes "ASCII" or "BINARY" depending on specified type.
+    std::ostream& fileHeader
+    (
+        std::ostream& os,
+        const std::string& title,
+        const bool binary = false
+    );
+
+    //- Emit header for legacy file.
+    //  Writes "ASCII" or "BINARY" depending on the formatter type.
+    std::ostream& fileHeader
+    (
+        foamVtkOutput::formatter& fmt,
+        const std::string& title
+    );
+
+    //- Emit header for legacy CELL_DATA
+    std::ostream& cellDataHeader
+    (
+        std::ostream& os,
+        const label nCells,
+        const label nFields
+    );
+
+
+    //- Emit header for legacy POINT_DATA
+    std::ostream& pointDataHeader
+    (
+        std::ostream& os,
+        const label nPoints,
+        const label nFields
+    );
+
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+//- Template specialization for label
+template<>
+inline void write<label>(foamVtkOutput::formatter& fmt, const label& val)
+{
+    fmt.write(val);
+}
+
+
+//- Template specialization for float
+template<>
+inline void write<float>(foamVtkOutput::formatter& fmt, const float& val)
+{
+    fmt.write(val);
+}
+
+
+//- Template specialization for double
+template<>
+inline void write<double>(foamVtkOutput::formatter& fmt, const double& val)
+{
+    fmt.write(val);
+}
+
+} // End namespace foamVtkOutput
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#ifdef NoRepository
+    #include "foamVtkOutputTemplates.C"
+#endif
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/fileFormats/vtk/output/foamVtkOutputOptions.C b/src/fileFormats/vtk/output/foamVtkOutputOptions.C
new file mode 100644
index 0000000000..232ea5f0ab
--- /dev/null
+++ b/src/fileFormats/vtk/output/foamVtkOutputOptions.C
@@ -0,0 +1,131 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2016-2017 OpenCFD Ltd.
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "foamVtkOutputOptions.H"
+
+
+// * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
+
+Foam::foamVtkOutput::outputOptions&
+Foam::foamVtkOutput::outputOptions::ascii(bool on)
+{
+    if (on)
+    {
+        switch (fmtType_)
+        {
+            case INLINE_BASE64: fmtType_ = INLINE_ASCII;   break;
+            case APPEND_BINARY: fmtType_ = APPEND_BASE64;  break;
+            case LEGACY_BINARY: fmtType_ = LEGACY_ASCII;   break;
+            default: break; // no change
+        }
+    }
+    else
+    {
+        switch (fmtType_)
+        {
+            case INLINE_ASCII:  fmtType_ = INLINE_BASE64;  break;
+            case APPEND_BASE64: fmtType_ = APPEND_BINARY;  break;
+            case LEGACY_ASCII:  fmtType_ = LEGACY_BINARY;  break;
+            default: break; // no change
+        }
+    }
+
+    return *this;
+}
+
+
+Foam::foamVtkOutput::outputOptions&
+Foam::foamVtkOutput::outputOptions::append(bool on)
+{
+    if (on)
+    {
+        switch (fmtType_)
+        {
+            case INLINE_ASCII:  fmtType_ = APPEND_BASE64;  break;
+            case LEGACY_ASCII:  fmtType_ = APPEND_BASE64;  break;
+            case INLINE_BASE64: fmtType_ = APPEND_BINARY;  break;
+            case LEGACY_BINARY: fmtType_ = APPEND_BINARY;  break;
+            default: break; // no change
+        }
+    }
+    else
+    {
+        switch (fmtType_)
+        {
+            case APPEND_BASE64: fmtType_ = INLINE_ASCII;   break;
+            case APPEND_BINARY: fmtType_ = INLINE_BASE64;  break;
+            default: break; // no change
+        }
+    }
+
+    return *this;
+}
+
+
+Foam::foamVtkOutput::outputOptions&
+Foam::foamVtkOutput::outputOptions::legacy(bool on)
+{
+    if (on)
+    {
+        switch (fmtType_)
+        {
+            case INLINE_ASCII:  fmtType_ = LEGACY_ASCII;   break;
+            case INLINE_BASE64: fmtType_ = LEGACY_BINARY;  break;
+            case APPEND_BASE64: fmtType_ = LEGACY_ASCII;   break;
+            case APPEND_BINARY: fmtType_ = LEGACY_BINARY;  break;
+            default: break; // no change
+        }
+    }
+    else
+    {
+        switch (fmtType_)
+        {
+            case LEGACY_ASCII:  fmtType_ = INLINE_ASCII;   break;
+            case LEGACY_BINARY: fmtType_ = INLINE_BASE64;  break;
+            default: break; // no change
+        }
+    }
+
+    return *this;
+}
+
+
+Foam::string Foam::foamVtkOutput::outputOptions::description() const
+{
+    switch (fmtType_)
+    {
+        case INLINE_ASCII:  return "xml ascii";
+        case INLINE_BASE64: return "xml base64";
+        case APPEND_BASE64: return "xml-append base64";
+        case APPEND_BINARY: return "xml-append binary";
+        case LEGACY_ASCII:  return "legacy ascii";
+        case LEGACY_BINARY: return "legacy binary";
+    }
+
+    return "";
+}
+
+
+// ************************************************************************* //
diff --git a/src/fileFormats/vtk/format/foamVtkOutputOptions.H b/src/fileFormats/vtk/output/foamVtkOutputOptions.H
similarity index 65%
rename from src/fileFormats/vtk/format/foamVtkOutputOptions.H
rename to src/fileFormats/vtk/output/foamVtkOutputOptions.H
index 7e0e89b24b..826dc75128 100644
--- a/src/fileFormats/vtk/format/foamVtkOutputOptions.H
+++ b/src/fileFormats/vtk/output/foamVtkOutputOptions.H
@@ -22,10 +22,12 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
-    foamVtkOutputOptions
+    Foam::foamVtkOutput::outputOptions
 
 Description
-    Encapsulate combinations of output format options.
+    Encapsulated combinations of output format options.
+    This is primarily useful when defining the output type based on some
+    command-line arguments or dictionary contents.
 
 SourceFiles
     foamVtkOutputOptions.C
@@ -35,43 +37,36 @@ SourceFiles
 #ifndef foamVtkOutputOptions_H
 #define foamVtkOutputOptions_H
 
-#include "autoPtr.H"
-#include "foamVtkFormatter.H"
+#include "foamVtkOutput.H"
+#include "string.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
 {
-class Ostream;
+namespace foamVtkOutput
+{
 
 /*---------------------------------------------------------------------------*\
-                    Class foamVtkOutputOptions Declaration
+                        Class outputOptions Declaration
 \*---------------------------------------------------------------------------*/
 
-class foamVtkOutputOptions
+class outputOptions
 {
-    // Private data
+private:
 
-        //- The supported output/format types
-        enum foamVtkOptionTypes
-        {
-            ASCII  = 0x0000,    //!< ASCII formatting for data
-            BINARY = 0x0001,    //!< Raw binary formatting for data
-            BASE64 = 0x0002,    //!< Base64 encoding for data
-            LEGACY = 0x0100,    //!< Legacy vtk file format
-            APPEND = 0x0200     //!< XML append format
-        };
+    // Private Member Data
 
         //- The output style tuning
-        enum foamVtkStyleOptions
+        enum styleType
         {
-            NONE   = 0x0000,    //!< Normal
-            HEADER = 0x0001     //!< Emit xml header
+            NONE   = 0x00,  //!< Normal
+            HEADER = 0x01   //!< Emit xml header
         };
 
 
         //- The output format type
-        unsigned short type_;
+        formatType fmtType_;
 
         //- ASCII write precision
         mutable unsigned precision_;
@@ -82,18 +77,24 @@ public:
     // Constructors
 
         //- Construct null - XML insitu ASCII format with default precision
-        foamVtkOutputOptions();
+        inline outputOptions();
+
+        //- Construct with specified format
+        inline outputOptions(enum formatType fmtType);
 
 
     // Selectors
 
-        //- Return new data formatter based on the writer options
-        autoPtr<foamVtkFormatter> newFormatter(std::ostream& os) const;
+        //- Return new formatter based on the selected output options
+        inline autoPtr<formatter> newFormatter(std::ostream& os) const;
 
 
     // Member Functions
 
-    // Access
+      // Access
+
+        //- The output format type
+        inline formatType format() const;
 
         //- True if writer uses legacy file format
         inline bool legacy() const;
@@ -111,34 +112,39 @@ public:
         inline bool ascii() const;
 
 
-    // Edit
+      // Edit
 
         //- Toggle ASCII mode on/off.
-        //  In append mode, this switches between base64 and raw binary.
-        //  In XML mode, this switches between ASCII and base64.
+        //  In XML append mode, this switches between base64 and raw binary.
+        //  In XML inline mode, this switches between ASCII and base64.
         //  In legacy mode, this switches between ASCII and binary.
-        void ascii(bool on);
+        //  \return outputOptions for chaining
+        outputOptions& ascii(bool on);
 
         //- Toggle append mode on/off.
-        void append(bool on);
+        //  \return outputOptions for chaining
+        outputOptions& append(bool on);
 
         //- Toggle legacy mode on/off.
-        void legacy(bool on);
+        //  \return outputOptions for chaining
+        outputOptions& legacy(bool on);
 
         //- Set the write precision to be used for new ASCII formatters
-        void precision(unsigned prec) const;
+        //  \return outputOptions for chaining
+        inline const outputOptions& precision(unsigned prec) const;
 
 
     // Other
 
-        //- Report information about the options
-        Ostream& info(Ostream&) const;
+        //- Report description about the option selected
+        string description() const;
 
 };
 
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+} // End namespace foamVtkOutput
 } // End namespace Foam
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/fileFormats/vtk/output/foamVtkOutputOptionsI.H b/src/fileFormats/vtk/output/foamVtkOutputOptionsI.H
new file mode 100644
index 0000000000..f4a0aafcff
--- /dev/null
+++ b/src/fileFormats/vtk/output/foamVtkOutputOptionsI.H
@@ -0,0 +1,102 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2016-2017 OpenCFD Ltd.
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+inline Foam::foamVtkOutput::outputOptions::outputOptions()
+:
+    fmtType_(INLINE_ASCII),
+    precision_(IOstream::defaultPrecision())
+{}
+
+
+inline Foam::foamVtkOutput::outputOptions::outputOptions
+(
+    enum formatType fmtType
+)
+:
+    fmtType_(fmtType),
+    precision_(IOstream::defaultPrecision())
+{}
+
+
+// * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * * //
+
+inline Foam::autoPtr<Foam::foamVtkOutput::formatter>
+Foam::foamVtkOutput::outputOptions::newFormatter(std::ostream& os) const
+{
+    return foamVtkOutput::newFormatter(os, fmtType_, precision_);
+}
+
+
+// * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
+
+inline Foam::foamVtkOutput::formatType
+Foam::foamVtkOutput::outputOptions::format() const
+{
+    return fmtType_;
+}
+
+
+inline bool Foam::foamVtkOutput::outputOptions::legacy() const
+{
+    return (fmtType_ & formatType::LEGACY_ASCII & formatType::LEGACY_BINARY);
+}
+
+
+inline bool Foam::foamVtkOutput::outputOptions::xml() const
+{
+    return !legacy();
+}
+
+
+inline bool Foam::foamVtkOutput::outputOptions::append() const
+{
+    return (fmtType_ & formatType::APPEND_BASE64 & formatType::APPEND_BINARY);
+}
+
+
+inline bool Foam::foamVtkOutput::outputOptions::insitu() const
+{
+    return !append();
+}
+
+
+inline bool Foam::foamVtkOutput::outputOptions::ascii() const
+{
+    return !(fmtType_ & 0xF);
+}
+
+
+inline const Foam::foamVtkOutput::outputOptions&
+Foam::foamVtkOutput::outputOptions::precision(unsigned prec) const
+{
+    precision_ = prec;
+    return *this;
+}
+
+
+// ************************************************************************* //
diff --git a/src/conversion/vtk/output/foamVtkOutputTemplates.C b/src/fileFormats/vtk/output/foamVtkOutputTemplates.C
similarity index 69%
rename from src/conversion/vtk/output/foamVtkOutputTemplates.C
rename to src/fileFormats/vtk/output/foamVtkOutputTemplates.C
index a05fd4bb0f..9738740b8e 100644
--- a/src/conversion/vtk/output/foamVtkOutputTemplates.C
+++ b/src/fileFormats/vtk/output/foamVtkOutputTemplates.C
@@ -25,11 +25,10 @@ License
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-
 template<class Type>
 inline void Foam::foamVtkOutput::write
 (
-    foamVtkFormatter& fmt,
+    foamVtkOutput::formatter& fmt,
     const Type& val
 )
 {
@@ -43,7 +42,7 @@ inline void Foam::foamVtkOutput::write
 template<class Type>
 void Foam::foamVtkOutput::writeList
 (
-    foamVtkFormatter& fmt,
+    foamVtkOutput::formatter& fmt,
     const UList<Type>& lst
 )
 {
@@ -57,7 +56,7 @@ void Foam::foamVtkOutput::writeList
 template<class Type>
 void Foam::foamVtkOutput::writeList
 (
-    foamVtkFormatter& fmt,
+    foamVtkOutput::formatter& fmt,
     const UList<Type>& lst,
     const UList<label>& addressing
 )
@@ -69,43 +68,4 @@ void Foam::foamVtkOutput::writeList
 }
 
 
-template<class Type>
-void Foam::foamVtkOutput::writeField
-(
-    foamVtkFormatter& fmt,
-    const GeometricField<Type, fvPatchField, volMesh>& vf
-)
-{
-    const uint64_t payLoad =
-    (
-        vf.size() * pTraits<Type>::nComponents * sizeof(float)
-    );
-
-    fmt.writeSize(payLoad);
-    writeList(fmt, vf.internalField());
-
-    fmt.flush();
-}
-
-
-template<class Type>
-void Foam::foamVtkOutput::writeField
-(
-    foamVtkFormatter& fmt,
-    const GeometricField<Type, fvPatchField, volMesh>& vf,
-    const UList<label>& cellMap
-)
-{
-    const uint64_t payLoad =
-    (
-        cellMap.size() * pTraits<Type>::nComponents * sizeof(float)
-    );
-
-    fmt.writeSize(payLoad);
-    writeList(fmt, vf.internalField(), cellMap);
-
-    fmt.flush();
-}
-
-
 // ************************************************************************* //
diff --git a/src/fileFormats/vtk/type/foamVtkOutputTypes.H b/src/fileFormats/vtk/type/foamVtkOutputTypes.H
new file mode 100644
index 0000000000..d4dbe0d5c8
--- /dev/null
+++ b/src/fileFormats/vtk/type/foamVtkOutputTypes.H
@@ -0,0 +1,77 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2017 OpenCFD Ltd.
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+InNamespace
+    Foam::foamVtkOutput
+
+Description
+    Enumerations and typedefs for VTK output.
+
+SourceFiles
+    foamVtkOutputTypes.H
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef foamVtkOutputTypes_H
+#define foamVtkOutputTypes_H
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace foamVtkOutput
+{
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+  // Enumerations
+
+    //- The output format type for file contents.
+    //  Upper bits for output type, lower bits for the format itself.
+    enum formatType
+    {
+        /** XML inline ASCII, using the asciiFormatter */
+        INLINE_ASCII  = 0,
+        /** XML inline base64, using the base64Formatter */
+        INLINE_BASE64 = 0x01,
+        /** XML append base64, using the appendBase64Formatter */
+        APPEND_BASE64 = 0x11,
+        /** XML append raw binary, using the appendRawFormatter */
+        APPEND_BINARY = 0x12,
+        /** Legacy ASCII, using the legacyAsciiFormatter */
+        LEGACY_ASCII  = 0x20,
+        /** Legacy raw binary, using the legacyRawFormatter */
+        LEGACY_BINARY = 0x22,
+    };
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace foamVtkOutput
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //

From 418ebe4a87d8e422b94e7cff5816558dbea4cea9 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Fri, 19 May 2017 12:28:13 +0200
Subject: [PATCH 03/27] ENH: replace writeFuncs in setSet with foamVtk library
 utilities

---
 .../mesh/manipulation/setSet/Make/files       |   4 -
 .../mesh/manipulation/setSet/setSet.C         |  86 +------
 .../mesh/manipulation/setSet/writeFuns.C      | 225 ------------------
 .../mesh/manipulation/setSet/writeFuns.H      | 127 ----------
 .../mesh/manipulation/setSet/writePatch.C     | 127 ----------
 src/meshTools/Make/files                      |   4 +
 .../output/foamVtkWriteCellSetFaces.C         | 139 +++++++++++
 .../output/foamVtkWriteCellSetFaces.H         |  72 ++++++
 .../meshTools/output/foamVtkWriteFaceSet.C    | 112 ++++-----
 .../meshTools/output/foamVtkWriteFaceSet.H    |  29 ++-
 src/meshTools/output/foamVtkWritePointSet.C   |  74 ++++++
 .../meshTools/output/foamVtkWritePointSet.H   |  38 +--
 12 files changed, 390 insertions(+), 647 deletions(-)
 delete mode 100644 applications/utilities/mesh/manipulation/setSet/writeFuns.C
 delete mode 100644 applications/utilities/mesh/manipulation/setSet/writeFuns.H
 delete mode 100644 applications/utilities/mesh/manipulation/setSet/writePatch.C
 create mode 100644 src/meshTools/output/foamVtkWriteCellSetFaces.C
 create mode 100644 src/meshTools/output/foamVtkWriteCellSetFaces.H
 rename applications/utilities/mesh/manipulation/setSet/writePointSet.C => src/meshTools/output/foamVtkWriteFaceSet.C (51%)
 rename applications/utilities/mesh/manipulation/setSet/writePointSet.H => src/meshTools/output/foamVtkWriteFaceSet.H (80%)
 create mode 100644 src/meshTools/output/foamVtkWritePointSet.C
 rename applications/utilities/mesh/manipulation/setSet/writePatch.H => src/meshTools/output/foamVtkWritePointSet.H (73%)

diff --git a/applications/utilities/mesh/manipulation/setSet/Make/files b/applications/utilities/mesh/manipulation/setSet/Make/files
index e6da558d1d..75c578a1e5 100644
--- a/applications/utilities/mesh/manipulation/setSet/Make/files
+++ b/applications/utilities/mesh/manipulation/setSet/Make/files
@@ -1,7 +1,3 @@
-writePointSet.C
-writeFuns.C
-writePatch.C
 setSet.C
 
 EXE = $(FOAM_APPBIN)/setSet
-
diff --git a/applications/utilities/mesh/manipulation/setSet/setSet.C b/applications/utilities/mesh/manipulation/setSet/setSet.C
index 1dffb5849e..361acf1222 100644
--- a/applications/utilities/mesh/manipulation/setSet/setSet.C
+++ b/applications/utilities/mesh/manipulation/setSet/setSet.C
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2017 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -44,8 +44,9 @@ Description
 #include "OFstream.H"
 #include "IFstream.H"
 #include "demandDrivenData.H"
-#include "writePatch.H"
-#include "writePointSet.H"
+#include "foamVtkWriteCellSetFaces.H"
+#include "foamVtkWriteFaceSet.H"
+#include "foamVtkWritePointSet.H"
 #include "IOobjectList.H"
 #include "cellZoneSet.H"
 #include "faceZoneSet.H"
@@ -81,93 +82,28 @@ void writeVTK
     if (isA<faceSet>(currentSet))
     {
         // Faces of set with OpenFOAM faceID as value
-
-        faceList setFaces(currentSet.size());
-        labelList faceValues(currentSet.size());
-        label setFacei = 0;
-
-        forAllConstIter(topoSet, currentSet, iter)
-        {
-            setFaces[setFacei] = mesh.faces()[iter.key()];
-            faceValues[setFacei] = iter.key();
-            setFacei++;
-        }
-
-        primitiveFacePatch fp(setFaces, mesh.points());
-
-        writePatch
+        foamVtkOutput::writeFaceSet
         (
             true,
-            currentSet.name(),
-            fp,
-            "faceID",
-            faceValues,
+            mesh,
+            currentSet,
             mesh.time().path()/vtkName
         );
     }
     else if (isA<cellSet>(currentSet))
     {
         // External faces of cellset with OpenFOAM cellID as value
-
-        Map<label> cellFaces(currentSet.size());
-
-        forAllConstIter(cellSet, currentSet, iter)
-        {
-            label celli = iter.key();
-
-            const cell& cFaces = mesh.cells()[celli];
-
-            forAll(cFaces, i)
-            {
-                label facei = cFaces[i];
-
-                if (mesh.isInternalFace(facei))
-                {
-                    label otherCelli = mesh.faceOwner()[facei];
-
-                    if (otherCelli == celli)
-                    {
-                        otherCelli = mesh.faceNeighbour()[facei];
-                    }
-
-                    if (!currentSet.found(otherCelli))
-                    {
-                        cellFaces.insert(facei, celli);
-                    }
-                }
-                else
-                {
-                    cellFaces.insert(facei, celli);
-                }
-            }
-        }
-
-        faceList setFaces(cellFaces.size());
-        labelList faceValues(cellFaces.size());
-        label setFacei = 0;
-
-        forAllConstIter(Map<label>, cellFaces, iter)
-        {
-            setFaces[setFacei] = mesh.faces()[iter.key()];
-            faceValues[setFacei] = iter();              // Cell ID
-            setFacei++;
-        }
-
-        primitiveFacePatch fp(setFaces, mesh.points());
-
-        writePatch
+        foamVtkOutput::writeCellSetFaces
         (
             true,
-            currentSet.name(),
-            fp,
-            "cellID",
-            faceValues,
+            mesh,
+            currentSet,
             mesh.time().path()/vtkName
         );
     }
     else if (isA<pointSet>(currentSet))
     {
-        writePointSet
+        foamVtkOutput::writePointSet
         (
             true,
             mesh,
diff --git a/applications/utilities/mesh/manipulation/setSet/writeFuns.C b/applications/utilities/mesh/manipulation/setSet/writeFuns.C
deleted file mode 100644
index 2a104cb01e..0000000000
--- a/applications/utilities/mesh/manipulation/setSet/writeFuns.C
+++ /dev/null
@@ -1,225 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-License
-    This file is part of OpenFOAM.
-
-    OpenFOAM is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "writeFuns.H"
-#include "endian.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-void Foam::writeFuns::swapWord(int32_t& word32)
-{
-    char* mem = reinterpret_cast<char*>(&word32);
-
-    char a = mem[0];
-    mem[0] = mem[3];
-    mem[3] = a;
-
-    a = mem[1];
-    mem[1] = mem[2];
-    mem[2] = a;
-}
-
-
-void Foam::writeFuns::swapWords(const label nWords, int32_t* words32)
-{
-    for (label i=0; i<nWords; i++)
-    {
-        swapWord(words32[i]);
-    }
-}
-
-
-void Foam::writeFuns::write
-(
-    std::ostream& os,
-    const bool binary,
-    List<floatScalar>& fField
-)
-{
-    if (binary)
-    {
-        #ifdef WM_LITTLE_ENDIAN
-        swapWords(fField.size(), reinterpret_cast<int32_t*>(fField.begin()));
-        #endif
-
-        os.write
-        (
-            reinterpret_cast<char*>(fField.begin()),
-            fField.size()*sizeof(float)
-        );
-
-        os  << std::endl;
-    }
-    else
-    {
-        forAll(fField, i)
-        {
-            os  << fField[i] << ' ';
-
-            if (i > 0 && (i % 10) == 0)
-            {
-                os  << std::endl;
-            }
-        }
-        os  << std::endl;
-    }
-}
-
-
-void Foam::writeFuns::write
-(
-    std::ostream& os,
-    const bool binary,
-    DynamicList<floatScalar>& fField
-)
-{
-    List<floatScalar>& fld = fField.shrink();
-    write(os, binary, fld);
-}
-
-
-void Foam::writeFuns::write
-(
-    std::ostream& os,
-    const bool binary,
-    labelList& elems
-)
-{
-    if (binary)
-    {
-        #ifdef WM_LITTLE_ENDIAN
-        swapWords
-        (
-            (sizeof(label)/4)*elems.size(),
-            reinterpret_cast<int32_t*>(elems.begin())
-        );
-        #endif
-        os.write
-        (
-            reinterpret_cast<char*>(elems.begin()),
-            elems.size()*sizeof(label)
-        );
-
-        os  << std::endl;
-    }
-    else
-    {
-        forAll(elems, i)
-        {
-            os  << elems[i] << ' ';
-
-            if (i > 0 && (i % 10) == 0)
-            {
-                os  << std::endl;
-            }
-        }
-        os  << std::endl;
-    }
-}
-
-
-void Foam::writeFuns::write
-(
-    std::ostream& os,
-    const bool binary,
-    DynamicList<label>& elems
-)
-{
-    labelList& fld = elems.shrink();
-    write(os, binary, fld);
-}
-
-
-void Foam::writeFuns::insert(const point& pt, DynamicList<floatScalar>& dest)
-{
-    dest.append(float(pt.x()));
-    dest.append(float(pt.y()));
-    dest.append(float(pt.z()));
-}
-
-
-void Foam::writeFuns::insert(const labelList& source, DynamicList<label>& dest)
-{
-    forAll(source, i)
-    {
-        dest.append(source[i]);
-    }
-}
-
-
-void Foam::writeFuns::insert
-(
-    const List<scalar>& source,
-    DynamicList<floatScalar>& dest
-)
-{
-    forAll(source, i)
-    {
-        dest.append(float(source[i]));
-    }
-}
-
-
-void Foam::writeFuns::insert
-(
-    const labelList& map,
-    const List<scalar>& source,
-    DynamicList<floatScalar>& dest
-)
-{
-    forAll(map, i)
-    {
-        dest.append(float(source[map[i]]));
-    }
-}
-
-
-void Foam::writeFuns::insert
-(
-    const List<point>& source,
-    DynamicList<floatScalar>& dest
-)
-{
-    forAll(source, i)
-    {
-       insert(source[i], dest);
-    }
-}
-
-void Foam::writeFuns::insert
-(
-    const labelList& map,
-    const List<point>& source,
-    DynamicList<floatScalar>& dest
-)
-{
-    forAll(map, i)
-    {
-       insert(source[map[i]], dest);
-    }
-}
-
-
-// ************************************************************************* //
diff --git a/applications/utilities/mesh/manipulation/setSet/writeFuns.H b/applications/utilities/mesh/manipulation/setSet/writeFuns.H
deleted file mode 100644
index 51c1ed8509..0000000000
--- a/applications/utilities/mesh/manipulation/setSet/writeFuns.H
+++ /dev/null
@@ -1,127 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-License
-    This file is part of OpenFOAM.
-
-    OpenFOAM is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
-
-Class
-    Foam::writeFuns
-
-Description
-    Various functions for collecting and writing binary data.
-
-    The LITTLE_ENDIAN is based on 32bit words.
-    It is not clear how 64bit labels should be handled, currently they are
-    split into two 32bit words and swapWord applied to these two.
-
-    writeFuns should be a namespace rather than a class.
-
-SourceFiles
-    writeFuns.C
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef writeFuns_H
-#define writeFuns_H
-
-#include "labelList.H"
-#include "floatScalar.H"
-#include "OFstream.H"
-#include "DynamicList.H"
-#include "point.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-/*---------------------------------------------------------------------------*\
-                           Class writeFuns Declaration
-\*---------------------------------------------------------------------------*/
-
-class writeFuns
-{
-    // Private member functions
-
-        //- Swap halves of word
-        static void swapWord(int32_t& word32);
-
-        //- Swap halves of word
-        static void swapWords(const label nWords, int32_t* words32);
-
-
-public:
-
-    //- Write floats ascii or binary.
-    //  If binary optionally in-place swaps argument
-    static void write(std::ostream&, const bool, DynamicList<floatScalar>&);
-
-    //- Write labels ascii or binary.
-    //  If binary optionally in-place swaps argument
-    static void write(std::ostream&, const bool, DynamicList<label>&);
-
-    //- Write floats ascii or binary.
-    //  If binary optionally in-place swaps argument
-    static void write(std::ostream&, const bool, List<floatScalar>&);
-
-    //- Write labels ascii or binary.
-    //  If binary optionally in-place swaps argument
-    static void write(std::ostream&, const bool, labelList&);
-
-    //- Append point to given DynamicList
-    static void insert(const point&, DynamicList<floatScalar>& dest);
-
-    //- Append elements of labelList to given DynamicList
-    static void insert(const labelList&, DynamicList<label>&);
-
-    //- Append elements of scalarList to given DynamicList
-    static void insert(const List<scalar>&, DynamicList<floatScalar>&);
-
-    //- Append elements of scalarList to given DynamicList using map
-    static void insert
-    (
-        const labelList& map,
-        const List<scalar>& source,
-        DynamicList<floatScalar>&
-    );
-
-    //- Append points to given DynamicList of floats
-    static void insert(const List<point>& source, DynamicList<floatScalar>&);
-
-    //- Append points to given DynamicList of floats using map
-    static void insert
-    (
-        const labelList& map,
-        const List<point>& source,
-        DynamicList<floatScalar>&
-    );
-};
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/applications/utilities/mesh/manipulation/setSet/writePatch.C b/applications/utilities/mesh/manipulation/setSet/writePatch.C
deleted file mode 100644
index 6a32699566..0000000000
--- a/applications/utilities/mesh/manipulation/setSet/writePatch.C
+++ /dev/null
@@ -1,127 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-License
-    This file is part of OpenFOAM.
-
-    OpenFOAM is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "writePatch.H"
-#include "OFstream.H"
-#include "writeFuns.H"
-#include "primitiveFacePatch.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-// * * * * * * * * * * * * * * * Global Functions  * * * * * * * * * * * * * //
-
-void writePatch
-(
-    const bool binary,
-    const word& setName,
-    const primitiveFacePatch& fp,
-    const word& fieldName,
-    labelList& fieldValues,
-    const fileName& fileName
-)
-{
-    std::ofstream pStream(fileName.c_str());
-
-    pStream
-        << "# vtk DataFile Version 2.0" << std::endl
-        << setName << std::endl;
-    if (binary)
-    {
-        pStream << "BINARY" << std::endl;
-    }
-    else
-    {
-        pStream << "ASCII" << std::endl;
-    }
-    pStream << "DATASET POLYDATA" << std::endl;
-
-
-    //------------------------------------------------------------------
-    //
-    // Write topology
-    //
-    //------------------------------------------------------------------
-
-
-    // Write points and faces as polygons
-
-    pStream << "POINTS " << fp.nPoints() << " float" << std::endl;
-
-    DynamicList<floatScalar> ptField(3*fp.nPoints());
-
-    writeFuns::insert(fp.localPoints(), ptField);
-
-    writeFuns::write(pStream, binary, ptField);
-
-
-    label nFaceVerts = 0;
-
-    forAll(fp.localFaces(), facei)
-    {
-        nFaceVerts += fp.localFaces()[facei].size() + 1;
-    }
-    pStream << "POLYGONS " << fp.size() << ' ' << nFaceVerts
-        << std::endl;
-
-
-    DynamicList<label> vertLabels(nFaceVerts);
-
-    forAll(fp.localFaces(), facei)
-    {
-        const face& f = fp.localFaces()[facei];
-
-        vertLabels.append(f.size());
-
-        writeFuns::insert(f, vertLabels);
-    }
-    writeFuns::write(pStream, binary, vertLabels);
-
-
-    //-----------------------------------------------------------------
-    //
-    // Write data
-    //
-    //-----------------------------------------------------------------
-
-    // Write faceID
-
-    pStream
-        << "CELL_DATA " << fp.size() << std::endl
-        << "FIELD attributes 1" << std::endl;
-
-    // Cell ids first
-    pStream << fieldName << " 1 " << fp.size() << " int" << std::endl;
-
-    writeFuns::write(pStream, binary, fieldValues);
-}
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// ************************************************************************* //
diff --git a/src/meshTools/Make/files b/src/meshTools/Make/files
index f9af11d9be..1beec64e85 100644
--- a/src/meshTools/Make/files
+++ b/src/meshTools/Make/files
@@ -266,6 +266,10 @@ meshStructure/meshStructure.C
 meshStructure/topoDistanceData.C
 meshStructure/pointTopoDistanceData.C
 
+output/foamVtkWriteFaceSet.C
+output/foamVtkWritePointSet.C
+output/foamVtkWriteCellSetFaces.C
+
 regionCoupled/patches/regionCoupledPolyPatch/regionCoupledBase.C
 regionCoupled/patches/regionCoupledPolyPatch/regionCoupledPolyPatch.C
 regionCoupled/patches/regionCoupledPolyPatch/regionCoupledWallPolyPatch.C
diff --git a/src/meshTools/output/foamVtkWriteCellSetFaces.C b/src/meshTools/output/foamVtkWriteCellSetFaces.C
new file mode 100644
index 0000000000..54772cf7f7
--- /dev/null
+++ b/src/meshTools/output/foamVtkWriteCellSetFaces.C
@@ -0,0 +1,139 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2017 OpenCFD Ltd.
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "foamVtkWriteCellSetFaces.H"
+#include "foamVtkOutputOptions.H"
+#include "OFstream.H"
+#include "primitiveMesh.H"
+#include "cellSet.H"
+#include "uindirectPrimitivePatch.H"
+
+// * * * * * * * * * * * * * * * Global Functions  * * * * * * * * * * * * * //
+
+void Foam::foamVtkOutput::writeCellSetFaces
+(
+    const bool binary,
+    const primitiveMesh& mesh,
+    const cellSet& set,
+    const fileName& fileName
+)
+{
+    std::ofstream os(fileName.c_str());
+
+    autoPtr<foamVtkOutput::formatter> format =
+        foamVtkOutput::outputOptions().legacy(true).ascii(!binary).newFormatter
+        (
+            os
+        );
+
+    foamVtkOutput::legacy::fileHeader(format(), set.name())
+        << "DATASET POLYDATA" << nl;
+
+    //-------------------------------------------------------------------------
+
+    // External faces of cellset with OpenFOAM cellID as value
+
+    Map<label> cellFaces(2*set.size());
+
+    forAllConstIters(set, iter)
+    {
+        label celli = iter.key();
+        const cell& cFaces = mesh.cells()[celli];
+
+        forAll(cFaces, i)
+        {
+            label facei = cFaces[i];
+
+            if (mesh.isInternalFace(facei))
+            {
+                label otherCelli = mesh.faceOwner()[facei];
+
+                if (otherCelli == celli)
+                {
+                    otherCelli = mesh.faceNeighbour()[facei];
+                }
+
+                if (!set.found(otherCelli))
+                {
+                    cellFaces.insert(facei, celli);
+                }
+            }
+            else
+            {
+                cellFaces.insert(facei, celli);
+            }
+        }
+    }
+
+    labelList faceLabels = cellFaces.sortedToc();
+    labelList faceValues(cellFaces.size());
+
+    forAll(faceLabels, facei)
+    {
+        faceValues[facei] = cellFaces[faceLabels[facei]];  // Cell ID
+    }
+
+    uindirectPrimitivePatch pp
+    (
+        UIndirectList<face>(mesh.faces(), faceLabels),
+        mesh.points()
+    );
+
+    //-------------------------------------------------------------------------
+
+    // Write points and faces as polygons
+    os << "POINTS " << pp.nPoints() << " float" << nl;
+
+    foamVtkOutput::writeList(format(), pp.localPoints());
+    format().flush();
+
+    label count = pp.size();
+    forAll(pp, facei)
+    {
+        count += pp.localFaces()[facei].size();
+    }
+    os << "POLYGONS " << pp.size() << ' ' << count << nl;
+
+    forAll(pp, facei)
+    {
+        const face& f = pp.localFaces()[facei];
+
+        format().write(f.size());
+        foamVtkOutput::writeList(format(), f);
+    }
+    format().flush();
+
+
+    // Write data - faceId/cellId
+    foamVtkOutput::legacy::cellDataHeader(os, pp.size(), 1);
+
+    os << "cellID 1 " << pp.size() << " int" << nl;
+
+    foamVtkOutput::writeList(format(), faceValues);
+    format().flush();
+}
+
+
+// ************************************************************************* //
diff --git a/src/meshTools/output/foamVtkWriteCellSetFaces.H b/src/meshTools/output/foamVtkWriteCellSetFaces.H
new file mode 100644
index 0000000000..621dbb0e06
--- /dev/null
+++ b/src/meshTools/output/foamVtkWriteCellSetFaces.H
@@ -0,0 +1,72 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2017 OpenCFD Ltd.
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+InNamespace
+    Foam::foamVtkOutput
+
+Description
+    Write faces of cellSet to vtk polydata file.
+
+    The data are the original cell ids
+
+SourceFiles
+    foamVtkWriteCellSetFaces.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef foamVtkWriteCellSetFaces_H
+#define foamVtkWriteCellSetFaces_H
+
+#include "primitiveMesh.H"
+#include "uindirectPrimitivePatch.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+ class primitiveMesh;
+class cellSet;
+class fileName;
+
+namespace foamVtkOutput
+{
+
+//- Write perimeter faces of cellset to vtk polydata file.
+//  The data are the original cell ids
+void writeCellSetFaces
+(
+    const bool binary,
+    const primitiveMesh& mesh,
+    const cellSet& set,
+    const fileName& fileName
+);
+
+} // End namespace foamVtkOutput
+} // End namespace Foam
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/applications/utilities/mesh/manipulation/setSet/writePointSet.C b/src/meshTools/output/foamVtkWriteFaceSet.C
similarity index 51%
rename from applications/utilities/mesh/manipulation/setSet/writePointSet.C
rename to src/meshTools/output/foamVtkWriteFaceSet.C
index 653839da35..e1221177c1 100644
--- a/applications/utilities/mesh/manipulation/setSet/writePointSet.C
+++ b/src/meshTools/output/foamVtkWriteFaceSet.C
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2017 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -23,83 +23,75 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "writePointSet.H"
+#include "foamVtkWriteFaceSet.H"
+#include "foamVtkOutputOptions.H"
 #include "OFstream.H"
-#include "writeFuns.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
+#include "primitiveMesh.H"
+#include "faceSet.H"
+#include "uindirectPrimitivePatch.H"
 
 // * * * * * * * * * * * * * * * Global Functions  * * * * * * * * * * * * * //
 
-void writePointSet
+void Foam::foamVtkOutput::writeFaceSet
 (
     const bool binary,
     const primitiveMesh& mesh,
-    const topoSet& set,
+    const faceSet& set,
     const fileName& fileName
 )
 {
-    std::ofstream pStream(fileName.c_str());
+    std::ofstream os(fileName.c_str());
 
-    pStream
-        << "# vtk DataFile Version 2.0" << std::endl
-        << set.name() << std::endl;
-    if (binary)
+    autoPtr<foamVtkOutput::formatter> format =
+        foamVtkOutput::outputOptions().legacy(true).ascii(!binary).newFormatter
+        (
+            os
+        );
+
+    foamVtkOutput::legacy::fileHeader(format(), set.name())
+        << "DATASET POLYDATA" << nl;
+
+    //-------------------------------------------------------------------------
+
+    // Faces of set with OpenFOAM faceID as value
+    labelList faceLabels = set.sortedToc();
+
+    uindirectPrimitivePatch pp
+    (
+        UIndirectList<face>(mesh.faces(), faceLabels),
+        mesh.points()
+    );
+
+    //-------------------------------------------------------------------------
+
+    // Write points and faces as polygons
+    os << "POINTS " << pp.nPoints() << " float" << nl;
+
+    foamVtkOutput::writeList(format(), pp.localPoints());
+    format().flush();
+
+    label count = pp.size();
+    forAll(pp, facei)
     {
-        pStream << "BINARY" << std::endl;
+        count += pp.localFaces()[facei].size();
     }
-    else
+    os << "POLYGONS " << pp.size() << ' ' << count << nl;
+
+    forAll(pp, facei)
     {
-        pStream << "ASCII" << std::endl;
+        const face& f = pp.localFaces()[facei];
+
+        format().write(f.size());
+        foamVtkOutput::writeList(format(), f);
     }
-    pStream << "DATASET POLYDATA" << std::endl;
+    format().flush();
 
+    // Write data - faceId/cellId
+    os << "faceID 1 " << pp.size() << " int" << nl;
 
-    //------------------------------------------------------------------
-    //
-    // Write topology
-    //
-    //------------------------------------------------------------------
-
-
-    labelList pointLabels(set.toc());
-
-    pointField setPoints(mesh.points(), pointLabels);
-
-    // Write points
-
-    pStream << "POINTS " << pointLabels.size() << " float" << std::endl;
-
-    DynamicList<floatScalar> ptField(3*pointLabels.size());
-
-    writeFuns::insert(setPoints, ptField);
-
-    writeFuns::write(pStream, binary, ptField);
-
-
-    //-----------------------------------------------------------------
-    //
-    // Write data
-    //
-    //-----------------------------------------------------------------
-
-    // Write pointID
-
-    pStream
-        << "POINT_DATA " << pointLabels.size() << std::endl
-        << "FIELD attributes 1" << std::endl;
-
-    // Cell ids first
-    pStream << "pointID 1 " << pointLabels.size() << " int" << std::endl;
-
-    writeFuns::write(pStream, binary, pointLabels);
+    foamVtkOutput::writeList(format(), faceLabels);
+    format().flush();
 }
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
 
 // ************************************************************************* //
diff --git a/applications/utilities/mesh/manipulation/setSet/writePointSet.H b/src/meshTools/output/foamVtkWriteFaceSet.H
similarity index 80%
rename from applications/utilities/mesh/manipulation/setSet/writePointSet.H
rename to src/meshTools/output/foamVtkWriteFaceSet.H
index 983eb32aed..c44437f03f 100644
--- a/applications/utilities/mesh/manipulation/setSet/writePointSet.H
+++ b/src/meshTools/output/foamVtkWriteFaceSet.H
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2017 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -22,38 +22,43 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 InNamespace
-    Foam
+    Foam::foamVtkOutput
 
 Description
-    Write pointSet to vtk polydata file. Only one data which is original
-    pointID.
+    Write faceSet to vtk polydata file.
+    The data are the original point ids.
 
 SourceFiles
-    writePointSet.C
+    foamVtkWritePointSet.C
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef writePointSet_H
-#define writePointSet_H
-
-#include "primitiveMesh.H"
-#include "pointSet.H"
+#ifndef foamVtkWriteFaceSet_H
+#define foamVtkWriteFaceSet_H
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
 {
+class primitiveMesh;
+class faceSet;
+class fileName;
+
+namespace foamVtkOutput
+{
 
 //- Write pointSet to vtk polydata file.
 //  Only one data which is original pointID.
-void writePointSet
+void writeFaceSet
 (
     const bool binary,
     const primitiveMesh& mesh,
-    const topoSet& set,
+    const faceSet& set,
     const fileName& fileName
 );
 
+
+} // End namespace foamVtkOutput
 } // End namespace Foam
 
 
diff --git a/src/meshTools/output/foamVtkWritePointSet.C b/src/meshTools/output/foamVtkWritePointSet.C
new file mode 100644
index 0000000000..d58346d803
--- /dev/null
+++ b/src/meshTools/output/foamVtkWritePointSet.C
@@ -0,0 +1,74 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2017 OpenCFD Ltd.
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "foamVtkWritePointSet.H"
+#include "foamVtkOutputOptions.H"
+#include "OFstream.H"
+#include "primitiveMesh.H"
+#include "pointSet.H"
+
+// * * * * * * * * * * * * * * * Global Functions  * * * * * * * * * * * * * //
+
+void Foam::foamVtkOutput::writePointSet
+(
+    const bool binary,
+    const primitiveMesh& mesh,
+    const pointSet& set,
+    const fileName& fileName
+)
+{
+    std::ofstream os(fileName.c_str());
+
+    autoPtr<foamVtkOutput::formatter> format =
+        foamVtkOutput::outputOptions().legacy(true).ascii(!binary).newFormatter
+        (
+            os
+        );
+
+    foamVtkOutput::legacy::fileHeader(format(), set.name())
+        << "DATASET POLYDATA" << nl;
+
+    //-------------------------------------------------------------------------
+
+    const labelList pointLabels(set.sortedToc());
+
+    // Write points
+    os << "POINTS " << pointLabels.size() << " float" << nl;
+
+    foamVtkOutput::writeList(format(), mesh.points(), pointLabels);
+    format().flush();
+
+
+    // Write data - pointID
+    foamVtkOutput::legacy::pointDataHeader(os, pointLabels.size(), 1);
+
+    os << "pointID 1 " << pointLabels.size() << " int" << nl;
+
+    foamVtkOutput::writeList(format(), pointLabels);
+    format().flush();
+}
+
+
+// ************************************************************************* //
diff --git a/applications/utilities/mesh/manipulation/setSet/writePatch.H b/src/meshTools/output/foamVtkWritePointSet.H
similarity index 73%
rename from applications/utilities/mesh/manipulation/setSet/writePatch.H
rename to src/meshTools/output/foamVtkWritePointSet.H
index ccc82e835d..f06e07cb01 100644
--- a/applications/utilities/mesh/manipulation/setSet/writePatch.H
+++ b/src/meshTools/output/foamVtkWritePointSet.H
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2017 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -21,40 +21,44 @@ License
     You should have received a copy of the GNU General Public License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
-InClass
-    Foam::writePatch
+InNamespace
+    Foam::foamVtkOutput
 
 Description
-    Write faceSet to vtk polydata file. Only one data which is original
-    faceID.
+    Write pointSet to vtk polydata file.
+    The data are the original point ids.
 
 SourceFiles
-    writePatch.C
+    foamVtkWritePointSet.C
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef writePatch_H
-#define writePatch_H
-
-#include "primitiveMesh.H"
-#include "primitiveFacePatch.H"
+#ifndef foamVtkWritePointSet_H
+#define foamVtkWritePointSet_H
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
 {
+class primitiveMesh;
+class pointSet;
+class fileName;
 
-// Write faceSet
-void writePatch
+namespace foamVtkOutput
+{
+
+//- Write pointSet to vtk polydata file.
+//  The data are the original point ids.
+void writePointSet
 (
     const bool binary,
-    const word& setName,
-    const primitiveFacePatch& fp,
-    const word& fieldName,
-    labelList& fieldValues,
+    const primitiveMesh& mesh,
+    const pointSet& set,
     const fileName& fileName
 );
 
+
+} // End namespace foamVtkOutput
 } // End namespace Foam
 
 

From e5cdee5dd9d05ecbec9edc3867018279bbb66977 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Fri, 12 May 2017 15:36:44 +0200
Subject: [PATCH 04/27] STYLE: use labelRange and range-based-for in paraview
 readers

- also use updated forAll* macros
---
 .../PVFoamReader/vtkPVFoamReader.cxx          |   8 +-
 .../PVFoamReader/vtkPVFoam/vtkPVFoam.C        |  40 ++--
 .../PVFoamReader/vtkPVFoam/vtkPVFoam.H        |  25 ++-
 .../vtkPVFoam/vtkPVFoamFieldTemplates.C       | 113 ++++-------
 .../PVFoamReader/vtkPVFoam/vtkPVFoamFields.C  |  12 +-
 .../PVFoamReader/vtkPVFoam/vtkPVFoamMesh.C    |  52 ++---
 .../vtkPVFoam/vtkPVFoamMeshLagrangian.C       |   2 +-
 .../vtkPVFoam/vtkPVFoamUpdateInfo.C           | 190 ++++++++----------
 .../vtkPVblockMeshReader.cxx                  |  12 +-
 .../vtkPVblockMesh/vtkPVblockMesh.C           |  28 +--
 .../vtkPVblockMesh/vtkPVblockMesh.H           |  12 +-
 .../vtkPVblockMesh/vtkPVblockMeshConvert.C    |  29 ++-
 .../graphics/PVReaders/foamPv/foamPvCore.C    |   7 +-
 .../graphics/PVReaders/foamPv/foamPvCore.H    |  54 ++---
 .../PVReaders/foamPv/foamPvCoreTemplates.C    |   2 +-
 15 files changed, 251 insertions(+), 335 deletions(-)

diff --git a/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/PVFoamReader/vtkPVFoamReader.cxx b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/PVFoamReader/vtkPVFoamReader.cxx
index 46c01d92f7..6a2e657929 100644
--- a/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/PVFoamReader/vtkPVFoamReader.cxx
+++ b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/PVFoamReader/vtkPVFoamReader.cxx
@@ -146,7 +146,7 @@ vtkPVFoamReader::~vtkPVFoamReader()
 
     if (FileName)
     {
-        delete [] FileName;
+        delete[] FileName;
     }
 
     if (output0_)
@@ -525,13 +525,11 @@ void vtkPVFoamReader::updatePatchNamesView(const bool show)
     }
 
     // Get all the pqRenderView instances
-    QList<pqRenderView*> renderViews = smModel->findItems<pqRenderView*>();
-
-    for (int viewI=0; viewI < renderViews.size(); ++viewI)
+    for (auto view : smModel->findItems<pqRenderView*>())
     {
         backend_->renderPatchNames
         (
-            renderViews[viewI]->getRenderViewProxy()->GetRenderer(),
+            view->getRenderViewProxy()->GetRenderer(),
             show
         );
     }
diff --git a/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoam.C b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoam.C
index c20a965578..2ba76a4c31 100644
--- a/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoam.C
+++ b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoam.C
@@ -50,7 +50,7 @@ namespace Foam
 
 vtkTextActor* Foam::vtkPVFoam::createTextActor
 (
-    const string& s,
+    const std::string& s,
     const point& pt
 )
 {
@@ -79,15 +79,15 @@ vtkTextActor* Foam::vtkPVFoam::createTextActor
 void Foam::vtkPVFoam::resetCounters()
 {
     // Reset array range information (ids and sizes)
-    arrayRangeVolume_.reset();
-    arrayRangePatches_.reset();
-    arrayRangeLagrangian_.reset();
-    arrayRangeCellZones_.reset();
-    arrayRangeFaceZones_.reset();
-    arrayRangePointZones_.reset();
-    arrayRangeCellSets_.reset();
-    arrayRangeFaceSets_.reset();
-    arrayRangePointSets_.reset();
+    rangeVolume_.reset();
+    rangePatches_.reset();
+    rangeLagrangian_.reset();
+    rangeCellZones_.reset();
+    rangeFaceZones_.reset();
+    rangePointZones_.reset();
+    rangeCellSets_.reset();
+    rangeFaceSets_.reset();
+    rangePointSets_.reset();
 }
 
 
@@ -260,15 +260,15 @@ Foam::vtkPVFoam::vtkPVFoam
     timeIndex_(-1),
     meshChanged_(true),
     fieldsChanged_(true),
-    arrayRangeVolume_("unzoned"),
-    arrayRangePatches_("patches"),
-    arrayRangeLagrangian_("lagrangian"),
-    arrayRangeCellZones_("cellZone"),
-    arrayRangeFaceZones_("faceZone"),
-    arrayRangePointZones_("pointZone"),
-    arrayRangeCellSets_("cellSet"),
-    arrayRangeFaceSets_("faceSet"),
-    arrayRangePointSets_("pointSet")
+    rangeVolume_("unzoned"),
+    rangePatches_("patches"),
+    rangeLagrangian_("lagrangian"),
+    rangeCellZones_("cellZone"),
+    rangeFaceZones_("faceZone"),
+    rangePointZones_("pointZone"),
+    rangeCellSets_("cellSet"),
+    rangeFaceSets_("faceSet"),
+    rangePointSets_("pointSet")
 {
     if (debug)
     {
@@ -653,7 +653,7 @@ void Foam::vtkPVFoam::renderPatchNames
         hashedWordList selectedPatches = getSelected
         (
             reader_->GetPartSelection(),
-            arrayRangePatches_
+            rangePatches_
         );
 
         if (selectedPatches.empty())
diff --git a/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoam.H b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoam.H
index 3f0a1ad55d..b7350ad055 100644
--- a/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoam.H
+++ b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoam.H
@@ -35,7 +35,6 @@ SourceFiles
     vtkPVFoamMeshVolume.C
     vtkPVFoamTemplates.C
     vtkPVFoamUpdateInfo.C
-    vtkPVFoamUtils.C
     vtkPVFoamFieldTemplates.C
     vtkPVFoamUpdateTemplates.C
 
@@ -197,15 +196,15 @@ class vtkPVFoam
 
         //- First instance and size of various mesh parts
         //  used to index into partStatus_ and partDataset_
-        arrayRange arrayRangeVolume_;
-        arrayRange arrayRangePatches_;
-        arrayRange arrayRangeLagrangian_;
-        arrayRange arrayRangeCellZones_;
-        arrayRange arrayRangeFaceZones_;
-        arrayRange arrayRangePointZones_;
-        arrayRange arrayRangeCellSets_;
-        arrayRange arrayRangeFaceSets_;
-        arrayRange arrayRangePointSets_;
+        arrayRange rangeVolume_;
+        arrayRange rangePatches_;
+        arrayRange rangeLagrangian_;
+        arrayRange rangeCellZones_;
+        arrayRange rangeFaceZones_;
+        arrayRange rangePointZones_;
+        arrayRange rangeCellSets_;
+        arrayRange rangeFaceSets_;
+        arrayRange rangePointSets_;
 
         //- Decomposed cells information (mesh regions)
         //  TODO: regions
@@ -224,7 +223,11 @@ class vtkPVFoam
     // Private Member Functions
 
         //- Create a text actor
-        static vtkTextActor* createTextActor(const string& s, const point& pt);
+        static vtkTextActor* createTextActor
+        (
+            const std::string& s,
+            const point& pt
+        );
 
         //- Reset data counters
         void resetCounters();
diff --git a/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamFieldTemplates.C b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamFieldTemplates.C
index c6b9e3b86c..527a641bc9 100644
--- a/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamFieldTemplates.C
+++ b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamFieldTemplates.C
@@ -83,7 +83,7 @@ void Foam::vtkPVFoam::convertVolField
         fld,
         ptfPtr,
         output,
-        arrayRangeVolume_,
+        rangeVolume_,
         regionPolyDecomp_
     );
 
@@ -93,7 +93,7 @@ void Foam::vtkPVFoam::convertVolField
         fld,
         ptfPtr,
         output,
-        arrayRangeCellZones_,
+        rangeCellZones_,
         zonePolyDecomp_
     );
 
@@ -103,7 +103,7 @@ void Foam::vtkPVFoam::convertVolField
         fld,
         ptfPtr,
         output,
-        arrayRangeCellSets_,
+        rangeCellSets_,
         csetPolyDecomp_
     );
 
@@ -111,12 +111,7 @@ void Foam::vtkPVFoam::convertVolField
     //
     // Convert patches - if activated
     //
-    for
-    (
-        int partId = arrayRangePatches_.start();
-        partId < arrayRangePatches_.end();
-        ++partId
-    )
+    for (auto partId : rangePatches_)
     {
         const word patchName = getPartName(partId);
         const label datasetNo = partDataset_[partId];
@@ -129,7 +124,7 @@ void Foam::vtkPVFoam::convertVolField
 
         vtkPolyData* vtkmesh = getDataFromBlock<vtkPolyData>
         (
-            output, arrayRangePatches_, datasetNo
+            output, rangePatches_, datasetNo
         );
 
         if (!vtkmesh)
@@ -195,12 +190,7 @@ void Foam::vtkPVFoam::convertVolField
     //
     // Convert face zones - if activated
     //
-    for
-    (
-        int partId = arrayRangeFaceZones_.start();
-        partId < arrayRangeFaceZones_.end();
-        ++partId
-    )
+    for (auto partId : rangeFaceZones_)
     {
         const word zoneName = getPartName(partId);
         const label datasetNo = partDataset_[partId];
@@ -220,7 +210,7 @@ void Foam::vtkPVFoam::convertVolField
 
         vtkPolyData* vtkmesh = getDataFromBlock<vtkPolyData>
         (
-            output, arrayRangeFaceZones_, datasetNo
+            output, rangeFaceZones_, datasetNo
         );
 
         if (vtkmesh)
@@ -241,12 +231,7 @@ void Foam::vtkPVFoam::convertVolField
     //
     // Convert face sets - if activated
     //
-    for
-    (
-        int partId = arrayRangeFaceSets_.start();
-        partId < arrayRangeFaceSets_.end();
-        ++partId
-    )
+    for (auto partId : rangeFaceSets_)
     {
         const word selectName = getPartName(partId);
         const label datasetNo = partDataset_[partId];
@@ -258,7 +243,7 @@ void Foam::vtkPVFoam::convertVolField
 
         vtkPolyData* vtkmesh = getDataFromBlock<vtkPolyData>
         (
-            output, arrayRangeFaceSets_, datasetNo
+            output, rangeFaceSets_, datasetNo
         );
 
         if (!vtkmesh)
@@ -291,7 +276,7 @@ void Foam::vtkPVFoam::convertVolFields
     vtkMultiBlockDataSet* output
 )
 {
-    forAllConstIter(IOobjectList, objects, iter)
+    forAllConstIters(objects, iter)
     {
         // restrict to GeometricField<Type, ...>
         if
@@ -327,7 +312,7 @@ void Foam::vtkPVFoam::convertDimFields
 {
     typedef GeometricField<Type, fvPatchField, volMesh> VolFieldType;
 
-    forAllConstIter(IOobjectList, objects, iter)
+    forAllConstIters(objects, iter)
     {
         // restrict to DimensionedField<Type, ...>
         if
@@ -387,7 +372,7 @@ void Foam::vtkPVFoam::convertVolFieldBlock
     const List<polyDecomp>& decompLst
 )
 {
-    for (int partId = range.start(); partId < range.end(); ++partId)
+    for (auto partId : range)
     {
         const label datasetNo = partDataset_[partId];
 
@@ -437,7 +422,7 @@ void Foam::vtkPVFoam::convertPointFields
     const polyMesh& mesh = pMesh.mesh();
     const polyBoundaryMesh& patches = mesh.boundaryMesh();
 
-    forAllConstIter(IOobjectList, objects, iter)
+    forAllConstIters(objects, iter)
     {
         const word& fieldName = iter()->name();
         // restrict to this GeometricField<Type, ...>
@@ -463,7 +448,7 @@ void Foam::vtkPVFoam::convertPointFields
         (
             pfld,
             output,
-            arrayRangeVolume_,
+            rangeVolume_,
             regionPolyDecomp_
         );
 
@@ -472,7 +457,7 @@ void Foam::vtkPVFoam::convertPointFields
         (
             pfld,
             output,
-            arrayRangeCellZones_,
+            rangeCellZones_,
             zonePolyDecomp_
         );
 
@@ -481,7 +466,7 @@ void Foam::vtkPVFoam::convertPointFields
         (
             pfld,
             output,
-            arrayRangeCellSets_,
+            rangeCellSets_,
             csetPolyDecomp_
         );
 
@@ -489,12 +474,7 @@ void Foam::vtkPVFoam::convertPointFields
         //
         // Convert patches - if activated
         //
-        for
-        (
-            int partId = arrayRangePatches_.start();
-            partId < arrayRangePatches_.end();
-            ++partId
-        )
+        for (auto partId : rangePatches_)
         {
             const word patchName = getPartName(partId);
             const label datasetNo = partDataset_[partId];
@@ -507,7 +487,7 @@ void Foam::vtkPVFoam::convertPointFields
 
             vtkPolyData* vtkmesh = getDataFromBlock<vtkPolyData>
             (
-                output, arrayRangePatches_, datasetNo
+                output, rangePatches_, datasetNo
             );
 
             if (vtkmesh)
@@ -526,12 +506,7 @@ void Foam::vtkPVFoam::convertPointFields
         //
         // Convert faceZones - if activated
         //
-        for
-        (
-            int partId = arrayRangeFaceZones_.start();
-            partId < arrayRangeFaceZones_.end();
-            ++partId
-        )
+        for (auto partId : rangeFaceZones_)
         {
             const word zoneName = getPartName(partId);
             const label datasetNo = partDataset_[partId];
@@ -544,7 +519,7 @@ void Foam::vtkPVFoam::convertPointFields
 
             vtkPolyData* vtkmesh = getDataFromBlock<vtkPolyData>
             (
-                output, arrayRangeFaceZones_, datasetNo
+                output, rangeFaceZones_, datasetNo
             );
 
             if (vtkmesh)
@@ -575,31 +550,31 @@ void Foam::vtkPVFoam::convertPointFieldBlock
     const List<polyDecomp>& decompLst
 )
 {
-   for (int partId = range.start(); partId < range.end(); ++partId)
-   {
-       const label datasetNo = partDataset_[partId];
+    for (auto partId : range)
+    {
+        const label datasetNo = partDataset_[partId];
 
-       if (!partStatus_[partId])
-       {
-           continue;
-       }
+        if (!partStatus_[partId])
+        {
+            continue;
+        }
 
-       vtkUnstructuredGrid* vtkmesh = getDataFromBlock<vtkUnstructuredGrid>
-       (
-           output, range, datasetNo
-       );
+        vtkUnstructuredGrid* vtkmesh = getDataFromBlock<vtkUnstructuredGrid>
+        (
+            output, range, datasetNo
+        );
 
-       if (vtkmesh)
-       {
-           convertPointField
-           (
-               vtkmesh,
-               pfld,
-               GeometricField<Type, fvPatchField, volMesh>::null(),
-               decompLst[datasetNo]
-           );
-       }
-   }
+        if (vtkmesh)
+        {
+            convertPointField
+            (
+                vtkmesh,
+                pfld,
+                GeometricField<Type, fvPatchField, volMesh>::null(),
+                decompLst[datasetNo]
+            );
+        }
+    }
 }
 
 
@@ -731,9 +706,9 @@ void Foam::vtkPVFoam::convertLagrangianFields
     const label datasetNo
 )
 {
-    const arrayRange& range = arrayRangeLagrangian_;
+    const arrayRange& range = rangeLagrangian_;
 
-    forAllConstIter(IOobjectList, objects, iter)
+    forAllConstIters(objects, iter)
     {
         // restrict to this IOField<Type>
         if (iter()->headerClassName() == IOField<Type>::typeName)
diff --git a/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamFields.C b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamFields.C
index 880ca89a4f..cbf43d1f4e 100644
--- a/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamFields.C
+++ b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamFields.C
@@ -52,7 +52,7 @@ void Foam::vtkPVFoam::pruneObjectList
     }
 
     // only retain specified fields
-    forAllIter(IOobjectList, objects, iter)
+    forAllIters(objects, iter)
     {
         if (!retain.found(iter()->name()))
         {
@@ -93,7 +93,7 @@ void Foam::vtkPVFoam::convertVolFields
     if (debug)
     {
         Info<< "<beg> convert volume fields" << endl;
-        forAllConstIter(IOobjectList, objects, iter)
+        forAllConstIters(objects, iter)
         {
             Info<< "  " << iter()->name()
                 << " == " << iter()->objectPath() << endl;
@@ -175,7 +175,7 @@ void Foam::vtkPVFoam::convertPointFields
     if (debug)
     {
         Info<< "<beg> convert volume -> point fields" << endl;
-        forAllConstIter(IOobjectList, objects, iter)
+        forAllConstIters(objects, iter)
         {
             Info<< "  " << iter()->name()
                 << " == " << iter()->objectPath() << endl;
@@ -205,7 +205,7 @@ void Foam::vtkPVFoam::convertLagrangianFields
     vtkMultiBlockDataSet* output
 )
 {
-    arrayRange& range = arrayRangeLagrangian_;
+    arrayRange& range = rangeLagrangian_;
     const fvMesh& mesh = *meshPtr_;
 
     hashedWordList selectedFields = getSelected
@@ -224,7 +224,7 @@ void Foam::vtkPVFoam::convertLagrangianFields
         printMemory();
     }
 
-    for (int partId = range.start(); partId < range.end(); ++partId)
+    for (auto partId : range)
     {
         const word  cloudName = getPartName(partId);
         const label datasetNo = partDataset_[partId];
@@ -253,7 +253,7 @@ void Foam::vtkPVFoam::convertLagrangianFields
         if (debug)
         {
             Info<< "converting OpenFOAM lagrangian fields" << endl;
-            forAllConstIter(IOobjectList, objects, iter)
+            forAllConstIters(objects, iter)
             {
                 Info<< "  " << iter()->name()
                     << " == " << iter()->objectPath() << endl;
diff --git a/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamMesh.C b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamMesh.C
index 954866c540..ba32d9f162 100644
--- a/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamMesh.C
+++ b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamMesh.C
@@ -47,7 +47,7 @@ void Foam::vtkPVFoam::convertMeshVolume
     int& blockNo
 )
 {
-    arrayRange& range = arrayRangeVolume_;
+    arrayRange& range = rangeVolume_;
     range.block(blockNo);      // set output block
     label datasetNo = 0;       // restart at dataset 0
     const fvMesh& mesh = *meshPtr_;
@@ -63,7 +63,7 @@ void Foam::vtkPVFoam::convertMeshVolume
 
     // Convert the internalMesh
     // this looks like more than one part, but it isn't
-    for (int partId = range.start(); partId < range.end(); ++partId)
+    for (auto partId : range)
     {
         const word partName = "internalMesh";
 
@@ -107,7 +107,7 @@ void Foam::vtkPVFoam::convertMeshLagrangian
     int& blockNo
 )
 {
-    arrayRange& range = arrayRangeLagrangian_;
+    arrayRange& range = rangeLagrangian_;
     range.block(blockNo);      // set output block
     label datasetNo = 0;       // restart at dataset 0
     const fvMesh& mesh = *meshPtr_;
@@ -118,7 +118,7 @@ void Foam::vtkPVFoam::convertMeshLagrangian
         printMemory();
     }
 
-    for (int partId = range.start(); partId < range.end(); ++partId)
+    for (auto partId : range)
     {
         const word cloudName = getPartName(partId);
 
@@ -158,7 +158,7 @@ void Foam::vtkPVFoam::convertMeshPatches
     int& blockNo
 )
 {
-    arrayRange& range = arrayRangePatches_;
+    arrayRange& range = rangePatches_;
     range.block(blockNo);      // set output block
     label datasetNo = 0;       // restart at dataset 0
     const fvMesh& mesh = *meshPtr_;
@@ -170,7 +170,7 @@ void Foam::vtkPVFoam::convertMeshPatches
         printMemory();
     }
 
-    for (int partId = range.start(); partId < range.end(); ++partId)
+    for (auto partId : range)
     {
         if (!partStatus_[partId])
         {
@@ -197,15 +197,15 @@ void Foam::vtkPVFoam::convertMeshPatches
         {
             // Patch group. Collect patch faces.
             label sz = 0;
-            forAllConstIter(labelHashSet, patchIds, iter)
+            for (auto id : patchIds)
             {
-                sz += patches[iter.key()].size();
+                sz += patches[id].size();
             }
             labelList faceLabels(sz);
             sz = 0;
-            forAllConstIter(labelHashSet, patchIds, iter)
+            for (auto id : patchIds)
             {
-                const polyPatch& pp = patches[iter.key()];
+                const auto& pp = patches[id];
                 forAll(pp, i)
                 {
                     faceLabels[sz++] = pp.start()+i;
@@ -254,7 +254,7 @@ void Foam::vtkPVFoam::convertMeshCellZones
     int& blockNo
 )
 {
-    arrayRange& range = arrayRangeCellZones_;
+    arrayRange& range = rangeCellZones_;
     range.block(blockNo);      // set output block
     label datasetNo = 0;       // restart at dataset 0
     const fvMesh& mesh = *meshPtr_;
@@ -274,7 +274,7 @@ void Foam::vtkPVFoam::convertMeshCellZones
     }
 
     const cellZoneMesh& zMesh = mesh.cellZones();
-    for (int partId = range.start(); partId < range.end(); ++partId)
+    for (auto partId : range)
     {
         const word zoneName = getPartName(partId);
         const label  zoneId = zMesh.findZoneID(zoneName);
@@ -343,7 +343,7 @@ void Foam::vtkPVFoam::convertMeshCellSets
     int& blockNo
 )
 {
-    arrayRange& range = arrayRangeCellSets_;
+    arrayRange& range = rangeCellSets_;
     range.block(blockNo);      // set output block
     label datasetNo = 0;       // restart at dataset 0
     const fvMesh& mesh = *meshPtr_;
@@ -357,7 +357,7 @@ void Foam::vtkPVFoam::convertMeshCellSets
         printMemory();
     }
 
-    for (int partId = range.start(); partId < range.end(); ++partId)
+    for (auto partId : range)
     {
         const word partName = getPartName(partId);
 
@@ -425,7 +425,7 @@ void Foam::vtkPVFoam::convertMeshFaceZones
     int& blockNo
 )
 {
-    arrayRange& range = arrayRangeFaceZones_;
+    arrayRange& range = rangeFaceZones_;
     range.block(blockNo);      // set output block
     label datasetNo = 0;       // restart at dataset 0
     const fvMesh& mesh = *meshPtr_;
@@ -442,7 +442,7 @@ void Foam::vtkPVFoam::convertMeshFaceZones
     }
 
     const faceZoneMesh& zMesh = mesh.faceZones();
-    for (int partId = range.start(); partId < range.end(); ++partId)
+    for (auto partId : range)
     {
         const word zoneName = getPartName(partId);
         const label  zoneId = zMesh.findZoneID(zoneName);
@@ -489,7 +489,7 @@ void Foam::vtkPVFoam::convertMeshFaceSets
     int& blockNo
 )
 {
-    arrayRange& range = arrayRangeFaceSets_;
+    arrayRange& range = rangeFaceSets_;
     range.block(blockNo);      // set output block
     label datasetNo = 0;       // restart at dataset 0
     const fvMesh& mesh = *meshPtr_;
@@ -500,7 +500,7 @@ void Foam::vtkPVFoam::convertMeshFaceSets
         printMemory();
     }
 
-    for (int partId = range.start(); partId < range.end(); ++partId)
+    for (auto partId : range)
     {
         const word partName = getPartName(partId);
 
@@ -560,7 +560,7 @@ void Foam::vtkPVFoam::convertMeshPointZones
     int& blockNo
 )
 {
-    arrayRange& range = arrayRangePointZones_;
+    arrayRange& range = rangePointZones_;
     range.block(blockNo);      // set output block
     label datasetNo = 0;       // restart at dataset 0
     const fvMesh& mesh = *meshPtr_;
@@ -574,10 +574,10 @@ void Foam::vtkPVFoam::convertMeshPointZones
     if (range.size())
     {
         const pointZoneMesh& zMesh = mesh.pointZones();
-        for (int partId = range.start(); partId < range.end(); ++partId)
+        for (auto partId : range)
         {
-            word zoneName = getPartName(partId);
-            label zoneId = zMesh.findZoneID(zoneName);
+            const word zoneName = getPartName(partId);
+            const label zoneId = zMesh.findZoneID(zoneName);
 
             if (!partStatus_[partId] || zoneId < 0)
             {
@@ -630,7 +630,7 @@ void Foam::vtkPVFoam::convertMeshPointSets
     int& blockNo
 )
 {
-    arrayRange& range = arrayRangePointSets_;
+    arrayRange& range = rangePointSets_;
     range.block(blockNo);      // set output block
     label datasetNo = 0;       // restart at dataset 0
     const fvMesh& mesh = *meshPtr_;
@@ -641,9 +641,9 @@ void Foam::vtkPVFoam::convertMeshPointSets
         printMemory();
     }
 
-    for (int partId = range.start(); partId < range.end(); ++partId)
+    for (auto partId : range)
     {
-        word partName = getPartName(partId);
+        const word partName = getPartName(partId);
 
         if (!partStatus_[partId])
         {
@@ -661,7 +661,7 @@ void Foam::vtkPVFoam::convertMeshPointSets
         vtkpoints->Allocate(pSet.size());
 
         const pointField& meshPoints = mesh.points();
-        forAllConstIter(pointSet, pSet, iter)
+        forAllConstIters(pSet, iter)
         {
             vtkpoints->InsertNextPoint(meshPoints[iter.key()].v_);
         }
diff --git a/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamMeshLagrangian.C b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamMeshLagrangian.C
index 4527d841c5..ecf7d7ab05 100644
--- a/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamMeshLagrangian.C
+++ b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamMeshLagrangian.C
@@ -80,7 +80,7 @@ vtkPolyData* Foam::vtkPVFoam::lagrangianVTKMesh
         vtkcells->Allocate(parcels.size());
 
         vtkIdType particleId = 0;
-        forAllConstIter(Cloud<passiveParticle>, parcels, iter)
+        forAllConstIters(parcels, iter)
         {
             vtkpoints->InsertNextPoint(iter().position().v_);
 
diff --git a/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamUpdateInfo.C b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamUpdateInfo.C
index 52030e9c81..213694e6e5 100644
--- a/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamUpdateInfo.C
+++ b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamUpdateInfo.C
@@ -89,11 +89,11 @@ Foam::wordList Foam::vtkPVFoam::getZoneNames
     wordList names(zmesh.size());
     label nZone = 0;
 
-    forAll(zmesh, zoneI)
+    forAll(zmesh, zonei)
     {
-        if (!zmesh[zoneI].empty())
+        if (!zmesh[zonei].empty())
         {
-            names[nZone++] = zmesh[zoneI].name();
+            names[nZone++] = zmesh[zonei].name();
         }
     }
     names.setSize(nZone);
@@ -128,9 +128,9 @@ Foam::wordList Foam::vtkPVFoam::getZoneNames(const word& zoneType) const
         zonesEntries zones(ioObj);
 
         names.setSize(zones.size());
-        forAll(zones, zoneI)
+        forAll(zones, zonei)
         {
-            names[zoneI] = zones[zoneI].keyword();
+            names[zonei] = zones[zonei].keyword();
         }
     }
 
@@ -150,12 +150,8 @@ void Foam::vtkPVFoam::updateInfoInternalMesh
 
     // Determine mesh parts (internalMesh, patches...)
     //- Add internal mesh as first entry
-    arrayRangeVolume_.reset(arraySelection->GetNumberOfArrays());
-    arraySelection->AddArray
-    (
-        "internalMesh"
-    );
-    arrayRangeVolume_ += 1;
+    rangeVolume_.reset(arraySelection->GetNumberOfArrays(), 1);
+    arraySelection->AddArray("internalMesh");
 
     if (debug)
     {
@@ -190,20 +186,16 @@ void Foam::vtkPVFoam::updateInfoLagrangian
         readDir(dbPtr_->timePath()/lagrangianPrefix, fileName::DIRECTORY)
     );
 
-    arrayRangeLagrangian_.reset(arraySelection->GetNumberOfArrays());
-
-    int nClouds = 0;
-    forAll(cloudDirs, cloudI)
+    rangeLagrangian_.reset(arraySelection->GetNumberOfArrays());
+    forAll(cloudDirs, cloudi)
     {
         // Add cloud to GUI list
         arraySelection->AddArray
         (
-            (cloudDirs[cloudI] + " - lagrangian").c_str()
+            (cloudDirs[cloudi] + " - lagrangian").c_str()
         );
-
-        ++nClouds;
+        ++rangeLagrangian_;
     }
-    arrayRangeLagrangian_ += nClouds;
 
     if (debug)
     {
@@ -224,53 +216,54 @@ void Foam::vtkPVFoam::updateInfoPatches
             << " [meshPtr=" << (meshPtr_ ? "set" : "null") << "]" << endl;
     }
 
-
     HashSet<string> enabledEntriesSet(enabledEntries);
 
-    arrayRangePatches_.reset(arraySelection->GetNumberOfArrays());
+    rangePatches_.reset(arraySelection->GetNumberOfArrays());
 
-    int nPatches = 0;
     if (meshPtr_)
     {
         const polyBoundaryMesh& patches = meshPtr_->boundaryMesh();
         const HashTable<labelList>& groups = patches.groupPatchIDs();
-        const wordList allPatchNames = patches.names();
 
-        // Add patch groups
-        // ~~~~~~~~~~~~~~~~
+        // Add (non-zero) patch groups to the list of mesh parts
+        // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
         forAllConstIters(groups, iter)
         {
-            const word& groupName = iter.key();
-            const labelList& patchIDs = iter.object();
+            const auto& groupName = iter.key();
+            const auto& patchIDs  = iter.object();
 
             label nFaces = 0;
-            forAll(patchIDs, i)
+            for (auto patchId : patchIDs)
             {
-                nFaces += patches[patchIDs[i]].size();
+                nFaces += patches[patchId].size();
+            }
+
+            if (!nFaces)
+            {
+                // Skip if group has no faces
+                continue;
             }
 
             // Valid patch if nFace > 0 - add patch to GUI list
-            if (nFaces)
+            const string dpyName = groupName + " - group";
+            arraySelection->AddArray(dpyName.c_str());
+            ++rangePatches_;
+
+            if (enabledEntriesSet.found(dpyName))
             {
-                string vtkGrpName = groupName + " - group";
-                arraySelection->AddArray(vtkGrpName.c_str());
-
-                ++nPatches;
-
-                if (enabledEntriesSet.found(vtkGrpName))
+                if (!reader_->GetShowGroupsOnly())
                 {
-                    if (!reader_->GetShowGroupsOnly())
+                    enabledEntriesSet.erase(dpyName);
+                    for (auto patchId : patchIDs)
                     {
-                        enabledEntriesSet.erase(vtkGrpName);
-                        forAll(patchIDs, i)
+                        const polyPatch& pp = patches[patchId];
+                        if (pp.size())
                         {
-                            const polyPatch& pp = patches[patchIDs[i]];
-                            if (pp.size())
-                            {
-                                string vtkPatchName = pp.name() + " - patch";
-                                enabledEntriesSet.insert(vtkPatchName);
-                            }
+                            enabledEntriesSet.insert
+                            (
+                                pp.name() + " - patch"
+                            );
                         }
                     }
                 }
@@ -278,8 +271,8 @@ void Foam::vtkPVFoam::updateInfoPatches
         }
 
 
-        // Add patches
-        // ~~~~~~~~~~~
+        // Add (non-zero) patches to the list of mesh parts
+        // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
         if (!reader_->GetShowGroupsOnly())
         {
@@ -294,8 +287,7 @@ void Foam::vtkPVFoam::updateInfoPatches
                     (
                         (pp.name() + " - patch").c_str()
                     );
-
-                    ++nPatches;
+                    ++rangePatches_;
                 }
             }
         }
@@ -325,7 +317,6 @@ void Foam::vtkPVFoam::updateInfoPatches
         {
             polyBoundaryMeshEntries patchEntries(ioObj);
 
-
             // Read patches and determine sizes
             // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
@@ -344,66 +335,49 @@ void Foam::vtkPVFoam::updateInfoPatches
             // Add (non-zero) patch groups to the list of mesh parts
             // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-            HashTable<labelList> groups(patchEntries.size());
+            HashTable<labelHashSet> groups(patchEntries.size());
 
             forAll(patchEntries, patchi)
             {
                 const dictionary& patchDict = patchEntries[patchi].dict();
-
                 wordList groupNames;
-                patchDict.readIfPresent("inGroups", groupNames);
 
-                forAll(groupNames, groupI)
+                if
+                (
+                    sizes[patchi]  // Valid patch if nFace > 0
+                 && patchDict.readIfPresent("inGroups", groupNames)
+                )
                 {
-                    HashTable<labelList>::iterator iter = groups.find
-                    (
-                        groupNames[groupI]
-                    );
-                    if (iter != groups.end())
+                    forAll(groupNames, groupI)
                     {
-                        iter().append(patchi);
-                    }
-                    else
-                    {
-                        groups.insert(groupNames[groupI], labelList{patchi});
+                        groups(groupNames[groupI]).insert(patchi);
                     }
                 }
             }
 
             forAllConstIters(groups, iter)
             {
-                const word& groupName = iter.key();
-                const labelList& patchIDs = iter.object();
+                const auto& groupName = iter.key();
+                const auto& patchIDs  = iter.object();
 
-                label nFaces = 0;
-                forAll(patchIDs, i)
+                const string dpyName = groupName + " - group";
+                arraySelection->AddArray(dpyName.c_str());
+                ++rangePatches_;
+
+                // Optionally replace with patch name selection
+                if
+                (
+                    enabledEntriesSet.found(dpyName)
+                 && !reader_->GetShowGroupsOnly()
+                )
                 {
-                    nFaces += sizes[patchIDs[i]];
-                }
-
-                // Valid patch if nFace > 0 - add patch to GUI list
-                if (nFaces)
-                {
-                    string vtkGrpName = groupName + " - group";
-                    arraySelection->AddArray(vtkGrpName.c_str());
-
-                    ++nPatches;
-
-                    if (enabledEntriesSet.found(vtkGrpName))
+                    enabledEntriesSet.erase(dpyName);
+                    for (auto patchId : patchIDs)
                     {
-                        if (!reader_->GetShowGroupsOnly())
-                        {
-                            enabledEntriesSet.erase(vtkGrpName);
-                            forAll(patchIDs, i)
-                            {
-                                if (sizes[patchIDs[i]])
-                                {
-                                    string vtkPatchName =
-                                        names[patchIDs[i]] + " - patch";
-                                    enabledEntriesSet.insert(vtkPatchName);
-                                }
-                            }
-                        }
+                        enabledEntriesSet.insert
+                        (
+                            names[patchId] + " - patch";
+                        );
                     }
                 }
             }
@@ -423,14 +397,12 @@ void Foam::vtkPVFoam::updateInfoPatches
                         (
                             (names[patchi] + " - patch").c_str()
                         );
-
-                        ++nPatches;
+                        ++rangePatches_;
                     }
                 }
             }
         }
     }
-    arrayRangePatches_ += nPatches;
 
     // Update enabled entries in case of group selection
     enabledEntries = enabledEntriesSet.toc();
@@ -472,15 +444,15 @@ void Foam::vtkPVFoam::updateInfoZones
         namesLst = getZoneNames("cellZones");
     }
 
-    arrayRangeCellZones_.reset(arraySelection->GetNumberOfArrays());
+    rangeCellZones_.reset(arraySelection->GetNumberOfArrays());
     forAll(namesLst, elemI)
     {
         arraySelection->AddArray
         (
             (namesLst[elemI] + " - cellZone").c_str()
         );
+        ++rangeCellZones_;
     }
-    arrayRangeCellZones_ += namesLst.size();
 
 
     //
@@ -495,15 +467,15 @@ void Foam::vtkPVFoam::updateInfoZones
         namesLst = getZoneNames("faceZones");
     }
 
-    arrayRangeFaceZones_.reset(arraySelection->GetNumberOfArrays());
+    rangeFaceZones_.reset(arraySelection->GetNumberOfArrays());
     forAll(namesLst, elemI)
     {
         arraySelection->AddArray
         (
             (namesLst[elemI] + " - faceZone").c_str()
         );
+        ++rangeFaceZones_;
     }
-    arrayRangeFaceZones_ += namesLst.size();
 
 
     //
@@ -518,15 +490,15 @@ void Foam::vtkPVFoam::updateInfoZones
         namesLst = getZoneNames("pointZones");
     }
 
-    arrayRangePointZones_.reset(arraySelection->GetNumberOfArrays());
+    rangePointZones_.reset(arraySelection->GetNumberOfArrays());
     forAll(namesLst, elemI)
     {
         arraySelection->AddArray
         (
             (namesLst[elemI] + " - pointZone").c_str()
         );
+        ++rangePointZones_;
     }
-    arrayRangePointZones_ += namesLst.size();
 
     if (debug)
     {
@@ -577,24 +549,24 @@ void Foam::vtkPVFoam::updateInfoSets
     }
 
 
-    arrayRangeCellSets_.reset(arraySelection->GetNumberOfArrays());
-    arrayRangeCellSets_ += addToSelection<cellSet>
+    rangeCellSets_.reset(arraySelection->GetNumberOfArrays());
+    rangeCellSets_ += addToSelection<cellSet>
     (
         arraySelection,
         objects,
         " - cellSet"
     );
 
-    arrayRangeFaceSets_.reset(arraySelection->GetNumberOfArrays());
-    arrayRangeFaceSets_ += addToSelection<faceSet>
+    rangeFaceSets_.reset(arraySelection->GetNumberOfArrays());
+    rangeFaceSets_ += addToSelection<faceSet>
     (
         arraySelection,
         objects,
         " - faceSet"
     );
 
-    arrayRangePointSets_.reset(arraySelection->GetNumberOfArrays());
-    arrayRangePointSets_ += addToSelection<pointSet>
+    rangePointSets_.reset(arraySelection->GetNumberOfArrays());
+    rangePointSets_ += addToSelection<pointSet>
     (
         arraySelection,
         objects,
@@ -643,7 +615,7 @@ void Foam::vtkPVFoam::updateInfoLagrangianFields
     // have to decide if the second set of fields get mixed in
     // or dealt with separately
 
-    const arrayRange& range = arrayRangeLagrangian_;
+    const arrayRange& range = rangeLagrangian_;
     if (range.empty())
     {
         return;
diff --git a/applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/PVblockMeshReader/vtkPVblockMeshReader.cxx b/applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/PVblockMeshReader/vtkPVblockMeshReader.cxx
index 2c8c1ce453..4e71734294 100644
--- a/applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/PVblockMeshReader/vtkPVblockMeshReader.cxx
+++ b/applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/PVblockMeshReader/vtkPVblockMeshReader.cxx
@@ -106,7 +106,7 @@ vtkPVblockMeshReader::~vtkPVblockMeshReader()
 
     if (FileName)
     {
-        delete [] FileName;
+        delete[] FileName;
     }
 
     BlockSelection->RemoveAllObservers();
@@ -263,12 +263,11 @@ void vtkPVblockMeshReader::updatePatchNamesView(const bool show)
     }
 
     // Get all the pqRenderView instances
-    QList<pqRenderView*> renderViews = smModel->findItems<pqRenderView*>();
-    for (int viewI=0; viewI<renderViews.size(); ++viewI)
+    for (auto view : smModel->findItems<pqRenderView*>())
     {
         backend_->renderPatchNames
         (
-            renderViews[viewI]->getRenderViewProxy()->GetRenderer(),
+            view->getRenderViewProxy()->GetRenderer(),
             show
         );
     }
@@ -295,12 +294,11 @@ void vtkPVblockMeshReader::updatePointNumbersView(const bool show)
     }
 
     // Get all the pqRenderView instances
-    QList<pqRenderView*> renderViews = smModel->findItems<pqRenderView*>();
-    for (int viewI=0; viewI<renderViews.size(); ++viewI)
+    for (auto view : smModel->findItems<pqRenderView*>())
     {
         backend_->renderPointNumbers
         (
-            renderViews[viewI]->getRenderViewProxy()->GetRenderer(),
+            view->getRenderViewProxy()->GetRenderer(),
             show
         );
     }
diff --git a/applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/vtkPVblockMesh/vtkPVblockMesh.C b/applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/vtkPVblockMesh/vtkPVblockMesh.C
index 39c60bb738..2d71d3a1d6 100644
--- a/applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/vtkPVblockMesh/vtkPVblockMesh.C
+++ b/applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/vtkPVblockMesh/vtkPVblockMesh.C
@@ -52,7 +52,7 @@ namespace Foam
 
 vtkTextActor* Foam::vtkPVblockMesh::createTextActor
 (
-    const string& s,
+    const std::string& s,
     const point& pt
 )
 {
@@ -81,9 +81,9 @@ vtkTextActor* Foam::vtkPVblockMesh::createTextActor
 void Foam::vtkPVblockMesh::resetCounters()
 {
     // Reset mesh part ids and sizes
-    arrayRangeBlocks_.reset();
-    arrayRangeEdges_.reset();
-    arrayRangeCorners_.reset();
+    rangeBlocks_.reset();
+    rangeEdges_.reset();
+    rangeCorners_.reset();
 }
 
 
@@ -92,15 +92,13 @@ void Foam::vtkPVblockMesh::updateInfoBlocks
     vtkDataArraySelection* select
 )
 {
-    arrayRange& range = arrayRangeBlocks_;
-
     if (debug)
     {
         Info<< "<beg> updateInfoBlocks"
             << " [meshPtr=" << (meshPtr_ ? "set" : "null") << "]" << endl;
     }
 
-    range.reset(select->GetNumberOfArrays());
+    rangeBlocks_.reset(select->GetNumberOfArrays());
 
     const blockMesh& blkMesh = *meshPtr_;
 
@@ -122,10 +120,9 @@ void Foam::vtkPVblockMesh::updateInfoBlocks
 
         // Add "blockId" or "blockId - zoneName" to GUI list
         select->AddArray(ostr.str().c_str());
+        ++rangeBlocks_;
     }
 
-    range += nBlocks;
-
     if (debug)
     {
         Info<< "<end> updateInfoBlocks" << endl;
@@ -138,15 +135,13 @@ void Foam::vtkPVblockMesh::updateInfoEdges
     vtkDataArraySelection* select
 )
 {
-    arrayRange& range = arrayRangeEdges_;
-
     if (debug)
     {
         Info<< "<beg> updateInfoEdges"
             << " [meshPtr=" << (meshPtr_ ? "set" : "null") << "]" << endl;
     }
 
-    range.reset(select->GetNumberOfArrays());
+    rangeEdges_.reset(select->GetNumberOfArrays());
 
     const blockMesh& blkMesh = *meshPtr_;
     const blockEdgeList& edges = blkMesh.edges();
@@ -161,10 +156,9 @@ void Foam::vtkPVblockMesh::updateInfoEdges
 
         // Add "beg:end - type" to GUI list
         select->AddArray(ostr.str().c_str());
+        ++rangeEdges_;
     }
 
-    range += edges.size();
-
     if (debug)
     {
         Info<< "<end> updateInfoEdges" << endl;
@@ -185,9 +179,9 @@ Foam::vtkPVblockMesh::vtkPVblockMesh
     meshPtr_(nullptr),
     meshRegion_(polyMesh::defaultRegion),
     meshDir_(polyMesh::meshSubDir),
-    arrayRangeBlocks_("block"),
-    arrayRangeEdges_("edges"),
-    arrayRangeCorners_("corners")
+    rangeBlocks_("block"),
+    rangeEdges_("edges"),
+    rangeCorners_("corners")
 {
     if (debug)
     {
diff --git a/applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/vtkPVblockMesh/vtkPVblockMesh.H b/applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/vtkPVblockMesh/vtkPVblockMesh.H
index a22316c84a..d30a97eeed 100644
--- a/applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/vtkPVblockMesh/vtkPVblockMesh.H
+++ b/applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/vtkPVblockMesh/vtkPVblockMesh.H
@@ -101,13 +101,13 @@ class vtkPVblockMesh
 
         //- First instance and size of bleckMesh blocks
         //  used to index into blockStatus_
-        arrayRange arrayRangeBlocks_;
+        arrayRange rangeBlocks_;
 
         //- First instance and size of CurvedEdges (only partially used)
-        arrayRange arrayRangeEdges_;
+        arrayRange rangeEdges_;
 
         //- First instance and size of block corners (only partially used)
-        arrayRange arrayRangeCorners_;
+        arrayRange rangeCorners_;
 
         //- List of patch names for rendering to window
         List<vtkTextActor*> patchTextActorsPtrs_;
@@ -119,7 +119,11 @@ class vtkPVblockMesh
     // Private Member Functions
 
         //- Create a text actor
-        static vtkTextActor* createTextActor(const string& s, const point& pt);
+        static vtkTextActor* createTextActor
+        (
+            const std::string& s,
+            const point& pt
+        );
 
         //- Reset data counters
         void resetCounters();
diff --git a/applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/vtkPVblockMesh/vtkPVblockMeshConvert.C b/applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/vtkPVblockMesh/vtkPVblockMeshConvert.C
index 51f8f4c90c..1a2c18df6b 100644
--- a/applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/vtkPVblockMesh/vtkPVblockMeshConvert.C
+++ b/applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/vtkPVblockMesh/vtkPVblockMeshConvert.C
@@ -68,7 +68,7 @@ void Foam::vtkPVblockMesh::convertMeshBlocks
 )
 {
     vtkDataArraySelection* selection = reader_->GetBlockSelection();
-    arrayRange& range = arrayRangeBlocks_;
+    arrayRange& range = rangeBlocks_;
     range.block(blockNo);   // set output block
     label datasetNo = 0;    // restart at dataset 0
 
@@ -85,11 +85,12 @@ void Foam::vtkPVblockMesh::convertMeshBlocks
 
     for
     (
-        int partId = range.start();
-        partId < range.end();
-        ++partId, ++blockI
+        auto iter = range.cbegin();
+        iter != range.cend();
+        ++iter, ++blockI
     )
     {
+        const auto partId = *iter;
         if (!blockStatus_[partId])
         {
             continue;
@@ -135,7 +136,7 @@ void Foam::vtkPVblockMesh::convertMeshBlocks
         );
 
         vtkmesh->Delete();
-        datasetNo++;
+        ++datasetNo;
     }
 
 
@@ -159,7 +160,7 @@ void Foam::vtkPVblockMesh::convertMeshEdges
 )
 {
     vtkDataArraySelection* selection = reader_->GetCurvedEdgesSelection();
-    arrayRange& range = arrayRangeEdges_;
+    arrayRange& range = rangeEdges_;
 
     range.block(blockNo);      // set output block
     label datasetNo = 0;       // restart at dataset 0
@@ -172,11 +173,12 @@ void Foam::vtkPVblockMesh::convertMeshEdges
 
     for
     (
-        int partId = range.start();
-        partId < range.end();
-        ++partId, ++edgeI
+        auto iter = range.cbegin();
+        iter != range.cend();
+        ++iter, ++edgeI
     )
     {
+        const auto partId = *iter;
         if (!edgeStatus_[partId])
         {
             continue;
@@ -271,7 +273,7 @@ void Foam::vtkPVblockMesh::convertMeshCorners
     int& blockNo
 )
 {
-    arrayRange& range = arrayRangeCorners_;
+    arrayRange& range = rangeCorners_;
     range.block(blockNo);      // set output block
     label datasetNo = 0;       // restart at dataset 0
 
@@ -315,12 +317,7 @@ void Foam::vtkPVblockMesh::convertMeshCorners
         addToBlock(output, vtkmesh, range, datasetNo, range.name());
         vtkmesh->Delete();
 
-        datasetNo++;
-    }
-
-    // anything added?
-    if (datasetNo)
-    {
+        ++datasetNo;
         ++blockNo;
     }
 
diff --git a/applications/utilities/postProcessing/graphics/PVReaders/foamPv/foamPvCore.C b/applications/utilities/postProcessing/graphics/PVReaders/foamPv/foamPvCore.C
index 478cff22a4..4a9468d8e2 100644
--- a/applications/utilities/postProcessing/graphics/PVReaders/foamPv/foamPvCore.C
+++ b/applications/utilities/postProcessing/graphics/PVReaders/foamPv/foamPvCore.C
@@ -181,7 +181,7 @@ Foam::hashedWordList Foam::foamPvCore::getSelected
     const int n = select->GetNumberOfArrays();
     DynamicList<word> selected(n);
 
-    for (int i = selector.start(); i < selector.end(); ++i)
+    for (auto i : selector)
     {
         if (select->GetArraySetting(i))
         {
@@ -240,7 +240,7 @@ Foam::stringList Foam::foamPvCore::getSelectedArrayEntries
     stringList selections(selector.size());
     label nElem = 0;
 
-    for (int i = selector.start(); i < selector.end(); ++i)
+    for (auto i : selector)
     {
         if (select->GetArraySetting(i))
         {
@@ -252,7 +252,7 @@ Foam::stringList Foam::foamPvCore::getSelectedArrayEntries
     if (debug > 1)
     {
         Info<< "available(";
-        for (int i = selector.start(); i < selector.end(); ++i)
+        for (auto i : selector)
         {
             Info<< " \"" << select->GetArrayName(i) << "\"";
         }
@@ -324,4 +324,5 @@ void Foam::foamPvCore::printMemory()
     }
 }
 
+
 // ************************************************************************* //
diff --git a/applications/utilities/postProcessing/graphics/PVReaders/foamPv/foamPvCore.H b/applications/utilities/postProcessing/graphics/PVReaders/foamPv/foamPvCore.H
index f6203690fd..5a2d0d44e7 100644
--- a/applications/utilities/postProcessing/graphics/PVReaders/foamPv/foamPvCore.H
+++ b/applications/utilities/postProcessing/graphics/PVReaders/foamPv/foamPvCore.H
@@ -40,6 +40,7 @@ SourceFiles
 #include "wordList.H"
 #include "Hash.H"
 #include "hashedWordList.H"
+#include "labelRange.H"
 
 #include "vtkPoints.h"
 
@@ -69,21 +70,20 @@ public:
     //- Bookkeeping for GUI checklists and multi-block organization
     //  Works like a SubList selection.
     class arrayRange
+    :
+        public labelRange
     {
         const char *name_;
         int block_;
-        int start_;
-        int size_;
 
     public:
 
         //- Construct with given name for the specified block
-        arrayRange(const char *name, const int blockNo=0)
+        arrayRange(const char *name, int blockNo=0)
         :
+            labelRange(),
             name_(name),
-            block_(blockNo),
-            start_(0),
-            size_(0)
+            block_(blockNo)
         {}
 
         //- Return the block holding these datasets
@@ -106,47 +106,21 @@ public:
             return name_;
         }
 
-        //- The array start index
-        int start() const
-        {
-            return start_;
-        }
-
-        //- The array end index
-        int end() const
-        {
-            return start_ + size_;
-        }
-
-        //- The sub-list size
-        int size() const
-        {
-            return size_;
-        }
-
-        //- True if the sub-list is empty
-        bool empty() const
-        {
-            return !size_;
-        }
+        //- Reset the start/size directly
+        using labelRange::reset;
 
         //- Reset the size to zero and optionally assign a new start
-        void reset(const int startAt = 0)
+        void reset(label startAt = 0)
         {
-            start_ = startAt;
-            size_  = 0;
+            clear();
+            setStart(startAt);
         }
 
-        //- Assign new start and reset the size
-        void operator=(const int i)
-        {
-            reset(i);
-        }
 
         //- Increment the size
-        void operator+=(const int n)
+        void operator+=(label n)
         {
-            size_ += n;
+            setSize(size() + n);
         }
 
     }; // End class arrayRange
@@ -206,7 +180,7 @@ public:
     (
         vtkDataArraySelection* select,
         const IOobjectList& objects,
-        const string& suffix = string::null
+        const std::string& suffix = string::null
     );
 
 
diff --git a/applications/utilities/postProcessing/graphics/PVReaders/foamPv/foamPvCoreTemplates.C b/applications/utilities/postProcessing/graphics/PVReaders/foamPv/foamPvCoreTemplates.C
index e5d1353699..7cedd047a2 100644
--- a/applications/utilities/postProcessing/graphics/PVReaders/foamPv/foamPvCoreTemplates.C
+++ b/applications/utilities/postProcessing/graphics/PVReaders/foamPv/foamPvCoreTemplates.C
@@ -60,7 +60,7 @@ Foam::label Foam::foamPvCore::addToSelection
 (
     vtkDataArraySelection *select,
     const IOobjectList& objects,
-    const string& suffix
+    const std::string& suffix
 )
 {
     const wordList names = objects.sortedNames(Type::typeName);

From 71710e0798ae4aa4f07eb1a1fcb48b75d9df8cc7 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Fri, 12 May 2017 15:37:04 +0200
Subject: [PATCH 05/27] ENH: use prefix when displaying group,patch names for
 paraview selection

- easier to detect the implicit grouping
---
 .../PVFoamReader/vtkPVFoam/vtkPVFoam.C        |  4 +--
 .../vtkPVFoam/vtkPVFoamUpdateInfo.C           | 26 ++++++++--------
 .../graphics/PVReaders/foamPv/foamPvCore.C    | 30 +++++++++++++------
 .../graphics/PVReaders/foamPv/foamPvCore.H    | 13 ++++----
 .../PVReaders/foamPv/foamPvCoreTemplates.C    |  6 ++--
 5 files changed, 47 insertions(+), 32 deletions(-)

diff --git a/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoam.C b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoam.C
index 2ba76a4c31..9fd2f2cdc4 100644
--- a/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoam.C
+++ b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoam.C
@@ -240,7 +240,7 @@ void Foam::vtkPVFoam::updateMeshPartsStatus()
 
 Foam::word Foam::vtkPVFoam::getPartName(const int partId)
 {
-    return getFirstWord(reader_->GetPartArrayName(partId));
+    return getFoamName(reader_->GetPartArrayName(partId));
 }
 
 
@@ -649,7 +649,7 @@ void Foam::vtkPVFoam::renderPatchNames
 
     if (show && meshPtr_)
     {
-        // get the display patches, strip off any suffix
+        // get the display patches, strip off any prefix/suffix
         hashedWordList selectedPatches = getSelected
         (
             reader_->GetPartSelection(),
diff --git a/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamUpdateInfo.C b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamUpdateInfo.C
index 213694e6e5..7bdfd32586 100644
--- a/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamUpdateInfo.C
+++ b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamUpdateInfo.C
@@ -192,7 +192,7 @@ void Foam::vtkPVFoam::updateInfoLagrangian
         // Add cloud to GUI list
         arraySelection->AddArray
         (
-            (cloudDirs[cloudi] + " - lagrangian").c_str()
+            ("lagrangian/" + cloudDirs[cloudi]).c_str()
         );
         ++rangeLagrangian_;
     }
@@ -246,7 +246,7 @@ void Foam::vtkPVFoam::updateInfoPatches
             }
 
             // Valid patch if nFace > 0 - add patch to GUI list
-            const string dpyName = groupName + " - group";
+            const string dpyName = "group/" + groupName;
             arraySelection->AddArray(dpyName.c_str());
             ++rangePatches_;
 
@@ -262,7 +262,7 @@ void Foam::vtkPVFoam::updateInfoPatches
                         {
                             enabledEntriesSet.insert
                             (
-                                pp.name() + " - patch"
+                                "patch/" + pp.name()
                             );
                         }
                     }
@@ -285,7 +285,7 @@ void Foam::vtkPVFoam::updateInfoPatches
                     // Add patch to GUI list
                     arraySelection->AddArray
                     (
-                        (pp.name() + " - patch").c_str()
+                        ("patch/" + pp.name()).c_str()
                     );
                     ++rangePatches_;
                 }
@@ -360,7 +360,7 @@ void Foam::vtkPVFoam::updateInfoPatches
                 const auto& groupName = iter.key();
                 const auto& patchIDs  = iter.object();
 
-                const string dpyName = groupName + " - group";
+                const string dpyName = "group/" + groupName;
                 arraySelection->AddArray(dpyName.c_str());
                 ++rangePatches_;
 
@@ -376,7 +376,7 @@ void Foam::vtkPVFoam::updateInfoPatches
                     {
                         enabledEntriesSet.insert
                         (
-                            names[patchId] + " - patch";
+                            "patch/" + names[patchId]
                         );
                     }
                 }
@@ -395,7 +395,7 @@ void Foam::vtkPVFoam::updateInfoPatches
                     {
                         arraySelection->AddArray
                         (
-                            (names[patchi] + " - patch").c_str()
+                            ("patch/" + names[patchi]).c_str()
                         );
                         ++rangePatches_;
                     }
@@ -449,7 +449,7 @@ void Foam::vtkPVFoam::updateInfoZones
     {
         arraySelection->AddArray
         (
-            (namesLst[elemI] + " - cellZone").c_str()
+            ("cellZone/" + namesLst[elemI]).c_str()
         );
         ++rangeCellZones_;
     }
@@ -472,7 +472,7 @@ void Foam::vtkPVFoam::updateInfoZones
     {
         arraySelection->AddArray
         (
-            (namesLst[elemI] + " - faceZone").c_str()
+            ("faceZone/" + namesLst[elemI]).c_str()
         );
         ++rangeFaceZones_;
     }
@@ -495,7 +495,7 @@ void Foam::vtkPVFoam::updateInfoZones
     {
         arraySelection->AddArray
         (
-            (namesLst[elemI] + " - pointZone").c_str()
+            ("pointZone/" + namesLst[elemI]).c_str()
         );
         ++rangePointZones_;
     }
@@ -554,7 +554,7 @@ void Foam::vtkPVFoam::updateInfoSets
     (
         arraySelection,
         objects,
-        " - cellSet"
+        "cellSet/"
     );
 
     rangeFaceSets_.reset(arraySelection->GetNumberOfArrays());
@@ -562,7 +562,7 @@ void Foam::vtkPVFoam::updateInfoSets
     (
         arraySelection,
         objects,
-        " - faceSet"
+        "faceSet/"
     );
 
     rangePointSets_.reset(arraySelection->GetNumberOfArrays());
@@ -570,7 +570,7 @@ void Foam::vtkPVFoam::updateInfoSets
     (
         arraySelection,
         objects,
-        " - pointSet"
+        "pointSet/"
     );
 
     if (debug)
diff --git a/applications/utilities/postProcessing/graphics/PVReaders/foamPv/foamPvCore.C b/applications/utilities/postProcessing/graphics/PVReaders/foamPv/foamPvCore.C
index 4a9468d8e2..b2c5c822e2 100644
--- a/applications/utilities/postProcessing/graphics/PVReaders/foamPv/foamPvCore.C
+++ b/applications/utilities/postProcessing/graphics/PVReaders/foamPv/foamPvCore.C
@@ -164,7 +164,7 @@ Foam::hashedWordList Foam::foamPvCore::getSelected
     {
         if (select->GetArraySetting(i))
         {
-            selected.append(getFirstWord(select->GetArrayName(i)));
+            selected.append(getFoamName(select->GetArrayName(i)));
         }
     }
 
@@ -185,7 +185,7 @@ Foam::hashedWordList Foam::foamPvCore::getSelected
     {
         if (select->GetArraySetting(i))
         {
-            selected.append(getFirstWord(select->GetArrayName(i)));
+            selected.append(getFoamName(select->GetArrayName(i)));
         }
     }
 
@@ -295,17 +295,29 @@ void Foam::foamPvCore::setSelectedArrayEntries
 }
 
 
-Foam::word Foam::foamPvCore::getFirstWord(const char* str)
+Foam::word Foam::foamPvCore::getFoamName(const std::string& str)
 {
-    if (str)
+    if (str.size())
     {
-        label n = 0;
-        while (str[n] && word::valid(str[n]))
+        std::string::size_type beg = str.rfind('/');
+        if (beg == std::string::npos)
         {
-            ++n;
+            beg = 0;
         }
-        // don't need to re-check for invalid chars
-        return word(str, n, false);
+        else
+        {
+            ++beg;
+        }
+
+        std::string::size_type end = beg;
+
+        while (str[end] && word::valid(str[end]))
+        {
+            ++end;
+        }
+
+        // Already checked for valid/invalid chars
+        return word(str.substr(beg, beg+end), false);
     }
     else
     {
diff --git a/applications/utilities/postProcessing/graphics/PVReaders/foamPv/foamPvCore.H b/applications/utilities/postProcessing/graphics/PVReaders/foamPv/foamPvCore.H
index 5a2d0d44e7..8a81633408 100644
--- a/applications/utilities/postProcessing/graphics/PVReaders/foamPv/foamPvCore.H
+++ b/applications/utilities/postProcessing/graphics/PVReaders/foamPv/foamPvCore.H
@@ -180,7 +180,7 @@ public:
     (
         vtkDataArraySelection* select,
         const IOobjectList& objects,
-        const std::string& suffix = string::null
+        const std::string& prefix = string::null
     );
 
 
@@ -191,14 +191,16 @@ public:
         vtkDataArraySelection* select
     );
 
-    //- Retrieve the current selections as a wordHashSet
+    //- Retrieve the current selections as a hashedWordList,
+    //  while stripping off any prefix or suffix
     static hashedWordList getSelected
     (
         vtkDataArraySelection* select
     );
 
 
-    //- Retrieve a sub-list of the current selections
+    //- Retrieve a sub-list of the current selections as a hashedWordList,
+    //  while stripping off any prefix or suffix
     static hashedWordList getSelected
     (
         vtkDataArraySelection* select,
@@ -228,8 +230,9 @@ public:
     );
 
 
-    //- Extract up to the first non-word characters
-    static word getFirstWord(const char* str);
+    //- Extract the first word characters after a slash
+    static word getFoamName(const std::string& str);
+
 
     //- Simple memory used debugging information
     static void printMemory();
diff --git a/applications/utilities/postProcessing/graphics/PVReaders/foamPv/foamPvCoreTemplates.C b/applications/utilities/postProcessing/graphics/PVReaders/foamPv/foamPvCoreTemplates.C
index 7cedd047a2..7908a7752d 100644
--- a/applications/utilities/postProcessing/graphics/PVReaders/foamPv/foamPvCoreTemplates.C
+++ b/applications/utilities/postProcessing/graphics/PVReaders/foamPv/foamPvCoreTemplates.C
@@ -60,20 +60,20 @@ Foam::label Foam::foamPvCore::addToSelection
 (
     vtkDataArraySelection *select,
     const IOobjectList& objects,
-    const std::string& suffix
+    const std::string& prefix
 )
 {
     const wordList names = objects.sortedNames(Type::typeName);
 
     forAll(names, i)
     {
-        if (suffix.empty())
+        if (prefix.empty())
         {
             select->AddArray(names[i].c_str());
         }
         else
         {
-            select->AddArray((names[i] + suffix).c_str());
+            select->AddArray((prefix + names[i]).c_str());
         }
     }
 

From 2e0337d02430a8df80f5e52ef555e3cce3101b89 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Sun, 14 May 2017 21:04:11 +0200
Subject: [PATCH 06/27] ENH: use smart pointers for paraview readers

- adds flexiblity and reduces risk of memory leaks as we add/change
  features

STYLE: adjust naming for paraview internal polyDecomp
---
 .../PVFoamReader/vtkPVFoamReader.cxx          |  14 +-
 .../PVFoamReader/vtkPVFoamReader.h            |   1 +
 .../PVFoamReader/vtkPVFoam/vtkPVFoam.C        |  76 ++++++-----
 .../PVFoamReader/vtkPVFoam/vtkPVFoam.H        |  81 ++++++------
 .../vtkPVFoam/vtkPVFoamFieldTemplates.C       | 122 ++++++++++--------
 .../PVFoamReader/vtkPVFoam/vtkPVFoamMesh.C    |  83 ++++++------
 .../vtkPVFoam/vtkPVFoamMeshLagrangian.C       |  18 +--
 .../vtkPVFoam/vtkPVFoamMeshVolume.C           |  24 ++--
 .../vtkPVFoam/vtkPVFoamTemplates.C            |  17 ++-
 .../vtkPVblockMesh/vtkPVblockMesh.C           |  83 ++++++------
 .../vtkPVblockMesh/vtkPVblockMesh.H           |  13 +-
 .../vtkPVblockMesh/vtkPVblockMeshConvert.C    |  41 +++---
 .../graphics/PVReaders/foamPv/foamPvCore.C    |   7 +-
 13 files changed, 310 insertions(+), 270 deletions(-)

diff --git a/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/PVFoamReader/vtkPVFoamReader.cxx b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/PVFoamReader/vtkPVFoamReader.cxx
index 6a2e657929..abd191dd7a 100644
--- a/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/PVFoamReader/vtkPVFoamReader.cxx
+++ b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/PVFoamReader/vtkPVFoamReader.cxx
@@ -39,6 +39,7 @@ License
 #include "vtkSMRenderViewProxy.h"
 #include "vtkStreamingDemandDrivenPipeline.h"
 #include "vtkStringArray.h"
+#include "vtkSmartPointer.h"
 
 // OpenFOAM includes
 #include "vtkPVFoam.H"
@@ -69,11 +70,13 @@ vtkPVFoamReader::vtkPVFoamReader()
 #ifdef VTKPVFOAM_DUALPORT
     // Add second output for the Lagrangian
     this->SetNumberOfOutputPorts(2);
-    vtkMultiBlockDataSet *lagrangian = vtkMultiBlockDataSet::New();
+
+    vtkSmartPointer<vtkMultiBlockDataSet> lagrangian =
+        vtkSmartPointer<vtkMultiBlockDataSet>::New();
+
     lagrangian->ReleaseData();
 
     this->GetExecutive()->SetOutputData(1, lagrangian);
-    lagrangian->Delete();
 #endif
 
     TimeStepRange[0] = 0;
@@ -218,7 +221,7 @@ int vtkPVFoamReader::RequestInformation
     {
         vtkErrorMacro("could not find valid OpenFOAM mesh");
 
-        // delete foamData and flag it as fatal error
+        // delete backend handler and flag it as fatal error
         delete backend_;
         backend_ = nullptr;
         return 0;
@@ -326,7 +329,8 @@ int vtkPVFoamReader::RequestData
     {
         vtkInformation *outInfo = outputVector->GetInformationObject(infoI);
 
-        int nsteps = outInfo->Length(vtkStreamingDemandDrivenPipeline::TIME_STEPS());
+        const int nsteps =
+            outInfo->Length(vtkStreamingDemandDrivenPipeline::TIME_STEPS());
 
         if
         (
@@ -419,7 +423,7 @@ int vtkPVFoamReader::RequestData
             (
                 vtkMultiBlockDataSet::DATA_OBJECT()
             )
-        );
+        )
     );
 #else
     backend_->Update(output, output);
diff --git a/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/PVFoamReader/vtkPVFoamReader.h b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/PVFoamReader/vtkPVFoamReader.h
index 0de09a5547..a1b4f3fa44 100644
--- a/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/PVFoamReader/vtkPVFoamReader.h
+++ b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/PVFoamReader/vtkPVFoamReader.h
@@ -46,6 +46,7 @@ SourceFiles
 // VTK forward declarations
 class vtkDataArraySelection;
 class vtkCallbackCommand;
+template<class T> class vtkSmartPointer;
 
 // OpenFOAM forward declarations
 namespace Foam
diff --git a/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoam.C b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoam.C
index 9fd2f2cdc4..1a623ac949 100644
--- a/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoam.C
+++ b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoam.C
@@ -37,6 +37,7 @@ License
 #include "vtkRenderer.h"
 #include "vtkTextActor.h"
 #include "vtkTextProperty.h"
+#include "vtkSmartPointer.h"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
@@ -48,29 +49,37 @@ namespace Foam
 
 // * * * * * * * * * * * * * Static Member Functions * * * * * * * * * * * * //
 
-vtkTextActor* Foam::vtkPVFoam::createTextActor
-(
-    const std::string& s,
-    const point& pt
-)
+namespace Foam
 {
-    vtkTextActor* txt = vtkTextActor::New();
-    txt->SetInput(s.c_str());
+    // file-scope
 
-    // Set text properties
-    vtkTextProperty* tprop = txt->GetTextProperty();
-    tprop->SetFontFamilyToArial();
-    tprop->BoldOn();
-    tprop->ShadowOff();
-    tprop->SetLineSpacing(1.0);
-    tprop->SetFontSize(14);
-    tprop->SetColor(1.0, 0.0, 1.0);
-    tprop->SetJustificationToCentered();
+    //- Create a text actor
+    vtkSmartPointer<vtkTextActor> createTextActor
+    (
+        const std::string& s,
+        const Foam::point& pt
+    )
+    {
+        vtkSmartPointer<vtkTextActor> txt =
+            vtkSmartPointer<vtkTextActor>::New();
 
-    txt->GetPositionCoordinate()->SetCoordinateSystemToWorld();
-    txt->GetPositionCoordinate()->SetValue(pt.x(), pt.y(), pt.z());
+        txt->SetInput(s.c_str());
 
-    return txt;
+        // Set text properties
+        vtkTextProperty* tprop = txt->GetTextProperty();
+        tprop->SetFontFamilyToArial();
+        tprop->BoldOn();
+        tprop->ShadowOff();
+        tprop->SetLineSpacing(1.0);
+        tprop->SetFontSize(14);
+        tprop->SetColor(1.0, 0.0, 1.0);
+        tprop->SetJustificationToCentered();
+
+        txt->GetPositionCoordinate()->SetCoordinateSystemToWorld();
+        txt->GetPositionCoordinate()->SetValue(pt.x(), pt.y(), pt.z());
+
+        return txt;
+    }
 }
 
 
@@ -93,19 +102,19 @@ void Foam::vtkPVFoam::resetCounters()
 
 void Foam::vtkPVFoam::reduceMemory()
 {
-    forAll(regionPolyDecomp_, i)
+    forAll(regionVtus_, i)
     {
-        regionPolyDecomp_[i].clear();
+        regionVtus_[i].clear();
     }
 
-    forAll(zonePolyDecomp_, i)
+    forAll(zoneVtus_, i)
     {
-        zonePolyDecomp_[i].clear();
+        zoneVtus_[i].clear();
     }
 
-    forAll(csetPolyDecomp_, i)
+    forAll(csetVtus_, i)
     {
-        csetPolyDecomp_[i].clear();
+        csetVtus_[i].clear();
     }
 
     if (!reader_->GetCacheMesh())
@@ -640,12 +649,11 @@ void Foam::vtkPVFoam::renderPatchNames
 {
     // always remove old actors first
 
-    forAll(patchTextActorsPtrs_, patchi)
+    forAll(patchTextActors_, patchi)
     {
-        renderer->RemoveViewProp(patchTextActorsPtrs_[patchi]);
-        patchTextActorsPtrs_[patchi]->Delete();
+        renderer->RemoveViewProp(patchTextActors_[patchi]);
     }
-    patchTextActorsPtrs_.clear();
+    patchTextActors_.clear();
 
     if (show && meshPtr_)
     {
@@ -750,7 +758,7 @@ void Foam::vtkPVFoam::renderPatchNames
         }
 
         // Set the size of the patch labels to max number of zones
-        patchTextActorsPtrs_.setSize(displayZoneI);
+        patchTextActors_.setSize(displayZoneI);
 
         if (debug)
         {
@@ -783,7 +791,7 @@ void Foam::vtkPVFoam::renderPatchNames
                 }
 
                 // Into a list for later removal
-                patchTextActorsPtrs_[displayZoneI++] = createTextActor
+                patchTextActors_[displayZoneI++] = createTextActor
                 (
                     pp.name(),
                     zoneCentre[patchi][globalZoneI]
@@ -792,13 +800,13 @@ void Foam::vtkPVFoam::renderPatchNames
         }
 
         // Resize the patch names list to the actual number of patch names added
-        patchTextActorsPtrs_.setSize(displayZoneI);
+        patchTextActors_.setSize(displayZoneI);
     }
 
     // Add text to each renderer
-    forAll(patchTextActorsPtrs_, actori)
+    forAll(patchTextActors_, actori)
     {
-        renderer->AddViewProp(patchTextActorsPtrs_[actori]);
+        renderer->AddViewProp(patchTextActors_[actori]);
     }
 }
 
diff --git a/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoam.H b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoam.H
index b7350ad055..323be9b6c8 100644
--- a/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoam.H
+++ b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoam.H
@@ -71,6 +71,8 @@ class vtkPolyData;
 class vtkUnstructuredGrid;
 class vtkIndent;
 
+template<class T> class vtkSmartPointer;
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
@@ -105,9 +107,9 @@ class vtkPVFoam
         //  hide in extra pointMap (cellSet/cellZone) for now
         class polyDecomp
         {
-            labelList superCells_;
-            labelList addPointCellLabels_;
+            labelList cellMap_;
             labelList pointMap_;
+            labelList additionalIds_;
 
         public:
 
@@ -115,27 +117,15 @@ class vtkPVFoam
             {}
 
             //- Label of original cell for decomposed cells
-            labelList& superCells()
+            labelList& cellMap()
             {
-                return superCells_;
+                return cellMap_;
             }
 
             //- Label of original cell for decomposed cells
-            const labelList& superCells() const
+            const labelList& cellMap() const
             {
-                return superCells_;
-            }
-
-            //- Cell-centre labels for additional points of decomposed cells
-            labelList& addPointCellLabels()
-            {
-                return addPointCellLabels_;
-            }
-
-            //- Cell-centre labels for additional points of decomposed cells
-            const labelList& addPointCellLabels() const
-            {
-                return addPointCellLabels_;
+                return cellMap_;
             }
 
             //- Point labels for subsetted meshes
@@ -151,15 +141,29 @@ class vtkPVFoam
             }
 
 
+            //- Cell-centre labels for additional points of decomposed cells
+            labelList& additionalIds()
+            {
+                return additionalIds_;
+            }
+
+            //- Cell-centre labels for additional points of decomposed cells
+            const labelList& additionalIds() const
+            {
+                return additionalIds_;
+            }
+
             //- Clear
             void clear()
             {
-                superCells_.clear();
-                addPointCellLabels_.clear();
+                cellMap_.clear();
                 pointMap_.clear();
+                additionalIds_.clear();
             }
         };
 
+    typedef polyDecomp foamVtuData;
+
 
     // Private Data
 
@@ -208,27 +212,20 @@ class vtkPVFoam
 
         //- Decomposed cells information (mesh regions)
         //  TODO: regions
-        List<polyDecomp> regionPolyDecomp_;
+        List<foamVtuData> regionVtus_;
 
         //- Decomposed cells information (cellZone meshes)
-        List<polyDecomp> zonePolyDecomp_;
+        List<foamVtuData> zoneVtus_;
 
         //- Decomposed cells information (cellSet meshes)
-        List<polyDecomp> csetPolyDecomp_;
+        List<foamVtuData> csetVtus_;
 
         //- List of patch names for rendering to window
-        List<vtkTextActor*> patchTextActorsPtrs_;
+        List<vtkSmartPointer<vtkTextActor>> patchTextActors_;
 
 
     // Private Member Functions
 
-        //- Create a text actor
-        static vtkTextActor* createTextActor
-        (
-            const std::string& s,
-            const point& pt
-        );
-
         //- Reset data counters
         void resetCounters();
 
@@ -318,14 +315,14 @@ class vtkPVFoam
       // Add mesh functions
 
         //- Volume meshes as vtkUnstructuredGrid
-        vtkUnstructuredGrid* volumeVTKMesh
+        vtkSmartPointer<vtkUnstructuredGrid> volumeVTKMesh
         (
             const fvMesh& mesh,
-            polyDecomp& decompInfo
+            foamVtuData& vtuData
         );
 
         //- Lagrangian positions as vtkPolyData
-        vtkPolyData* lagrangianVTKMesh
+        vtkSmartPointer<vtkPolyData> lagrangianVTKMesh
         (
             const polyMesh& mesh,
             const word& cloudName
@@ -333,7 +330,7 @@ class vtkPVFoam
 
         //- Patches (mesh or primitive) as vtkPolyData
         template<class PatchType>
-        vtkPolyData* patchVTKMesh
+        vtkSmartPointer<vtkPolyData> patchVTKMesh
         (
             const word& name,
             const PatchType& p
@@ -344,7 +341,7 @@ class vtkPVFoam
 
         //- Convert Field to VTK field
         template<class Type>
-        vtkFloatArray* convertFieldToVTK
+        vtkSmartPointer<vtkFloatArray> convertFieldToVTK
         (
             const word& name,
             const Field<Type>& fld
@@ -352,7 +349,7 @@ class vtkPVFoam
 
         //- Face set/zone field
         template<class Type>
-        vtkFloatArray* convertFaceFieldToVTK
+        vtkSmartPointer<vtkFloatArray> convertFaceFieldToVTK
         (
             const GeometricField<Type, fvPatchField, volMesh>& fld,
             const labelUList& faceLabels
@@ -360,10 +357,10 @@ class vtkPVFoam
 
         //- Volume field
         template<class Type>
-        vtkFloatArray* convertVolFieldToVTK
+        vtkSmartPointer<vtkFloatArray> convertVolFieldToVTK
         (
             const GeometricField<Type, fvPatchField, volMesh>& fld,
-            const polyDecomp& decompInfo
+            const foamVtuData& vtuData
         );
 
 
@@ -416,7 +413,7 @@ class vtkPVFoam
             autoPtr<GeometricField<Type, pointPatchField, pointMesh>>& ptfPtr,
             vtkMultiBlockDataSet* output,
             const arrayRange& range,
-            const List<polyDecomp>& decompLst
+            const List<foamVtuData>& vtuDataList
         );
 
         //- Lagrangian fields - all types
@@ -444,7 +441,7 @@ class vtkPVFoam
             const GeometricField<Type, pointPatchField, pointMesh>& pfld,
             vtkMultiBlockDataSet* output,
             const arrayRange& range,
-            const List<polyDecomp>& decompLst
+            const List<foamVtuData>& vtuDataList
         );
 
         //- Point field
@@ -454,7 +451,7 @@ class vtkPVFoam
             vtkUnstructuredGrid* vtkmesh,
             const GeometricField<Type, pointPatchField, pointMesh>& pfld,
             const GeometricField<Type, fvPatchField, volMesh>& vfld,
-            const polyDecomp& decomp
+            const foamVtuData& vtuData
         );
 
 
diff --git a/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamFieldTemplates.C b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamFieldTemplates.C
index 527a641bc9..70c7948872 100644
--- a/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamFieldTemplates.C
+++ b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamFieldTemplates.C
@@ -42,6 +42,7 @@ InClass
 #include "vtkFloatArray.h"
 #include "vtkCellData.h"
 #include "vtkPointData.h"
+#include "vtkSmartPointer.h"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 //
@@ -84,7 +85,7 @@ void Foam::vtkPVFoam::convertVolField
         ptfPtr,
         output,
         rangeVolume_,
-        regionPolyDecomp_
+        regionVtus_
     );
 
     // Convert activated cellZones
@@ -94,7 +95,7 @@ void Foam::vtkPVFoam::convertVolField
         ptfPtr,
         output,
         rangeCellZones_,
-        zonePolyDecomp_
+        zoneVtus_
     );
 
     // Convert activated cellSets
@@ -104,7 +105,7 @@ void Foam::vtkPVFoam::convertVolField
         ptfPtr,
         output,
         rangeCellSets_,
-        csetPolyDecomp_
+        csetVtus_
     );
 
 
@@ -151,38 +152,44 @@ void Foam::vtkPVFoam::convertVolField
                 fvPatchField<Type>(p, fld).patchInternalField()
             );
 
-            vtkFloatArray* cdata = convertFieldToVTK(fld.name(), tpptf());
+            vtkSmartPointer<vtkFloatArray> cdata =
+                convertFieldToVTK
+                (
+                    fld.name(),
+                    tpptf()
+                );
             vtkmesh->GetCellData()->AddArray(cdata);
-            cdata->Delete();
 
             if (patchId < patchInterpList.size())
             {
-                vtkFloatArray* pdata = convertFieldToVTK
+                vtkSmartPointer<vtkFloatArray> pdata = convertFieldToVTK
                 (
                     fld.name(),
                     patchInterpList[patchId].faceToPointInterpolate(tpptf)()
                 );
 
                 vtkmesh->GetPointData()->AddArray(pdata);
-                pdata->Delete();
             }
         }
         else
         {
-            vtkFloatArray* cdata = convertFieldToVTK(fld.name(), ptf);
+            vtkSmartPointer<vtkFloatArray> cdata =
+                convertFieldToVTK
+                (
+                    fld.name(),
+                    ptf
+                );
             vtkmesh->GetCellData()->AddArray(cdata);
-            cdata->Delete();
 
             if (patchId < patchInterpList.size())
             {
-                vtkFloatArray* pdata = convertFieldToVTK
+                vtkSmartPointer<vtkFloatArray> pdata = convertFieldToVTK
                 (
                     fld.name(),
                     patchInterpList[patchId].faceToPointInterpolate(ptf)()
                 );
 
                 vtkmesh->GetPointData()->AddArray(pdata);
-                pdata->Delete();
             }
         }
     }
@@ -215,14 +222,13 @@ void Foam::vtkPVFoam::convertVolField
 
         if (vtkmesh)
         {
-            vtkFloatArray* cdata = convertFaceFieldToVTK
+            vtkSmartPointer<vtkFloatArray> cdata = convertFaceFieldToVTK
             (
                 fld,
                 zMesh[zoneId]
             );
 
             vtkmesh->GetCellData()->AddArray(cdata);
-            cdata->Delete();
         }
 
         // TODO: points
@@ -253,14 +259,13 @@ void Foam::vtkPVFoam::convertVolField
 
         const faceSet fSet(mesh, selectName);
 
-        vtkFloatArray* cdata = convertFaceFieldToVTK
+        vtkSmartPointer<vtkFloatArray> cdata = convertFaceFieldToVTK
         (
             fld,
             fSet.sortedToc()
         );
 
         vtkmesh->GetCellData()->AddArray(cdata);
-        cdata->Delete();
 
         // TODO: points
     }
@@ -369,7 +374,7 @@ void Foam::vtkPVFoam::convertVolFieldBlock
     autoPtr<GeometricField<Type, pointPatchField, pointMesh>>& ptfPtr,
     vtkMultiBlockDataSet* output,
     const arrayRange& range,
-    const List<polyDecomp>& decompLst
+    const List<foamVtuData>& vtuDataList
 )
 {
     for (auto partId : range)
@@ -389,18 +394,16 @@ void Foam::vtkPVFoam::convertVolFieldBlock
             continue;
         }
 
-        vtkFloatArray* cdata = convertVolFieldToVTK
+        vtkSmartPointer<vtkFloatArray> cdata = convertVolFieldToVTK
         (
             fld,
-            decompLst[datasetNo]
+            vtuDataList[datasetNo]
         );
-
         vtkmesh->GetCellData()->AddArray(cdata);
-        cdata->Delete();
 
         if (ptfPtr.valid())
         {
-            convertPointField(vtkmesh, ptfPtr(), fld, decompLst[datasetNo]);
+            convertPointField(vtkmesh, ptfPtr(), fld, vtuDataList[datasetNo]);
         }
     }
 }
@@ -449,7 +452,7 @@ void Foam::vtkPVFoam::convertPointFields
             pfld,
             output,
             rangeVolume_,
-            regionPolyDecomp_
+            regionVtus_
         );
 
         // Convert activated cellZones
@@ -458,7 +461,7 @@ void Foam::vtkPVFoam::convertPointFields
             pfld,
             output,
             rangeCellZones_,
-            zonePolyDecomp_
+            zoneVtus_
         );
 
         // Convert activated cellSets
@@ -467,7 +470,7 @@ void Foam::vtkPVFoam::convertPointFields
             pfld,
             output,
             rangeCellSets_,
-            csetPolyDecomp_
+            csetVtus_
         );
 
 
@@ -492,14 +495,13 @@ void Foam::vtkPVFoam::convertPointFields
 
             if (vtkmesh)
             {
-                vtkFloatArray* pdata = convertFieldToVTK
+                vtkSmartPointer<vtkFloatArray> pdata = convertFieldToVTK
                 (
                     fieldName,
                     pfld.boundaryField()[patchId].patchInternalField()()
                 );
 
                 vtkmesh->GetPointData()->AddArray(pdata);
-                pdata->Delete();
             }
         }
 
@@ -531,10 +533,14 @@ void Foam::vtkPVFoam::convertPointFields
                     mesh.faceZones()[zoneId]().meshPoints()
                 );
 
-                vtkFloatArray* pdata = convertFieldToVTK(fieldName, znfld);
+                vtkSmartPointer<vtkFloatArray> pdata =
+                    convertFieldToVTK
+                    (
+                        fieldName,
+                        znfld
+                    );
 
                 vtkmesh->GetPointData()->AddArray(pdata);
-                pdata->Delete();
             }
         }
     }
@@ -547,7 +553,7 @@ void Foam::vtkPVFoam::convertPointFieldBlock
     const GeometricField<Type, pointPatchField, pointMesh>& pfld,
     vtkMultiBlockDataSet* output,
     const arrayRange& range,
-    const List<polyDecomp>& decompLst
+    const List<foamVtuData>& vtuDataList
 )
 {
     for (auto partId : range)
@@ -571,7 +577,7 @@ void Foam::vtkPVFoam::convertPointFieldBlock
                 vtkmesh,
                 pfld,
                 GeometricField<Type, fvPatchField, volMesh>::null(),
-                decompLst[datasetNo]
+                vtuDataList[datasetNo]
             );
         }
     }
@@ -584,7 +590,7 @@ void Foam::vtkPVFoam::convertPointField
     vtkUnstructuredGrid* vtkmesh,
     const GeometricField<Type, pointPatchField, pointMesh>& pfld,
     const GeometricField<Type, fvPatchField, volMesh>& vfld,
-    const polyDecomp& decomp
+    const foamVtuData& vtuData
 )
 {
     if (!vtkmesh)
@@ -593,13 +599,15 @@ void Foam::vtkPVFoam::convertPointField
     }
 
     const label nComp = pTraits<Type>::nComponents;
-    const labelUList& addPointCellLabels = decomp.addPointCellLabels();
-    const labelUList& pointMap = decomp.pointMap();
+    const labelUList& addPointCellLabels = vtuData.additionalIds();
+    const labelUList& pointMap = vtuData.pointMap();
 
     // use a pointMap or address directly into mesh
     const label nPoints = (pointMap.size() ? pointMap.size() : pfld.size());
 
-    vtkFloatArray* fldData = vtkFloatArray::New();
+    vtkSmartPointer<vtkFloatArray> fldData =
+        vtkSmartPointer<vtkFloatArray>::New();
+
     fldData->SetNumberOfTuples(nPoints + addPointCellLabels.size());
     fldData->SetNumberOfComponents(nComp);
     fldData->Allocate(nComp*(nPoints + addPointCellLabels.size()));
@@ -689,7 +697,6 @@ void Foam::vtkPVFoam::convertPointField
     }
 
     vtkmesh->GetPointData()->AddArray(fldData);
-    fldData->Delete();
 }
 
 
@@ -720,9 +727,13 @@ void Foam::vtkPVFoam::convertLagrangianFields
             {
                 IOField<Type> fld(*iter());
 
-                vtkFloatArray* fldData = convertFieldToVTK(fld.name(), fld);
+                vtkSmartPointer<vtkFloatArray> fldData =
+                    convertFieldToVTK
+                    (
+                        fld.name(),
+                        fld
+                    );
                 vtkmesh->GetPointData()->AddArray(fldData);
-                fldData->Delete();
             }
         }
     }
@@ -735,7 +746,8 @@ void Foam::vtkPVFoam::convertLagrangianFields
 //
 
 template<class Type>
-vtkFloatArray* Foam::vtkPVFoam::convertFieldToVTK
+vtkSmartPointer<vtkFloatArray>
+Foam::vtkPVFoam::convertFieldToVTK
 (
     const word& name,
     const Field<Type>& fld
@@ -751,7 +763,9 @@ vtkFloatArray* Foam::vtkPVFoam::convertFieldToVTK
 
     const label nComp = pTraits<Type>::nComponents;
 
-    vtkFloatArray* fldData = vtkFloatArray::New();
+    vtkSmartPointer<vtkFloatArray> fldData =
+        vtkSmartPointer<vtkFloatArray>::New();
+
     fldData->SetNumberOfTuples(fld.size());
     fldData->SetNumberOfComponents(nComp);
     fldData->Allocate(nComp*fld.size());
@@ -775,7 +789,8 @@ vtkFloatArray* Foam::vtkPVFoam::convertFieldToVTK
 
 
 template<class Type>
-vtkFloatArray* Foam::vtkPVFoam::convertFaceFieldToVTK
+vtkSmartPointer<vtkFloatArray>
+Foam::vtkPVFoam::convertFaceFieldToVTK
 (
     const GeometricField<Type, fvPatchField, volMesh>& fld,
     const labelUList& faceLabels
@@ -796,7 +811,9 @@ vtkFloatArray* Foam::vtkPVFoam::convertFaceFieldToVTK
     const labelList& faceOwner = mesh.faceOwner();
     const labelList& faceNeigh = mesh.faceNeighbour();
 
-    vtkFloatArray* fldData = vtkFloatArray::New();
+    vtkSmartPointer<vtkFloatArray> fldData =
+        vtkSmartPointer<vtkFloatArray>::New();
+
     fldData->SetNumberOfTuples(faceLabels.size());
     fldData->SetNumberOfComponents(nComp);
     fldData->Allocate(nComp*faceLabels.size());
@@ -836,35 +853,38 @@ vtkFloatArray* Foam::vtkPVFoam::convertFaceFieldToVTK
 
 
 template<class Type>
-vtkFloatArray* Foam::vtkPVFoam::convertVolFieldToVTK
+vtkSmartPointer<vtkFloatArray>
+Foam::vtkPVFoam::convertVolFieldToVTK
 (
     const GeometricField<Type, fvPatchField, volMesh>& fld,
-    const polyDecomp& decompInfo
+    const foamVtuData& vtuData
 )
 {
     const label nComp = pTraits<Type>::nComponents;
-    const labelList& superCells = decompInfo.superCells();
+    const labelList& cellMap = vtuData.cellMap();
 
-    vtkFloatArray* fldData = vtkFloatArray::New();
-    fldData->SetNumberOfTuples(superCells.size());
+    vtkSmartPointer<vtkFloatArray> fldData =
+        vtkSmartPointer<vtkFloatArray>::New();
+
+    fldData->SetNumberOfTuples(cellMap.size());
     fldData->SetNumberOfComponents(nComp);
-    fldData->Allocate(nComp*superCells.size());
+    fldData->Allocate(nComp*cellMap.size());
     fldData->SetName(fld.name().c_str());
 
     if (debug)
     {
         Info<< "convert volField: "
             << fld.name()
-            << " size=" << superCells.size()
+            << " size=" << cellMap.size()
             << " (" << fld.size() << " + "
-            << (superCells.size() - fld.size())
+            << (cellMap.size() - fld.size())
             << ") nComp=" << nComp << endl;
     }
 
     float vec[nComp];
-    forAll(superCells, i)
+    forAll(cellMap, i)
     {
-        const Type& t = fld[superCells[i]];
+        const Type& t = fld[cellMap[i]];
         for (direction d=0; d<nComp; ++d)
         {
             vec[d] = component(t, d);
diff --git a/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamMesh.C b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamMesh.C
index ba32d9f162..5a7f86afe6 100644
--- a/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamMesh.C
+++ b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamMesh.C
@@ -38,6 +38,7 @@ License
 #include "vtkMultiBlockDataSet.h"
 #include "vtkPolyData.h"
 #include "vtkUnstructuredGrid.h"
+#include "vtkSmartPointer.h"
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
@@ -53,7 +54,7 @@ void Foam::vtkPVFoam::convertMeshVolume
     const fvMesh& mesh = *meshPtr_;
 
     // resize for decomposed polyhedra
-    regionPolyDecomp_.setSize(range.size());
+    regionVtus_.setSize(range.size());
 
     if (debug)
     {
@@ -72,17 +73,15 @@ void Foam::vtkPVFoam::convertMeshVolume
             continue;
         }
 
-        vtkUnstructuredGrid* vtkmesh = volumeVTKMesh
+        vtkSmartPointer<vtkUnstructuredGrid> vtkmesh = volumeVTKMesh
         (
             mesh,
-            regionPolyDecomp_[datasetNo]
+            regionVtus_[datasetNo]
         );
 
         if (vtkmesh)
         {
             addToBlock(output, vtkmesh, range, datasetNo, partName);
-            vtkmesh->Delete();
-
             partDataset_[partId] = datasetNo++;
         }
     }
@@ -127,13 +126,12 @@ void Foam::vtkPVFoam::convertMeshLagrangian
             continue;
         }
 
-        vtkPolyData* vtkmesh = lagrangianVTKMesh(mesh, cloudName);
+        vtkSmartPointer<vtkPolyData> vtkmesh =
+            lagrangianVTKMesh(mesh, cloudName);
 
         if (vtkmesh)
         {
             addToBlock(output, vtkmesh, range, datasetNo, cloudName);
-            vtkmesh->Delete();
-
             partDataset_[partId] = datasetNo++;
         }
     }
@@ -188,7 +186,7 @@ void Foam::vtkPVFoam::convertMeshPatches
                 << patchName << endl;
         }
 
-        vtkPolyData* vtkmesh = nullptr;
+        vtkSmartPointer<vtkPolyData> vtkmesh;
         if (patchIds.size() == 1)
         {
             vtkmesh = patchVTKMesh(patchName, patches[patchIds.begin().key()]);
@@ -228,8 +226,6 @@ void Foam::vtkPVFoam::convertMeshPatches
         if (vtkmesh)
         {
             addToBlock(output, vtkmesh, range, datasetNo, patchName);
-            vtkmesh->Delete();
-
             partDataset_[partId] = datasetNo++;
         }
     }
@@ -260,7 +256,7 @@ void Foam::vtkPVFoam::convertMeshCellZones
     const fvMesh& mesh = *meshPtr_;
 
     // resize for decomposed polyhedra
-    zonePolyDecomp_.setSize(range.size());
+    zoneVtus_.setSize(range.size());
 
     if (range.empty())
     {
@@ -293,32 +289,30 @@ void Foam::vtkPVFoam::convertMeshCellZones
         fvMeshSubset subsetter(mesh);
         subsetter.setLargeCellSubset(zMesh[zoneId]);
 
-        vtkUnstructuredGrid* vtkmesh = volumeVTKMesh
+        vtkSmartPointer<vtkUnstructuredGrid> vtkmesh = volumeVTKMesh
         (
             subsetter.subMesh(),
-            zonePolyDecomp_[datasetNo]
+            zoneVtus_[datasetNo]
         );
 
         if (vtkmesh)
         {
-            // superCells + addPointCellLabels must contain global cell ids
+            // cellMap + addPointCellLabels must contain global cell ids
             inplaceRenumber
             (
                 subsetter.cellMap(),
-                zonePolyDecomp_[datasetNo].superCells()
+                zoneVtus_[datasetNo].cellMap()
             );
             inplaceRenumber
             (
                 subsetter.cellMap(),
-                zonePolyDecomp_[datasetNo].addPointCellLabels()
+                zoneVtus_[datasetNo].additionalIds()
             );
 
             // copy pointMap as well, otherwise pointFields fail
-            zonePolyDecomp_[datasetNo].pointMap() = subsetter.pointMap();
+            zoneVtus_[datasetNo].pointMap() = subsetter.pointMap();
 
             addToBlock(output, vtkmesh, range, datasetNo, zoneName);
-            vtkmesh->Delete();
-
             partDataset_[partId] = datasetNo++;
         }
     }
@@ -349,7 +343,7 @@ void Foam::vtkPVFoam::convertMeshCellSets
     const fvMesh& mesh = *meshPtr_;
 
     // resize for decomposed polyhedra
-    csetPolyDecomp_.setSize(range.size());
+    csetVtus_.setSize(range.size());
 
     if (debug)
     {
@@ -375,32 +369,30 @@ void Foam::vtkPVFoam::convertMeshCellSets
         fvMeshSubset subsetter(mesh);
         subsetter.setLargeCellSubset(cSet);
 
-        vtkUnstructuredGrid* vtkmesh = volumeVTKMesh
+        vtkSmartPointer<vtkUnstructuredGrid> vtkmesh = volumeVTKMesh
         (
             subsetter.subMesh(),
-            csetPolyDecomp_[datasetNo]
+            csetVtus_[datasetNo]
         );
 
         if (vtkmesh)
         {
-            // superCells + addPointCellLabels must contain global cell ids
+            // cellMap + addPointCellLabels must contain global cell ids
             inplaceRenumber
             (
                 subsetter.cellMap(),
-                csetPolyDecomp_[datasetNo].superCells()
+                csetVtus_[datasetNo].cellMap()
             );
             inplaceRenumber
             (
                 subsetter.cellMap(),
-                csetPolyDecomp_[datasetNo].addPointCellLabels()
+                csetVtus_[datasetNo].additionalIds()
             );
 
             // copy pointMap as well, otherwise pointFields fail
-            csetPolyDecomp_[datasetNo].pointMap() = subsetter.pointMap();
+            csetVtus_[datasetNo].pointMap() = subsetter.pointMap();
 
             addToBlock(output, vtkmesh, range, datasetNo, partName);
-            vtkmesh->Delete();
-
             partDataset_[partId] = datasetNo++;
         }
     }
@@ -458,13 +450,12 @@ void Foam::vtkPVFoam::convertMeshFaceZones
                 << zoneName << endl;
         }
 
-        vtkPolyData* vtkmesh = patchVTKMesh(zoneName, zMesh[zoneId]());
+        vtkSmartPointer<vtkPolyData> vtkmesh =
+            patchVTKMesh(zoneName, zMesh[zoneId]());
 
         if (vtkmesh)
         {
             addToBlock(output, vtkmesh, range, datasetNo, zoneName);
-            vtkmesh->Delete();
-
             partDataset_[partId] = datasetNo++;
         }
     }
@@ -530,12 +521,12 @@ void Foam::vtkPVFoam::convertMeshFaceSets
             continue;
         }
 
-        vtkPolyData* vtkmesh = patchVTKMesh("faceSet:" + partName, p);
+        vtkSmartPointer<vtkPolyData> vtkmesh =
+            patchVTKMesh("faceSet:" + partName, p);
+
         if (vtkmesh)
         {
             addToBlock(output, vtkmesh, range, datasetNo, partName);
-            vtkmesh->Delete();
-
             partDataset_[partId] = datasetNo++;
         }
     }
@@ -586,7 +577,9 @@ void Foam::vtkPVFoam::convertMeshPointZones
 
             const labelUList& pointLabels = zMesh[zoneId];
 
-            vtkPoints* vtkpoints = vtkPoints::New();
+            vtkSmartPointer<vtkPoints> vtkpoints =
+                vtkSmartPointer<vtkPoints>::New();
+
             vtkpoints->Allocate(pointLabels.size());
 
             const pointField& meshPoints = mesh.points();
@@ -595,15 +588,14 @@ void Foam::vtkPVFoam::convertMeshPointZones
                 vtkpoints->InsertNextPoint(meshPoints[pointLabels[pointi]].v_);
             }
 
-            vtkPolyData* vtkmesh = vtkPolyData::New();
+            vtkSmartPointer<vtkPolyData> vtkmesh =
+                vtkSmartPointer<vtkPolyData>::New();
+
             vtkmesh->SetPoints(vtkpoints);
-            vtkpoints->Delete();
 
             if (vtkmesh)
             {
                 addToBlock(output, vtkmesh, range, datasetNo, zoneName);
-                vtkmesh->Delete();
-
                 partDataset_[partId] = datasetNo++;
             }
         }
@@ -657,7 +649,9 @@ void Foam::vtkPVFoam::convertMeshPointSets
 
         const pointSet pSet(mesh, partName);
 
-        vtkPoints* vtkpoints = vtkPoints::New();
+        vtkSmartPointer<vtkPoints> vtkpoints =
+            vtkSmartPointer<vtkPoints>::New();
+
         vtkpoints->Allocate(pSet.size());
 
         const pointField& meshPoints = mesh.points();
@@ -666,15 +660,14 @@ void Foam::vtkPVFoam::convertMeshPointSets
             vtkpoints->InsertNextPoint(meshPoints[iter.key()].v_);
         }
 
-        vtkPolyData* vtkmesh = vtkPolyData::New();
+        vtkSmartPointer<vtkPolyData> vtkmesh =
+            vtkSmartPointer<vtkPolyData>::New();
+
         vtkmesh->SetPoints(vtkpoints);
-        vtkpoints->Delete();
 
         if (vtkmesh)
         {
             addToBlock(output, vtkmesh, range, datasetNo, partName);
-            vtkmesh->Delete();
-
             partDataset_[partId] = datasetNo++;
         }
     }
diff --git a/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamMeshLagrangian.C b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamMeshLagrangian.C
index ecf7d7ab05..b15f8daca9 100644
--- a/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamMeshLagrangian.C
+++ b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamMeshLagrangian.C
@@ -35,16 +35,17 @@ License
 #include "vtkCellArray.h"
 #include "vtkPoints.h"
 #include "vtkPolyData.h"
+#include "vtkSmartPointer.h"
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-vtkPolyData* Foam::vtkPVFoam::lagrangianVTKMesh
+vtkSmartPointer<vtkPolyData> Foam::vtkPVFoam::lagrangianVTKMesh
 (
     const polyMesh& mesh,
     const word& cloudName
 )
 {
-    vtkPolyData* vtkmesh = nullptr;
+    vtkSmartPointer<vtkPolyData> vtkmesh;
 
     if (debug)
     {
@@ -72,9 +73,13 @@ vtkPolyData* Foam::vtkPVFoam::lagrangianVTKMesh
             Info<< "cloud with " << parcels.size() << " parcels" << endl;
         }
 
-        vtkmesh = vtkPolyData::New();
-        vtkPoints* vtkpoints = vtkPoints::New();
-        vtkCellArray* vtkcells = vtkCellArray::New();
+        vtkmesh = vtkSmartPointer<vtkPolyData>::New();
+
+        vtkSmartPointer<vtkPoints> vtkpoints =
+            vtkSmartPointer<vtkPoints>::New();
+
+        vtkSmartPointer<vtkCellArray> vtkcells =
+            vtkSmartPointer<vtkCellArray>::New();
 
         vtkpoints->Allocate(parcels.size());
         vtkcells->Allocate(parcels.size());
@@ -89,10 +94,7 @@ vtkPolyData* Foam::vtkPVFoam::lagrangianVTKMesh
         }
 
         vtkmesh->SetPoints(vtkpoints);
-        vtkpoints->Delete();
-
         vtkmesh->SetVerts(vtkcells);
-        vtkcells->Delete();
     }
 
     if (debug)
diff --git a/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamMeshVolume.C b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamMeshVolume.C
index 6321e3cdfa..487687f689 100644
--- a/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamMeshVolume.C
+++ b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamMeshVolume.C
@@ -34,13 +34,14 @@ License
 #include "vtkCellArray.h"
 #include "vtkIdTypeArray.h"
 #include "vtkUnstructuredGrid.h"
+#include "vtkSmartPointer.h"
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-vtkUnstructuredGrid* Foam::vtkPVFoam::volumeVTKMesh
+vtkSmartPointer<vtkUnstructuredGrid> Foam::vtkPVFoam::volumeVTKMesh
 (
     const fvMesh& mesh,
-    polyDecomp& decompInfo
+    foamVtuData& vtuData
 )
 {
     const cellModel& tet = *(cellModeller::lookup("tet"));
@@ -50,7 +51,8 @@ vtkUnstructuredGrid* Foam::vtkPVFoam::volumeVTKMesh
     const cellModel& tetWedge = *(cellModeller::lookup("tetWedge"));
     const cellModel& hex = *(cellModeller::lookup("hex"));
 
-    vtkUnstructuredGrid* vtkmesh = vtkUnstructuredGrid::New();
+    vtkSmartPointer<vtkUnstructuredGrid> vtkmesh =
+        vtkSmartPointer<vtkUnstructuredGrid>::New();
 
     if (debug)
     {
@@ -69,8 +71,8 @@ vtkUnstructuredGrid* Foam::vtkPVFoam::volumeVTKMesh
     // face owner is needed to determine the face orientation
     const labelList& owner = mesh.faceOwner();
 
-    labelList& superCells = decompInfo.superCells();
-    labelList& addPointCellLabels = decompInfo.addPointCellLabels();
+    labelList& cellMap = vtuData.cellMap();
+    labelList& addPointCellLabels = vtuData.additionalIds();
 
     // Scan for cells which need to be decomposed and count additional points
     // and cells
@@ -116,10 +118,11 @@ vtkUnstructuredGrid* Foam::vtkPVFoam::volumeVTKMesh
     // Set size of additional cells mapping array
     // (from added cell to original cell)
 
-    superCells.setSize(mesh.nCells() + nAddCells);
+    cellMap.setSize(mesh.nCells() + nAddCells);
 
     // Convert OpenFOAM mesh vertices to VTK
-    vtkPoints* vtkpoints = vtkPoints::New();
+    vtkSmartPointer<vtkPoints> vtkpoints = vtkSmartPointer<vtkPoints>::New();
+
     vtkpoints->Allocate(mesh.nPoints() + nAddPoints);
 
     const Foam::pointField& points = mesh.points();
@@ -147,7 +150,7 @@ vtkUnstructuredGrid* Foam::vtkPVFoam::volumeVTKMesh
         const cellShape& cellShape = cellShapes[celli];
         const cellModel& cellModel = cellShape.model();
 
-        superCells[addCelli++] = celli;
+        cellMap[addCelli++] = celli;
 
         if (cellModel == tet)
         {
@@ -334,7 +337,7 @@ vtkUnstructuredGrid* Foam::vtkPVFoam::volumeVTKMesh
                     }
                     else
                     {
-                        superCells[addCelli++] = celli;
+                        cellMap[addCelli++] = celli;
                     }
 
                     const face& quad = quadFcs[quadI];
@@ -377,7 +380,7 @@ vtkUnstructuredGrid* Foam::vtkPVFoam::volumeVTKMesh
                     }
                     else
                     {
-                        superCells[addCelli++] = celli;
+                        cellMap[addCelli++] = celli;
                     }
 
                     const face& tri = triFcs[triI];
@@ -411,7 +414,6 @@ vtkUnstructuredGrid* Foam::vtkPVFoam::volumeVTKMesh
     }
 
     vtkmesh->SetPoints(vtkpoints);
-    vtkpoints->Delete();
 
     if (debug)
     {
diff --git a/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamTemplates.C b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamTemplates.C
index 388f1bb794..e09b2c7765 100644
--- a/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamTemplates.C
+++ b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamTemplates.C
@@ -33,17 +33,19 @@ License
 #include "vtkCellArray.h"
 #include "vtkPoints.h"
 #include "vtkPolyData.h"
+#include "vtkSmartPointer.h"
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class PatchType>
-vtkPolyData* Foam::vtkPVFoam::patchVTKMesh
+vtkSmartPointer<vtkPolyData> Foam::vtkPVFoam::patchVTKMesh
 (
     const word& name,
     const PatchType& p
 )
 {
-    vtkPolyData* vtkmesh = vtkPolyData::New();
+    vtkSmartPointer<vtkPolyData> vtkmesh =
+        vtkSmartPointer<vtkPolyData>::New();
 
     if (debug)
     {
@@ -54,20 +56,22 @@ vtkPolyData* Foam::vtkPVFoam::patchVTKMesh
     // Convert OpenFOAM mesh vertices to VTK
     const Foam::pointField& points = p.localPoints();
 
-    vtkPoints* vtkpoints = vtkPoints::New();
+    vtkSmartPointer<vtkPoints> vtkpoints =
+        vtkSmartPointer<vtkPoints>::New();
+
     vtkpoints->Allocate(points.size());
     forAll(points, i)
     {
         vtkpoints->InsertNextPoint(points[i].v_);
     }
-
     vtkmesh->SetPoints(vtkpoints);
-    vtkpoints->Delete();
 
     // Add faces as polygons
     const faceList& faces = p.localFaces();
 
-    vtkCellArray* vtkcells = vtkCellArray::New();
+    vtkSmartPointer<vtkCellArray> vtkcells =
+        vtkSmartPointer<vtkCellArray>::New();
+
     vtkcells->Allocate(faces.size());
     forAll(faces, facei)
     {
@@ -82,7 +86,6 @@ vtkPolyData* Foam::vtkPVFoam::patchVTKMesh
     }
 
     vtkmesh->SetPolys(vtkcells);
-    vtkcells->Delete();
 
     if (debug)
     {
diff --git a/applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/vtkPVblockMesh/vtkPVblockMesh.C b/applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/vtkPVblockMesh/vtkPVblockMesh.C
index 2d71d3a1d6..0a994a78bd 100644
--- a/applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/vtkPVblockMesh/vtkPVblockMesh.C
+++ b/applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/vtkPVblockMesh/vtkPVblockMesh.C
@@ -39,6 +39,7 @@ License
 #include "vtkRenderer.h"
 #include "vtkTextActor.h"
 #include "vtkTextProperty.h"
+#include "vtkSmartPointer.h"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
@@ -47,32 +48,38 @@ namespace Foam
     defineTypeNameAndDebug(vtkPVblockMesh, 0);
 }
 
-
 // * * * * * * * * * * * * * Static Member Functions * * * * * * * * * * * * //
 
-vtkTextActor* Foam::vtkPVblockMesh::createTextActor
-(
-    const std::string& s,
-    const point& pt
-)
+namespace Foam
 {
-    vtkTextActor* txt = vtkTextActor::New();
-    txt->SetInput(s.c_str());
+    // file-scope
+    //- Create a text actor
+    static vtkSmartPointer<vtkTextActor> createTextActor
+    (
+        const std::string& s,
+        const Foam::point& pt
+    )
+    {
+        vtkSmartPointer<vtkTextActor> txt =
+            vtkSmartPointer<vtkTextActor>::New();
 
-    // Set text properties
-    vtkTextProperty* tprop = txt->GetTextProperty();
-    tprop->SetFontFamilyToArial();
-    tprop->BoldOn();
-    tprop->ShadowOff();
-    tprop->SetLineSpacing(1.0);
-    tprop->SetFontSize(14);
-    tprop->SetColor(1.0, 0.0, 1.0);
-    tprop->SetJustificationToCentered();
+        txt->SetInput(s.c_str());
 
-    txt->GetPositionCoordinate()->SetCoordinateSystemToWorld();
-    txt->GetPositionCoordinate()->SetValue(pt.x(), pt.y(), pt.z());
+        // Set text properties
+        vtkTextProperty* tprop = txt->GetTextProperty();
+        tprop->SetFontFamilyToArial();
+        tprop->BoldOn();
+        tprop->ShadowOff();
+        tprop->SetLineSpacing(1.0);
+        tprop->SetFontSize(14);
+        tprop->SetColor(1.0, 0.0, 1.0);
+        tprop->SetJustificationToCentered();
 
-    return txt;
+        txt->GetPositionCoordinate()->SetCoordinateSystemToWorld();
+        txt->GetPositionCoordinate()->SetValue(pt.x(), pt.y(), pt.z());
+
+        return txt;
+    }
 }
 
 
@@ -436,12 +443,11 @@ void Foam::vtkPVblockMesh::renderPatchNames
 )
 {
     // always remove old actors first
-    forAll(patchTextActorsPtrs_, actori)
+    forAll(patchTextActors_, actori)
     {
-        renderer->RemoveViewProp(patchTextActorsPtrs_[actori]);
-        patchTextActorsPtrs_[actori]->Delete();
+        renderer->RemoveViewProp(patchTextActors_[actori]);
     }
-    patchTextActorsPtrs_.clear();
+    patchTextActors_.clear();
 
     // the number of text actors
     label nActors = 0;
@@ -459,7 +465,7 @@ void Foam::vtkPVblockMesh::renderPatchNames
         }
 
         // 8 sides per block is plenty
-        patchTextActorsPtrs_.setSize(8*blkMesh.size());
+        patchTextActors_.setSize(8*blkMesh.size());
 
         // Collect all variables
         dictionary varDict(meshDescription.subOrEmptyDict("namedVertices"));
@@ -495,33 +501,33 @@ void Foam::vtkPVblockMesh::renderPatchNames
                 const face& f = patchFaces[facei];
 
                 // Into a list for later removal
-                patchTextActorsPtrs_[nActors++] = createTextActor
+                patchTextActors_[nActors++] = createTextActor
                 (
                     patchName,
                     f.centre(cornerPts) * scaleFactor
                 );
 
-                if (nActors == patchTextActorsPtrs_.size())
+                if (nActors == patchTextActors_.size())
                 {
                     // hit max allocated space - bail out
                     break;
                 }
             }
 
-            if (nActors == patchTextActorsPtrs_.size())
+            if (nActors == patchTextActors_.size())
             {
                 // hit max allocated space - bail out
                 break;
             }
         }
 
-        patchTextActorsPtrs_.setSize(nActors);
+        patchTextActors_.setSize(nActors);
     }
 
     // Add text to each renderer
-    forAll(patchTextActorsPtrs_, actori)
+    forAll(patchTextActors_, actori)
     {
-        renderer->AddViewProp(patchTextActorsPtrs_[actori]);
+        renderer->AddViewProp(patchTextActors_[actori]);
     }
 }
 
@@ -534,12 +540,11 @@ void Foam::vtkPVblockMesh::renderPointNumbers
 {
     // always remove old actors first
 
-    forAll(pointTextActorsPtrs_, actori)
+    forAll(pointTextActors_, actori)
     {
-        renderer->RemoveViewProp(pointTextActorsPtrs_[actori]);
-        pointTextActorsPtrs_[actori]->Delete();
+        renderer->RemoveViewProp(pointTextActors_[actori]);
     }
-    pointTextActorsPtrs_.clear();
+    pointTextActors_.clear();
 
     if (show && meshPtr_)
     {
@@ -547,7 +552,7 @@ void Foam::vtkPVblockMesh::renderPointNumbers
         const pointField& cornerPts = blkMesh.vertices();
         const scalar scaleFactor = blkMesh.scaleFactor();
 
-        pointTextActorsPtrs_.setSize(cornerPts.size());
+        pointTextActors_.setSize(cornerPts.size());
         forAll(cornerPts, pointi)
         {
             // Display either pointi as a number or with its name
@@ -556,7 +561,7 @@ void Foam::vtkPVblockMesh::renderPointNumbers
             blockVertex::write(os, pointi, blkMesh.meshDict());
 
             // Into a list for later removal
-            pointTextActorsPtrs_[pointi] = createTextActor
+            pointTextActors_[pointi] = createTextActor
             (
                 os.str(),
                 cornerPts[pointi]*scaleFactor
@@ -565,9 +570,9 @@ void Foam::vtkPVblockMesh::renderPointNumbers
     }
 
     // Add text to each renderer
-    forAll(pointTextActorsPtrs_, actori)
+    forAll(pointTextActors_, actori)
     {
-        renderer->AddViewProp(pointTextActorsPtrs_[actori]);
+        renderer->AddViewProp(pointTextActors_[actori]);
     }
 }
 
diff --git a/applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/vtkPVblockMesh/vtkPVblockMesh.H b/applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/vtkPVblockMesh/vtkPVblockMesh.H
index d30a97eeed..b86ad72b6c 100644
--- a/applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/vtkPVblockMesh/vtkPVblockMesh.H
+++ b/applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/vtkPVblockMesh/vtkPVblockMesh.H
@@ -56,6 +56,8 @@ class vtkPolyData;
 class vtkUnstructuredGrid;
 class vtkIndent;
 
+template<class T> class vtkSmartPointer;
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
@@ -110,21 +112,14 @@ class vtkPVblockMesh
         arrayRange rangeCorners_;
 
         //- List of patch names for rendering to window
-        List<vtkTextActor*> patchTextActorsPtrs_;
+        List<vtkSmartPointer<vtkTextActor>> patchTextActors_;
 
         //- List of point numbers for rendering to window
-        List<vtkTextActor*> pointTextActorsPtrs_;
+        List<vtkSmartPointer<vtkTextActor>> pointTextActors_;
 
 
     // Private Member Functions
 
-        //- Create a text actor
-        static vtkTextActor* createTextActor
-        (
-            const std::string& s,
-            const point& pt
-        );
-
         //- Reset data counters
         void resetCounters();
 
diff --git a/applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/vtkPVblockMesh/vtkPVblockMeshConvert.C b/applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/vtkPVblockMesh/vtkPVblockMeshConvert.C
index 1a2c18df6b..8d39fe9b5f 100644
--- a/applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/vtkPVblockMesh/vtkPVblockMeshConvert.C
+++ b/applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/vtkPVblockMesh/vtkPVblockMeshConvert.C
@@ -37,6 +37,7 @@ License
 #include "vtkPoints.h"
 #include "vtkPolyData.h"
 #include "vtkUnstructuredGrid.h"
+#include "vtkSmartPointer.h"
 
 
 // * * * * * * * * * * * * * Static Member Functions * * * * * * * * * * * * //
@@ -99,7 +100,9 @@ void Foam::vtkPVblockMesh::convertMeshBlocks
         const blockDescriptor& blockDef = blkMesh[blockI];
 
         // Convert OpenFOAM mesh vertices to VTK
-        vtkPoints *vtkpoints = vtkPoints::New();
+        vtkSmartPointer<vtkPoints> vtkpoints =
+            vtkSmartPointer<vtkPoints>::New();
+
         vtkpoints->Allocate(blockDef.nPoints());
         const labelList& blockLabels = blockDef.blockShape();
 
@@ -117,7 +120,9 @@ void Foam::vtkPVblockMesh::convertMeshBlocks
             nodeIds[ptI] = ptI;
         }
 
-        vtkUnstructuredGrid* vtkmesh = vtkUnstructuredGrid::New();
+        vtkSmartPointer<vtkUnstructuredGrid> vtkmesh =
+            vtkSmartPointer<vtkUnstructuredGrid>::New();
+
         vtkmesh->Allocate(1);
         vtkmesh->InsertNextCell
         (
@@ -127,7 +132,6 @@ void Foam::vtkPVblockMesh::convertMeshBlocks
         );
 
         vtkmesh->SetPoints(vtkpoints);
-        vtkpoints->Delete();
 
         addToBlock
         (
@@ -135,7 +139,6 @@ void Foam::vtkPVblockMesh::convertMeshBlocks
             selection->GetArrayName(partId)
         );
 
-        vtkmesh->Delete();
         ++datasetNo;
     }
 
@@ -211,8 +214,11 @@ void Foam::vtkPVblockMesh::convertMeshEdges
             {
                 const List<point>& edgePoints = edgesPoints[foundEdgeI];
 
-                vtkPolyData* vtkmesh = vtkPolyData::New();
-                vtkPoints* vtkpoints = vtkPoints::New();
+                vtkSmartPointer<vtkPolyData> vtkmesh =
+                    vtkSmartPointer<vtkPolyData>::New();
+
+                vtkSmartPointer<vtkPoints> vtkpoints =
+                    vtkSmartPointer<vtkPoints>::New();
 
                 vtkpoints->Allocate( edgePoints.size() );
                 vtkmesh->Allocate(1);
@@ -237,7 +243,6 @@ void Foam::vtkPVblockMesh::convertMeshEdges
                 );
 
                 vtkmesh->SetPoints(vtkpoints);
-                vtkpoints->Delete();
 
                 addToBlock
                 (
@@ -245,7 +250,6 @@ void Foam::vtkPVblockMesh::convertMeshEdges
                     selection->GetArrayName(partId)
                 );
 
-                vtkmesh->Delete();
                 datasetNo++;
 
                 break;
@@ -287,9 +291,14 @@ void Foam::vtkPVblockMesh::convertMeshCorners
 
     if (true)  // or some flag or other condition
     {
-        vtkPolyData* vtkmesh = vtkPolyData::New();
-        vtkPoints* vtkpoints = vtkPoints::New();
-        vtkCellArray* vtkcells = vtkCellArray::New();
+        vtkSmartPointer<vtkPolyData> vtkmesh =
+            vtkSmartPointer<vtkPolyData>::New();
+
+        vtkSmartPointer<vtkPoints> vtkpoints =
+            vtkSmartPointer<vtkPoints>::New();
+
+        vtkSmartPointer<vtkCellArray> vtkcells =
+            vtkSmartPointer<vtkCellArray>::New();
 
         vtkpoints->Allocate( blockPoints.size() );
         vtkcells->Allocate( blockPoints.size() );
@@ -309,15 +318,15 @@ void Foam::vtkPVblockMesh::convertMeshCorners
         }
 
         vtkmesh->SetPoints(vtkpoints);
-        vtkpoints->Delete();
-
         vtkmesh->SetVerts(vtkcells);
-        vtkcells->Delete();
 
         addToBlock(output, vtkmesh, range, datasetNo, range.name());
-        vtkmesh->Delete();
-
         ++datasetNo;
+    }
+
+    // anything added?
+    if (datasetNo)
+    {
         ++blockNo;
     }
 
diff --git a/applications/utilities/postProcessing/graphics/PVReaders/foamPv/foamPvCore.C b/applications/utilities/postProcessing/graphics/PVReaders/foamPv/foamPvCore.C
index b2c5c822e2..a9a4d1940d 100644
--- a/applications/utilities/postProcessing/graphics/PVReaders/foamPv/foamPvCore.C
+++ b/applications/utilities/postProcessing/graphics/PVReaders/foamPv/foamPvCore.C
@@ -32,6 +32,7 @@ License
 #include "vtkDataSet.h"
 #include "vtkMultiBlockDataSet.h"
 #include "vtkInformation.h"
+#include "vtkSmartPointer.h"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
@@ -54,7 +55,8 @@ void Foam::foamPvCore::addToBlock
     const int blockNo = selector.block();
 
     vtkDataObject* dataObj = output->GetBlock(blockNo);
-    vtkMultiBlockDataSet* block = vtkMultiBlockDataSet::SafeDownCast(dataObj);
+    vtkSmartPointer<vtkMultiBlockDataSet> block =
+        vtkMultiBlockDataSet::SafeDownCast(dataObj);
 
     if (!block)
     {
@@ -66,9 +68,8 @@ void Foam::foamPvCore::addToBlock
             return;
         }
 
-        block = vtkMultiBlockDataSet::New();
+        block = vtkSmartPointer<vtkMultiBlockDataSet>::New();
         output->SetBlock(blockNo, block);
-        block->Delete();
     }
 
     if (debug)

From 48bf71dd2661c6ba8c6b6002a1809a8d903c9945 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Sun, 14 May 2017 21:24:06 +0200
Subject: [PATCH 07/27] STYLE: avoid VTK InsertNextPoint if we already know the
 sizes

- avoids potentially issues if we reusing a vtkPoints array,
  and should be marginally faster without the additional
  range checking.
---
 .../PVFoamReader/vtkPVFoam/vtkPVFoam.H        |   2 +-
 .../vtkPVFoam/vtkPVFoamFieldTemplates.C       |  40 +++----
 .../PVFoamReader/vtkPVFoam/vtkPVFoamMesh.C    |  24 ++--
 .../vtkPVFoam/vtkPVFoamMeshLagrangian.C       |  11 +-
 .../vtkPVFoam/vtkPVFoamTemplates.C            |  17 ++-
 .../vtkPVblockMesh/vtkPVblockMeshConvert.C    | 103 ++++++------------
 6 files changed, 87 insertions(+), 110 deletions(-)

diff --git a/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoam.H b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoam.H
index 323be9b6c8..f6359ff5b4 100644
--- a/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoam.H
+++ b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoam.H
@@ -332,7 +332,7 @@ class vtkPVFoam
         template<class PatchType>
         vtkSmartPointer<vtkPolyData> patchVTKMesh
         (
-            const word& name,
+            const string& name,
             const PatchType& p
         );
 
diff --git a/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamFieldTemplates.C b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamFieldTemplates.C
index 70c7948872..db477759f6 100644
--- a/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamFieldTemplates.C
+++ b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamFieldTemplates.C
@@ -602,15 +602,14 @@ void Foam::vtkPVFoam::convertPointField
     const labelUList& addPointCellLabels = vtuData.additionalIds();
     const labelUList& pointMap = vtuData.pointMap();
 
-    // use a pointMap or address directly into mesh
+    // Use a pointMap or address directly into mesh
     const label nPoints = (pointMap.size() ? pointMap.size() : pfld.size());
 
     vtkSmartPointer<vtkFloatArray> fldData =
         vtkSmartPointer<vtkFloatArray>::New();
 
-    fldData->SetNumberOfTuples(nPoints + addPointCellLabels.size());
     fldData->SetNumberOfComponents(nComp);
-    fldData->Allocate(nComp*(nPoints + addPointCellLabels.size()));
+    fldData->SetNumberOfTuples(nPoints + addPointCellLabels.size());
 
     // Note: using the name of the original volField
     // not the name generated by the interpolation "volPointInterpolate(<name>)"
@@ -635,6 +634,7 @@ void Foam::vtkPVFoam::convertPointField
 
     float vec[nComp];
 
+    label pointi = 0;
     if (pointMap.size())
     {
         forAll(pointMap, i)
@@ -646,7 +646,7 @@ void Foam::vtkPVFoam::convertPointField
             }
             foamPvFields::remapTuple<Type>(vec);
 
-            fldData->InsertTuple(i, vec);
+            fldData->SetTuple(pointi++, vec);
         }
     }
     else
@@ -660,12 +660,11 @@ void Foam::vtkPVFoam::convertPointField
             }
             foamPvFields::remapTuple<Type>(vec);
 
-            fldData->InsertTuple(i, vec);
+            fldData->SetTuple(pointi++, vec);
         }
     }
 
-    // continue insertion from here
-    label i = nPoints;
+    // Continue additional points
 
     if (&vfld != &GeometricField<Type, fvPatchField, volMesh>::null())
     {
@@ -678,7 +677,7 @@ void Foam::vtkPVFoam::convertPointField
             }
             foamPvFields::remapTuple<Type>(vec);
 
-            fldData->InsertTuple(i++, vec);
+            fldData->SetTuple(pointi++, vec);
         }
     }
     else
@@ -692,7 +691,7 @@ void Foam::vtkPVFoam::convertPointField
             }
             foamPvFields::remapTuple<Type>(vec);
 
-            fldData->InsertTuple(i++, vec);
+            fldData->SetTuple(pointi++, vec);
         }
     }
 
@@ -766,22 +765,21 @@ Foam::vtkPVFoam::convertFieldToVTK
     vtkSmartPointer<vtkFloatArray> fldData =
         vtkSmartPointer<vtkFloatArray>::New();
 
-    fldData->SetNumberOfTuples(fld.size());
     fldData->SetNumberOfComponents(nComp);
-    fldData->Allocate(nComp*fld.size());
+    fldData->SetNumberOfTuples(fld.size());
     fldData->SetName(name.c_str());
 
     float vec[nComp];
-    forAll(fld, i)
+    forAll(fld, idx)
     {
-        const Type& t = fld[i];
+        const Type& t = fld[idx];
         for (direction d=0; d<nComp; ++d)
         {
             vec[d] = component(t, d);
         }
         foamPvFields::remapTuple<Type>(vec);
 
-        fldData->InsertTuple(i, vec);
+        fldData->SetTuple(idx, vec);
     }
 
     return fldData;
@@ -814,18 +812,17 @@ Foam::vtkPVFoam::convertFaceFieldToVTK
     vtkSmartPointer<vtkFloatArray> fldData =
         vtkSmartPointer<vtkFloatArray>::New();
 
-    fldData->SetNumberOfTuples(faceLabels.size());
     fldData->SetNumberOfComponents(nComp);
-    fldData->Allocate(nComp*faceLabels.size());
+    fldData->SetNumberOfTuples(faceLabels.size());
     fldData->SetName(fld.name().c_str());
 
     float vec[nComp];
 
     // for interior faces: average owner/neighbour
     // for boundary faces: owner
-    forAll(faceLabels, facei)
+    forAll(faceLabels, idx)
     {
-        const label faceNo = faceLabels[facei];
+        const label faceNo = faceLabels[idx];
         if (faceNo < nInternalFaces)
         {
             Type t = 0.5*(fld[faceOwner[faceNo]] + fld[faceNeigh[faceNo]]);
@@ -845,7 +842,7 @@ Foam::vtkPVFoam::convertFaceFieldToVTK
         }
         foamPvFields::remapTuple<Type>(vec);
 
-        fldData->InsertTuple(facei, vec);
+        fldData->SetTuple(idx, vec);
     }
 
     return fldData;
@@ -866,9 +863,8 @@ Foam::vtkPVFoam::convertVolFieldToVTK
     vtkSmartPointer<vtkFloatArray> fldData =
         vtkSmartPointer<vtkFloatArray>::New();
 
-    fldData->SetNumberOfTuples(cellMap.size());
     fldData->SetNumberOfComponents(nComp);
-    fldData->Allocate(nComp*cellMap.size());
+    fldData->SetNumberOfTuples(cellMap.size());
     fldData->SetName(fld.name().c_str());
 
     if (debug)
@@ -891,7 +887,7 @@ Foam::vtkPVFoam::convertVolFieldToVTK
         }
         foamPvFields::remapTuple<Type>(vec);
 
-        fldData->InsertTuple(i, vec);
+        fldData->SetTuple(i, vec);
     }
 
     return fldData;
diff --git a/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamMesh.C b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamMesh.C
index 5a7f86afe6..cca044671b 100644
--- a/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamMesh.C
+++ b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamMesh.C
@@ -575,17 +575,21 @@ void Foam::vtkPVFoam::convertMeshPointZones
                 continue;
             }
 
+            const pointField& meshPoints = mesh.points();
             const labelUList& pointLabels = zMesh[zoneId];
 
             vtkSmartPointer<vtkPoints> vtkpoints =
                 vtkSmartPointer<vtkPoints>::New();
 
-            vtkpoints->Allocate(pointLabels.size());
+            vtkpoints->SetNumberOfPoints(pointLabels.size());
 
-            const pointField& meshPoints = mesh.points();
             forAll(pointLabels, pointi)
             {
-                vtkpoints->InsertNextPoint(meshPoints[pointLabels[pointi]].v_);
+                vtkpoints->SetPoint
+                (
+                    pointi,
+                    meshPoints[pointLabels[pointi]].v_
+                );
             }
 
             vtkSmartPointer<vtkPolyData> vtkmesh =
@@ -647,17 +651,21 @@ void Foam::vtkPVFoam::convertMeshPointSets
             Info<< "Creating VTK mesh for pointSet=" << partName << endl;
         }
 
-        const pointSet pSet(mesh, partName);
+        const pointField& meshPoints = mesh.points();
+        const labelList pointLabels = pointSet(mesh, partName).sortedToc();
 
         vtkSmartPointer<vtkPoints> vtkpoints =
             vtkSmartPointer<vtkPoints>::New();
 
-        vtkpoints->Allocate(pSet.size());
+        vtkpoints->SetNumberOfPoints(pointLabels.size());
 
-        const pointField& meshPoints = mesh.points();
-        forAllConstIters(pSet, iter)
+        forAll(pointLabels, pointi)
         {
-            vtkpoints->InsertNextPoint(meshPoints[iter.key()].v_);
+            vtkpoints->SetPoint
+            (
+                pointi,
+                meshPoints[pointLabels[pointi]].v_
+            );
         }
 
         vtkSmartPointer<vtkPolyData> vtkmesh =
diff --git a/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamMeshLagrangian.C b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamMeshLagrangian.C
index b15f8daca9..60d0ea109f 100644
--- a/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamMeshLagrangian.C
+++ b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamMeshLagrangian.C
@@ -81,15 +81,16 @@ vtkSmartPointer<vtkPolyData> Foam::vtkPVFoam::lagrangianVTKMesh
         vtkSmartPointer<vtkCellArray> vtkcells =
             vtkSmartPointer<vtkCellArray>::New();
 
-        vtkpoints->Allocate(parcels.size());
-        vtkcells->Allocate(parcels.size());
+        vtkpoints->SetNumberOfPoints(parcels.size());
+        vtkcells->Allocate(2*parcels.size());
+        // If reusing memory, ensure insert always starts from 0
+        vtkcells->Reset();
 
         vtkIdType particleId = 0;
         forAllConstIters(parcels, iter)
         {
-            vtkpoints->InsertNextPoint(iter().position().v_);
-
-            vtkcells->InsertNextCell(1, &particleId);
+            vtkpoints->SetPoint(particleId, iter().position().v_);
+            vtkcells->InsertNextCell(1, &particleId);  // VTK_VERTEX
             particleId++;
         }
 
diff --git a/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamTemplates.C b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamTemplates.C
index e09b2c7765..118ccf6b68 100644
--- a/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamTemplates.C
+++ b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamTemplates.C
@@ -40,7 +40,7 @@ License
 template<class PatchType>
 vtkSmartPointer<vtkPolyData> Foam::vtkPVFoam::patchVTKMesh
 (
-    const word& name,
+    const string& name,
     const PatchType& p
 )
 {
@@ -59,20 +59,29 @@ vtkSmartPointer<vtkPolyData> Foam::vtkPVFoam::patchVTKMesh
     vtkSmartPointer<vtkPoints> vtkpoints =
         vtkSmartPointer<vtkPoints>::New();
 
-    vtkpoints->Allocate(points.size());
+    vtkpoints->SetNumberOfPoints(points.size());
     forAll(points, i)
     {
-        vtkpoints->InsertNextPoint(points[i].v_);
+        vtkpoints->SetPoint(i, points[i].v_);
     }
     vtkmesh->SetPoints(vtkpoints);
 
     // Add faces as polygons
     const faceList& faces = p.localFaces();
 
+    label nAlloc = faces.size();
+    forAll(faces, facei)
+    {
+        nAlloc += faces[facei].size();
+    }
+
     vtkSmartPointer<vtkCellArray> vtkcells =
         vtkSmartPointer<vtkCellArray>::New();
 
-    vtkcells->Allocate(faces.size());
+    vtkcells->Allocate(nAlloc);
+    // If reusing memory, ensure insert always starts from 0
+    vtkcells->Reset();
+
     forAll(faces, facei)
     {
         const face& f = faces[facei];
diff --git a/applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/vtkPVblockMesh/vtkPVblockMeshConvert.C b/applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/vtkPVblockMesh/vtkPVblockMeshConvert.C
index 8d39fe9b5f..81cf868956 100644
--- a/applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/vtkPVblockMesh/vtkPVblockMeshConvert.C
+++ b/applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/vtkPVblockMesh/vtkPVblockMeshConvert.C
@@ -40,26 +40,6 @@ License
 #include "vtkSmartPointer.h"
 
 
-// * * * * * * * * * * * * * Static Member Functions * * * * * * * * * * * * //
-
-//! \cond fileScope
-inline static void insertNextPoint
-(
-    vtkPoints *points,
-    const Foam::point& p,
-    const Foam::scalar scaleFactor
-)
-{
-    points->InsertNextPoint
-    (
-        p.x()*scaleFactor,
-        p.y()*scaleFactor,
-        p.z()*scaleFactor
-    );
-}
-
-//! \endcond
-
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 void Foam::vtkPVblockMesh::convertMeshBlocks
@@ -68,22 +48,20 @@ void Foam::vtkPVblockMesh::convertMeshBlocks
     int& blockNo
 )
 {
+    if (debug)
+    {
+        Info<< "<beg> convertMeshBlocks" << endl;
+    }
+
     vtkDataArraySelection* selection = reader_->GetBlockSelection();
     arrayRange& range = rangeBlocks_;
     range.block(blockNo);   // set output block
     label datasetNo = 0;    // restart at dataset 0
 
     const blockMesh& blkMesh = *meshPtr_;
-    const Foam::pointField& blockPoints = blkMesh.vertices();
-
-    if (debug)
-    {
-        Info<< "<beg> convertMeshBlocks" << endl;
-    }
+    const pointField blkPoints(blkMesh.vertices() * blkMesh.scaleFactor());
 
     int blockI = 0;
-    const scalar scaleFactor = blkMesh.scaleFactor();
-
     for
     (
         auto iter = range.cbegin();
@@ -98,26 +76,22 @@ void Foam::vtkPVblockMesh::convertMeshBlocks
         }
 
         const blockDescriptor& blockDef = blkMesh[blockI];
+        const labelList& blockLabels = blockDef.blockShape();
 
-        // Convert OpenFOAM mesh vertices to VTK
         vtkSmartPointer<vtkPoints> vtkpoints =
             vtkSmartPointer<vtkPoints>::New();
 
-        vtkpoints->Allocate(blockDef.nPoints());
-        const labelList& blockLabels = blockDef.blockShape();
+        vtkpoints->SetNumberOfPoints(blockLabels.size());
 
         vtkIdType nodeIds[8];
-
-        forAll(blockLabels, ptI)
+        forAll(blockLabels, pointi)
         {
-            insertNextPoint
+            vtkpoints->SetPoint
             (
-                vtkpoints,
-                blockPoints[blockLabels[ptI]],
-                scaleFactor
+                pointi,
+                blkPoints[blockLabels[pointi]].v_
             );
-
-            nodeIds[ptI] = ptI;
+            nodeIds[pointi] = pointi;
         }
 
         vtkSmartPointer<vtkUnstructuredGrid> vtkmesh =
@@ -138,7 +112,6 @@ void Foam::vtkPVblockMesh::convertMeshBlocks
             output, vtkmesh, range, datasetNo,
             selection->GetArrayName(partId)
         );
-
         ++datasetNo;
     }
 
@@ -170,10 +143,9 @@ void Foam::vtkPVblockMesh::convertMeshEdges
 
     const blockMesh& blkMesh = *meshPtr_;
     const blockEdgeList& edges = blkMesh.edges();
-
-    int edgeI = 0;
     const scalar scaleFactor = blkMesh.scaleFactor();
 
+    int edgeI = 0;
     for
     (
         auto iter = range.cbegin();
@@ -214,27 +186,24 @@ void Foam::vtkPVblockMesh::convertMeshEdges
             {
                 const List<point>& edgePoints = edgesPoints[foundEdgeI];
 
-                vtkSmartPointer<vtkPolyData> vtkmesh =
-                    vtkSmartPointer<vtkPolyData>::New();
-
                 vtkSmartPointer<vtkPoints> vtkpoints =
                     vtkSmartPointer<vtkPoints>::New();
 
-                vtkpoints->Allocate( edgePoints.size() );
-                vtkmesh->Allocate(1);
+                vtkpoints->SetNumberOfPoints(edgePoints.size());
 
                 vtkIdType pointIds[edgePoints.size()];
-                forAll(edgePoints, ptI)
+                forAll(edgePoints, pointi)
                 {
-                    insertNextPoint
-                    (
-                        vtkpoints,
-                        edgePoints[ptI],
-                        scaleFactor
-                    );
-                    pointIds[ptI] = ptI;
+                    const point p = edgePoints[pointi] * scaleFactor;
+
+                    vtkpoints->SetPoint(pointi, p.v_);
+                    pointIds[pointi] = pointi;
                 }
 
+                vtkSmartPointer<vtkPolyData> vtkmesh =
+                    vtkSmartPointer<vtkPolyData>::New();
+
+                vtkmesh->Allocate(1);
                 vtkmesh->InsertNextCell
                 (
                     VTK_POLY_LINE,
@@ -249,8 +218,7 @@ void Foam::vtkPVblockMesh::convertMeshEdges
                     output, vtkmesh, range, datasetNo,
                     selection->GetArrayName(partId)
                 );
-
-                datasetNo++;
+                ++datasetNo;
 
                 break;
             }
@@ -281,8 +249,7 @@ void Foam::vtkPVblockMesh::convertMeshCorners
     range.block(blockNo);      // set output block
     label datasetNo = 0;       // restart at dataset 0
 
-    const pointField& blockPoints = meshPtr_->vertices();
-    const scalar& scaleFactor = meshPtr_->scaleFactor();
+    const pointField blkPoints(meshPtr_->vertices() * meshPtr_->scaleFactor());
 
     if (debug)
     {
@@ -300,20 +267,16 @@ void Foam::vtkPVblockMesh::convertMeshCorners
         vtkSmartPointer<vtkCellArray> vtkcells =
             vtkSmartPointer<vtkCellArray>::New();
 
-        vtkpoints->Allocate( blockPoints.size() );
-        vtkcells->Allocate( blockPoints.size() );
+        vtkpoints->SetNumberOfPoints(blkPoints.size());
+        vtkcells->Allocate(2*blkPoints.size());
+        // If reusing memory, ensure insert always starts from 0
+        vtkcells->Reset();
 
         vtkIdType pointId = 0;
-        forAll(blockPoints, ptI)
+        forAll(blkPoints, pointi)
         {
-            insertNextPoint
-            (
-                vtkpoints,
-                blockPoints[ptI],
-                scaleFactor
-            );
-
-            vtkcells->InsertNextCell(1, &pointId); // VTK_VERTEX
+            vtkpoints->SetPoint(pointi, blkPoints[pointi].v_);
+            vtkcells->InsertNextCell(1, &pointId);  // VTK_VERTEX
             pointId++;
         }
 

From 09f0cfd5c723db640c5bf527ce7d42977f267305 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Sun, 14 May 2017 21:38:15 +0200
Subject: [PATCH 08/27] STYLE: reduce number of small methods in paraview
 reader

- improves the overview of the code
---
 .../PVFoamReader/vtkPVFoamReader.cxx          |  85 +----
 .../PVFoamReader/vtkPVFoamReader.h            |   3 -
 .../PVFoamReader/vtkPVFoam/vtkPVFoam.C        | 290 +++++++++---------
 .../PVFoamReader/vtkPVFoam/vtkPVFoam.H        |  29 +-
 .../vtkPVFoam/vtkPVFoamUpdateInfo.C           |  21 --
 .../vtkPVblockMeshReader.cxx                  |  18 +-
 .../vtkPVblockMesh/vtkPVblockMesh.C           |   2 +-
 .../vtkPVblockMesh/vtkPVblockMesh.H           |   9 +-
 8 files changed, 176 insertions(+), 281 deletions(-)

diff --git a/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/PVFoamReader/vtkPVFoamReader.cxx b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/PVFoamReader/vtkPVFoamReader.cxx
index abd191dd7a..7da8452e31 100644
--- a/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/PVFoamReader/vtkPVFoamReader.cxx
+++ b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/PVFoamReader/vtkPVFoamReader.cxx
@@ -47,7 +47,7 @@ License
 // STL includes
 #include <vector>
 
-#undef EXPERIMENTAL_TIME_CACHING
+#undef VTKPVFOAM_DUALPORT
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
@@ -62,10 +62,8 @@ vtkPVFoamReader::vtkPVFoamReader()
     vtkDebugMacro(<<"Constructor");
 
     SetNumberOfInputPorts(0);
-
     FileName = nullptr;
     backend_ = nullptr;
-    output0_ = nullptr;
 
 #ifdef VTKPVFOAM_DUALPORT
     // Add second output for the Lagrangian
@@ -84,7 +82,7 @@ vtkPVFoamReader::vtkPVFoamReader()
 
     CacheMesh = true;
 
-    SkipZeroTime = false;
+    SkipZeroTime = true;
     ExtrapolatePatches = false;
     UseVTKPolyhedron = false;
     IncludeSets = false;
@@ -152,12 +150,6 @@ vtkPVFoamReader::~vtkPVFoamReader()
         delete[] FileName;
     }
 
-    if (output0_)
-    {
-        output0_->Delete();
-    }
-
-
     PartSelection->RemoveAllObservers();
     VolFieldSelection->RemoveAllObservers();
     PointFieldSelection->RemoveAllObservers();
@@ -258,7 +250,7 @@ int vtkPVFoamReader::RequestInformation
                 <<"time-range " << times.front() << ':' << times.back() << "\n"
                 <<"times " << times.size() << "(";
 
-            for (const double& val : times)
+            for (auto val : times)
             {
                 cout<< ' ' << val;
             }
@@ -294,12 +286,12 @@ int vtkPVFoamReader::RequestData
 
     if (!FileName)
     {
-        vtkErrorMacro("FileName has to be specified!");
+        vtkErrorMacro("FileName must be specified!");
         return 0;
     }
     if (!backend_)
     {
-        // catch some previous error
+        // Catch some previous error
         vtkErrorMacro("Reader failed - perhaps no mesh?");
         return 0;
     }
@@ -365,76 +357,23 @@ int vtkPVFoamReader::RequestData
         )
     );
 
-    if (Foam::vtkPVFoam::debug)
-    {
-        cout<< "update output with "
-            << output->GetNumberOfBlocks() << " blocks\n";
-    }
-
-
-#ifdef EXPERIMENTAL_TIME_CACHING
-    bool needsUpdate = false;
-
-    if (!output0_)
-    {
-        output0_ = vtkMultiBlockDataSet::New();
-        needsUpdate = true;
-    }
-
-    // This experimental bit of code seems to work for the geometry,
-    // but trashes the fields and still triggers the GeometryFilter
-    if (needsUpdate)
-    {
-        backend_->Update(output);
-        output0_->ShallowCopy(output);
-    }
-    else
-    {
-        output->ShallowCopy(output0_);
-    }
-
-    if (Foam::vtkPVFoam::debug)
-    {
-        if (needsUpdate)
-        {
-            cout<< "full UPDATE ---------\n";
-        }
-        else
-        {
-            cout<< "cached UPDATE ---------\n";
-        }
-
-        cout<< "UPDATED output: ";
-        output->Print(cout);
-
-        cout<< "UPDATED output0_: ";
-        output0_->Print(cout);
-    }
-
-#else
-
 #ifdef VTKPVFOAM_DUALPORT
-    backend_->Update
+    vtkMultiBlockDataSet* output1 = vtkMultiBlockDataSet::SafeDownCast
     (
-        output,
-        vtkMultiBlockDataSet::SafeDownCast
+        outputVector->GetInformationObject(1)->Get
         (
-            outputVector->GetInformationObject(1)->Get
-            (
-                vtkMultiBlockDataSet::DATA_OBJECT()
-            )
+            vtkMultiBlockDataSet::DATA_OBJECT()
         )
     );
+
+    backend_->Update(output, output1);
 #else
-    backend_->Update(output, output);
+    backend_->Update(output, nullptr);
 #endif
 
     updatePatchNamesView(ShowPatchNames);
 
-#endif
-
-    // Do any cleanup on the OpenFOAM side
-    backend_->CleanUp();
+    backend_->UpdateFinalize();
 
     return 1;
 }
diff --git a/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/PVFoamReader/vtkPVFoamReader.h b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/PVFoamReader/vtkPVFoamReader.h
index a1b4f3fa44..be9d1db3f7 100644
--- a/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/PVFoamReader/vtkPVFoamReader.h
+++ b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/PVFoamReader/vtkPVFoamReader.h
@@ -251,9 +251,6 @@ private:
     vtkDataArraySelection* PointFieldSelection;
     vtkDataArraySelection* LagrangianFieldSelection;
 
-    //- Cached data for output port0 (experimental!)
-    vtkMultiBlockDataSet* output0_;
-
     //- Backend portion of the reader
     Foam::vtkPVFoam* backend_;
 };
diff --git a/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoam.C b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoam.C
index 1a623ac949..69be02156a 100644
--- a/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoam.C
+++ b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoam.C
@@ -39,6 +39,9 @@ License
 #include "vtkTextProperty.h"
 #include "vtkSmartPointer.h"
 
+// Templates (only needed here)
+#include "vtkPVFoamUpdateTemplates.C"
+
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
 namespace Foam
@@ -100,31 +103,6 @@ void Foam::vtkPVFoam::resetCounters()
 }
 
 
-void Foam::vtkPVFoam::reduceMemory()
-{
-    forAll(regionVtus_, i)
-    {
-        regionVtus_[i].clear();
-    }
-
-    forAll(zoneVtus_, i)
-    {
-        zoneVtus_[i].clear();
-    }
-
-    forAll(csetVtus_, i)
-    {
-        csetVtus_[i].clear();
-    }
-
-    if (!reader_->GetCacheMesh())
-    {
-        delete meshPtr_;
-        meshPtr_ = nullptr;
-    }
-}
-
-
 int Foam::vtkPVFoam::setTime(int nRequest, const double requestTimes[])
 {
     Time& runTime = dbPtr_();
@@ -201,52 +179,6 @@ int Foam::vtkPVFoam::setTime(int nRequest, const double requestTimes[])
 }
 
 
-void Foam::vtkPVFoam::updateMeshPartsStatus()
-{
-    if (debug)
-    {
-        Info<< "<beg> updateMeshPartsStatus" << endl;
-    }
-
-    vtkDataArraySelection* selection = reader_->GetPartSelection();
-    label nElem = selection->GetNumberOfArrays();
-
-    if (partStatus_.size() != nElem)
-    {
-        partStatus_.setSize(nElem);
-        partStatus_ = false;
-        meshChanged_ = true;
-    }
-
-    // this needs fixing if we wish to re-use the datasets
-    partDataset_.setSize(nElem);
-    partDataset_ = -1;
-
-    // Read the selected mesh parts (zones, patches ...) and add to list
-    forAll(partStatus_, partId)
-    {
-        const int setting = selection->GetArraySetting(partId);
-
-        if (partStatus_[partId] != setting)
-        {
-            partStatus_[partId] = setting;
-            meshChanged_ = true;
-        }
-
-        if (debug > 1)
-        {
-            Info<< "  part[" << partId << "] = "
-                << partStatus_[partId]
-                << " : " << selection->GetArrayName(partId) << endl;
-        }
-    }
-    if (debug)
-    {
-        Info<< "<end> updateMeshPartsStatus" << endl;
-    }
-}
-
-
 Foam::word Foam::vtkPVFoam::getPartName(const int partId)
 {
     return getFoamName(reader_->GetPartArrayName(partId));
@@ -270,7 +202,7 @@ Foam::vtkPVFoam::vtkPVFoam
     meshChanged_(true),
     fieldsChanged_(true),
     rangeVolume_("unzoned"),
-    rangePatches_("patches"),
+    rangePatches_("patch"),
     rangeLagrangian_("lagrangian"),
     rangeCellZones_("cellZone"),
     rangeFaceZones_("faceZone"),
@@ -433,7 +365,18 @@ void Foam::vtkPVFoam::updateInfo()
     }
 
     // Update volume, point and lagrangian fields
-    updateInfoFields();
+    updateInfoFields<fvPatchField, volMesh>
+    (
+        reader_->GetVolFieldSelection()
+    );
+    updateInfoFields<pointPatchField, pointMesh>
+    (
+        reader_->GetPointFieldSelection()
+    );
+    updateInfoLagrangianFields
+    (
+        reader_->GetLagrangianFieldSelection()
+    );
 
     if (debug)
     {
@@ -442,84 +385,121 @@ void Foam::vtkPVFoam::updateInfo()
 }
 
 
-void Foam::vtkPVFoam::updateFoamMesh()
-{
-    if (debug)
-    {
-        Info<< "<beg> updateFoamMesh" << endl;
-        printMemory();
-    }
-
-    if (!reader_->GetCacheMesh())
-    {
-        delete meshPtr_;
-        meshPtr_ = nullptr;
-    }
-
-    // Check to see if the OpenFOAM mesh has been created
-    if (!meshPtr_)
-    {
-        if (debug)
-        {
-            Info<< "Creating OpenFOAM mesh for region " << meshRegion_
-                << " at time=" << dbPtr_().timeName()
-                << endl;
-
-        }
-
-        meshPtr_ = new fvMesh
-        (
-            IOobject
-            (
-                meshRegion_,
-                dbPtr_().timeName(),
-                dbPtr_(),
-                IOobject::MUST_READ
-            )
-        );
-
-        meshChanged_ = true;
-    }
-    else
-    {
-        if (debug)
-        {
-            Info<< "Using existing OpenFOAM mesh" << endl;
-        }
-    }
-
-    if (debug)
-    {
-        Info<< "<end> updateFoamMesh" << endl;
-        printMemory();
-    }
-}
-
-
 void Foam::vtkPVFoam::Update
 (
     vtkMultiBlockDataSet* output,
-    vtkMultiBlockDataSet* lagrangianOutput
+    vtkMultiBlockDataSet* outputLagrangian
 )
 {
     if (debug)
     {
-        cout<< "<beg> Foam::vtkPVFoam::Update - output with "
-            << output->GetNumberOfBlocks() << " and "
-            << lagrangianOutput->GetNumberOfBlocks() << " blocks\n";
+        cout<< "<beg> Foam::vtkPVFoam::Update\n";
         output->Print(cout);
-        lagrangianOutput->Print(cout);
+        if (outputLagrangian) outputLagrangian->Print(cout);
         printMemory();
     }
     reader_->UpdateProgress(0.1);
 
     // Set up mesh parts selection(s)
-    updateMeshPartsStatus();
+    {
+        if (debug)
+        {
+            Info<< "<beg> updateMeshPartsStatus" << endl;
+        }
+
+        vtkDataArraySelection* selection = reader_->GetPartSelection();
+        label nElem = selection->GetNumberOfArrays();
+
+        if (partStatus_.size() != nElem)
+        {
+            partStatus_.setSize(nElem);
+            partStatus_ = false;
+            meshChanged_ = true;
+        }
+
+        // this needs fixing if we wish to re-use the datasets
+        partDataset_.setSize(nElem);
+        partDataset_ = -1;
+
+        // Read the selected mesh parts (zones, patches ...) and add to list
+        forAll(partStatus_, partId)
+        {
+            const int setting = selection->GetArraySetting(partId);
+
+            if (partStatus_[partId] != setting)
+            {
+                partStatus_[partId] = setting;
+                meshChanged_ = true;
+            }
+
+            if (debug > 1)
+            {
+                Info<< "  part[" << partId << "] = "
+                    << partStatus_[partId]
+                    << " : " << selection->GetArrayName(partId) << endl;
+            }
+        }
+        if (debug)
+        {
+            Info<< "<end> updateMeshPartsStatus" << endl;
+        }
+    }
 
     reader_->UpdateProgress(0.15);
 
     // Update the OpenFOAM mesh
-    updateFoamMesh();
+    {
+        if (debug)
+        {
+            Info<< "<beg> updateFoamMesh" << endl;
+            printMemory();
+        }
+
+        if (!reader_->GetCacheMesh())
+        {
+            delete meshPtr_;
+            meshPtr_ = nullptr;
+        }
+
+        // Check to see if the OpenFOAM mesh has been created
+        if (!meshPtr_)
+        {
+            if (debug)
+            {
+                Info<< "Creating OpenFOAM mesh for region " << meshRegion_
+                    << " at time=" << dbPtr_().timeName()
+                        << endl;
+
+            }
+
+            meshPtr_ = new fvMesh
+            (
+                IOobject
+                (
+                    meshRegion_,
+                    dbPtr_().timeName(),
+                    dbPtr_(),
+                    IOobject::MUST_READ
+                )
+            );
+
+            meshChanged_ = true;
+        }
+        else
+        {
+            if (debug)
+            {
+                Info<< "Using existing OpenFOAM mesh" << endl;
+            }
+        }
+
+        if (debug)
+        {
+            Info<< "<end> updateFoamMesh" << endl;
+            printMemory();
+        }
+    }
+
     reader_->UpdateProgress(0.4);
 
     // Convert meshes - start port0 at block=0
@@ -545,18 +525,24 @@ void Foam::vtkPVFoam::Update
         reader_->UpdateProgress(0.7);
     }
 
-#ifdef VTKPVFOAM_DUALPORT
-    // restart port1 at block=0
-    blockNo = 0;
-#endif
-    convertMeshLagrangian(lagrangianOutput, blockNo);
+    if (outputLagrangian)
+    {
+        // Lagrangian dual port - restart port1 at block=0
+        blockNo = 0;
+        convertMeshLagrangian(outputLagrangian, blockNo);
+    }
+    else
+    {
+        convertMeshLagrangian(output, blockNo);
+    }
 
     reader_->UpdateProgress(0.8);
 
     // Update fields
     convertVolFields(output);
     convertPointFields(output);
-    convertLagrangianFields(lagrangianOutput);
+    convertLagrangianFields(outputLagrangian ? outputLagrangian : output);
+
     if (debug)
     {
         Info<< "done reader part" << nl << endl;
@@ -564,13 +550,31 @@ void Foam::vtkPVFoam::Update
     reader_->UpdateProgress(0.95);
 
     meshChanged_ = fieldsChanged_ = false;
+
+    // Standard memory cleanup
+    forAll(regionVtus_, i)
+    {
+        regionVtus_[i].clear();
+    }
+    forAll(zoneVtus_, i)
+    {
+        zoneVtus_[i].clear();
+    }
+    forAll(csetVtus_, i)
+    {
+        csetVtus_[i].clear();
+    }
 }
 
 
-void Foam::vtkPVFoam::CleanUp()
+void Foam::vtkPVFoam::UpdateFinalize()
 {
-    // reclaim some memory
-    reduceMemory();
+    if (!reader_->GetCacheMesh())
+    {
+        delete meshPtr_;
+        meshPtr_ = nullptr;
+    }
+
     reader_->UpdateProgress(1.0);
 }
 
diff --git a/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoam.H b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoam.H
index f6359ff5b4..c6e365b8af 100644
--- a/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoam.H
+++ b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoam.H
@@ -55,8 +55,6 @@ SourceFiles
 #include "volPointInterpolation.H"
 #include "foamPvCore.H"
 
-#undef VTKPVFOAM_DUALPORT
-
 // * * * * * * * * * * * * * Forward Declarations  * * * * * * * * * * * * * //
 
 class vtkDataArraySelection;
@@ -231,9 +229,6 @@ class vtkPVFoam
 
       // Update information helper functions
 
-        //- Update the mesh parts selected in the GUI
-        void updateMeshPartsStatus();
-
         //- Internal mesh info
         void updateInfoInternalMesh(vtkDataArraySelection*);
 
@@ -259,9 +254,6 @@ class vtkPVFoam
             const ZoneMesh<ZoneType, polyMesh>& zmesh
         );
 
-        //- Field (volume, point, lagrangian) info
-        void updateInfoFields();
-
         //- Field info
         template<template<class> class patchType, class meshType>
         void updateInfoFields
@@ -273,15 +265,6 @@ class vtkPVFoam
         void updateInfoLagrangianFields(vtkDataArraySelection* select);
 
 
-      // Update helper functions
-
-        //- OpenFOAM mesh
-        void updateFoamMesh();
-
-        //- Reduce memory footprint after conversion
-        void reduceMemory();
-
-
       // Mesh conversion functions
 
         //- Convert volume mesh
@@ -506,19 +489,19 @@ public:
         void Update
         (
             vtkMultiBlockDataSet* output,
-            vtkMultiBlockDataSet* lagrangianOutput
+            vtkMultiBlockDataSet* outputLagrangian
         );
 
-        //- Clean any storage
-        void CleanUp();
+        //- Final part of Update(), after any last minute rendering.
+        void UpdateFinalize();
+
+        //- Add/remove patch names to/from the view
+        void renderPatchNames(vtkRenderer* renderer, const bool show);
 
         //- Return a list of selected times.
         //  Use STL container since these values are used by the plugin
         std::vector<double> findTimes(const bool skipZero = false) const;
 
-        //- Add/remove patch names to/from the view
-        void renderPatchNames(vtkRenderer*, const bool show);
-
         //- Set the runTime to the first plausible request time,
         //  returns the timeIndex
         //  sets to "constant" on error
diff --git a/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamUpdateInfo.C b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamUpdateInfo.C
index 7bdfd32586..338fc0c865 100644
--- a/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamUpdateInfo.C
+++ b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamUpdateInfo.C
@@ -39,10 +39,6 @@ License
 // VTK includes
 #include "vtkDataArraySelection.h"
 
-// Templates (only needed here)
-#include "vtkPVFoamUpdateTemplates.C"
-
-
 // * * * * * * * * * * * * * * * Private Classes * * * * * * * * * * * * * * //
 
 namespace Foam
@@ -580,23 +576,6 @@ void Foam::vtkPVFoam::updateInfoSets
 }
 
 
-void Foam::vtkPVFoam::updateInfoFields()
-{
-    updateInfoFields<fvPatchField, volMesh>
-    (
-        reader_->GetVolFieldSelection()
-    );
-    updateInfoFields<pointPatchField, pointMesh>
-    (
-        reader_->GetPointFieldSelection()
-    );
-    updateInfoLagrangianFields
-    (
-        reader_->GetLagrangianFieldSelection()
-    );
-}
-
-
 void Foam::vtkPVFoam::updateInfoLagrangianFields
 (
     vtkDataArraySelection* select
diff --git a/applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/PVblockMeshReader/vtkPVblockMeshReader.cxx b/applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/PVblockMeshReader/vtkPVblockMeshReader.cxx
index 4e71734294..ed0271d0a1 100644
--- a/applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/PVblockMeshReader/vtkPVblockMeshReader.cxx
+++ b/applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/PVblockMeshReader/vtkPVblockMeshReader.cxx
@@ -165,20 +165,19 @@ int vtkPVblockMeshReader::RequestData
 
     if (!FileName)
     {
-        vtkErrorMacro("FileName has to be specified!");
+        vtkErrorMacro("FileName must be specified!");
         return 0;
     }
-
-    // Catch previous error
     if (!backend_)
     {
-        vtkErrorMacro("Reader failed - perhaps no mesh?");
+        // Catch some previous error
+        vtkErrorMacro("Reader failed - perhaps no blockMesh?");
         return 0;
     }
 
     if (Foam::vtkPVblockMesh::debug)
     {
-        cout<<"REQUEST_DATA:\n";
+        cout<<"RequestData:\n";
         outputVector->GetInformationObject(0)->Print(cout);
     }
 
@@ -190,19 +189,12 @@ int vtkPVblockMeshReader::RequestData
         )
     );
 
-    if (Foam::vtkPVblockMesh::debug)
-    {
-        cout<< "update output with "
-            << output->GetNumberOfBlocks() << " blocks\n";
-    }
-
     backend_->Update(output);
 
     updatePatchNamesView(ShowPatchNames);
     updatePointNumbersView(ShowPointNumbers);
 
-    // Do any cleanup on the OpenFOAM side
-    backend_->CleanUp();
+    backend_->UpdateFinalize();
 
     return 1;
 }
diff --git a/applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/vtkPVblockMesh/vtkPVblockMesh.C b/applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/vtkPVblockMesh/vtkPVblockMesh.C
index 0a994a78bd..4d85e72982 100644
--- a/applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/vtkPVblockMesh/vtkPVblockMesh.C
+++ b/applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/vtkPVblockMesh/vtkPVblockMesh.C
@@ -430,7 +430,7 @@ void Foam::vtkPVblockMesh::Update
 }
 
 
-void Foam::vtkPVblockMesh::CleanUp()
+void Foam::vtkPVblockMesh::UpdateFinalize()
 {
     reader_->UpdateProgress(1.0);
 }
diff --git a/applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/vtkPVblockMesh/vtkPVblockMesh.H b/applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/vtkPVblockMesh/vtkPVblockMesh.H
index b86ad72b6c..04eaa69981 100644
--- a/applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/vtkPVblockMesh/vtkPVblockMesh.H
+++ b/applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/vtkPVblockMesh/vtkPVblockMesh.H
@@ -177,14 +177,15 @@ public:
 
         void Update(vtkMultiBlockDataSet* output);
 
-        //- Clean any storage
-        void CleanUp();
+        //- Final part of Update(), after any last minute rendering.
+        void UpdateFinalize();
 
         //- Add/remove patch names to/from the view
-        void renderPatchNames(vtkRenderer*, const bool show);
+        void renderPatchNames(vtkRenderer* renderer, const bool show);
 
         //- Add/remove point numbers to/from the view
-        void renderPointNumbers(vtkRenderer*, const bool show);
+        void renderPointNumbers(vtkRenderer* renderer, const bool show);
+
 
      // Access
 

From cf5ebd82dbc49dc0c1c9ca3a9b91f50d343c935e Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Sun, 14 May 2017 21:42:59 +0200
Subject: [PATCH 09/27] ENH: improve internal bookkeeping in paraview readers

- has the selected values directly and use these lookup names to store
  directly into a hash. This replaces several parallel lists of
  decomp information etc and makes it easier.
---
 .../PVFoamReader/vtkPVFoam/vtkPVFoam.C        | 138 ++++++++------
 .../PVFoamReader/vtkPVFoam/vtkPVFoam.H        |  69 ++++---
 .../vtkPVFoam/vtkPVFoamFieldTemplates.C       | 127 ++++++++-----
 .../PVFoamReader/vtkPVFoam/vtkPVFoamFields.C  |  11 +-
 .../PVFoamReader/vtkPVFoam/vtkPVFoamMesh.C    | 178 ++++++++++--------
 .../vtkPVFoam/vtkPVFoamUpdateInfo.C           | 155 +++++++--------
 .../vtkPVFoam/vtkPVFoamUpdateTemplates.C      |   4 +-
 .../vtkPVblockMesh/vtkPVblockMesh.C           |   9 +-
 .../graphics/PVReaders/foamPv/foamPvCore.C    |  56 +++---
 .../graphics/PVReaders/foamPv/foamPvCore.H    |  15 +-
 10 files changed, 431 insertions(+), 331 deletions(-)

diff --git a/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoam.C b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoam.C
index 69be02156a..bade666a7a 100644
--- a/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoam.C
+++ b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoam.C
@@ -47,6 +47,20 @@ License
 namespace Foam
 {
     defineTypeNameAndDebug(vtkPVFoam, 0);
+
+    // file-scope
+    static word updateStateName(polyMesh::readUpdateState state)
+    {
+        switch (state)
+        {
+            case polyMesh::UNCHANGED:      return "UNCHANGED";
+            case polyMesh::POINTS_MOVED:   return "POINTS_MOVED";
+            case polyMesh::TOPO_CHANGE:    return "TOPO_CHANGE";
+            case polyMesh::TOPO_PATCH_CHANGE: return "TOPO_PATCH_CHANGE";
+        };
+
+        return "UNKNOWN";
+    }
 }
 
 
@@ -138,27 +152,15 @@ int Foam::vtkPVFoam::setTime(int nRequest, const double requestTimes[])
             << ", nearestIndex = " << nearestIndex << endl;
     }
 
-
-    // see what has changed
+    // See what has changed
     if (timeIndex_ != nearestIndex)
     {
         timeIndex_ = nearestIndex;
         runTime.setTime(Times[nearestIndex], nearestIndex);
 
-        // the fields change each time
+        // When the changes, so do the fields
         fieldsChanged_ = true;
-
-        if (meshPtr_)
-        {
-            if (meshPtr_->readUpdate() != polyMesh::UNCHANGED)
-            {
-                meshChanged_ = true;
-            }
-        }
-        else
-        {
-            meshChanged_ = true;
-        }
+        meshState_ = meshPtr_ ? meshPtr_->readUpdate() : polyMesh::TOPO_CHANGE;
 
         reader_->UpdateProgress(0.05);
 
@@ -171,7 +173,7 @@ int Foam::vtkPVFoam::setTime(int nRequest, const double requestTimes[])
         Info<< "<end> setTime() - selectedTime="
             << Times[nearestIndex].name() << " index=" << timeIndex_
             << "/" << Times.size()
-            << " meshChanged=" << Switch(meshChanged_)
+            << " meshUpdateState=" << updateStateName(meshState_)
             << " fieldsChanged=" << Switch(fieldsChanged_) << endl;
     }
 
@@ -179,7 +181,20 @@ int Foam::vtkPVFoam::setTime(int nRequest, const double requestTimes[])
 }
 
 
-Foam::word Foam::vtkPVFoam::getPartName(const int partId)
+Foam::word Foam::vtkPVFoam::getPartName(const int partId) const
+{
+    if (selectedPartIds_.found(partId))
+    {
+        return getFoamName(selectedPartIds_[partId]);
+    }
+    else
+    {
+        return word::null;
+    }
+}
+
+
+Foam::word Foam::vtkPVFoam::getReaderPartName(const int partId) const
 {
     return getFoamName(reader_->GetPartArrayName(partId));
 }
@@ -199,7 +214,7 @@ Foam::vtkPVFoam::vtkPVFoam
     meshRegion_(polyMesh::defaultRegion),
     meshDir_(polyMesh::meshSubDir),
     timeIndex_(-1),
-    meshChanged_(true),
+    meshState_(polyMesh::TOPO_CHANGE),
     fieldsChanged_(true),
     rangeVolume_("unzoned"),
     rangePatches_("patch"),
@@ -334,7 +349,7 @@ void Foam::vtkPVFoam::updateInfo()
     // time of the vtkDataArraySelection, but the qt/paraview proxy
     // layer doesn't care about that anyhow.
 
-    stringList enabledEntries;
+    HashSet<string> enabledEntries;
     if (!partSelection->GetNumberOfArrays() && !meshPtr_)
     {
         // enable 'internalMesh' on the first call
@@ -356,10 +371,10 @@ void Foam::vtkPVFoam::updateInfo()
     updateInfoZones(partSelection);
     updateInfoLagrangian(partSelection);
 
-    // restore the enabled selections
+    // Adjust/restore the enabled selections
     setSelectedArrayEntries(partSelection, enabledEntries);
 
-    if (meshChanged_)
+    if (meshState_ != polyMesh::UNCHANGED)
     {
         fieldsChanged_ = true;
     }
@@ -408,37 +423,48 @@ void Foam::vtkPVFoam::Update
         }
 
         vtkDataArraySelection* selection = reader_->GetPartSelection();
-        label nElem = selection->GetNumberOfArrays();
+        const int n = selection->GetNumberOfArrays();
 
-        if (partStatus_.size() != nElem)
+        // All previously selected (enabled) names
+        HashSet<string> original;
+        forAllConstIters(selectedPartIds_, iter)
         {
-            partStatus_.setSize(nElem);
-            partStatus_ = false;
-            meshChanged_ = true;
+            original.insert(iter.object());
         }
 
-        // this needs fixing if we wish to re-use the datasets
-        partDataset_.setSize(nElem);
-        partDataset_ = -1;
+        selectedPartIds_.clear();
 
-        // Read the selected mesh parts (zones, patches ...) and add to list
-        forAll(partStatus_, partId)
+        for (int id=0; id < n; ++id)
         {
-            const int setting = selection->GetArraySetting(partId);
+            string str(selection->GetArrayName(id));
+            bool status = selection->GetArraySetting(id);
 
-            if (partStatus_[partId] != setting)
+            if (status)
             {
-                partStatus_[partId] = setting;
-                meshChanged_ = true;
+                selectedPartIds_.set(id, str); // id -> name
+
+                if (!original.erase(str))
+                {
+                    // New part, or newly enabled
+                    //? meshChanged_ = true;
+                }
+            }
+            else
+            {
+                if (original.erase(str))
+                {
+                    // Part disappeared, or newly disabled
+                    //? meshChanged_ = true;
+                }
             }
 
             if (debug > 1)
             {
-                Info<< "  part[" << partId << "] = "
-                    << partStatus_[partId]
-                    << " : " << selection->GetArrayName(partId) << endl;
+                Info<< "  part[" << id << "] = " << status
+                    << " : " << str << nl;
             }
         }
+
         if (debug)
         {
             Info<< "<end> updateMeshPartsStatus" << endl;
@@ -467,8 +493,7 @@ void Foam::vtkPVFoam::Update
             if (debug)
             {
                 Info<< "Creating OpenFOAM mesh for region " << meshRegion_
-                    << " at time=" << dbPtr_().timeName()
-                        << endl;
+                    << " at time=" << dbPtr_().timeName() << endl;
 
             }
 
@@ -483,7 +508,7 @@ void Foam::vtkPVFoam::Update
                 )
             );
 
-            meshChanged_ = true;
+            meshState_ = polyMesh::TOPO_CHANGE; // New mesh
         }
         else
         {
@@ -502,6 +527,20 @@ void Foam::vtkPVFoam::Update
 
     reader_->UpdateProgress(0.4);
 
+    // Update cached, saved, unneed values:
+    HashSet<string> nowActive;
+    forAllConstIters(selectedPartIds_, iter)
+    {
+        nowActive.insert(iter.object());
+    }
+
+    // Dispose of unneeded components
+    cachedVtp_.retain(nowActive);
+    cachedVtu_.retain(nowActive);
+
+    // Reset (expire) dataset ids
+    partDataset_.clear();
+
     // Convert meshes - start port0 at block=0
     int blockNo = 0;
 
@@ -549,21 +588,12 @@ void Foam::vtkPVFoam::Update
     }
     reader_->UpdateProgress(0.95);
 
-    meshChanged_ = fieldsChanged_ = false;
+    fieldsChanged_ = false;
+    meshState_ = polyMesh::UNCHANGED;
 
     // Standard memory cleanup
-    forAll(regionVtus_, i)
-    {
-        regionVtus_[i].clear();
-    }
-    forAll(zoneVtus_, i)
-    {
-        zoneVtus_[i].clear();
-    }
-    forAll(csetVtus_, i)
-    {
-        csetVtus_[i].clear();
-    }
+    cachedVtp_.clear();
+    cachedVtu_.clear();
 }
 
 
diff --git a/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoam.H b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoam.H
index c6e365b8af..4a320affd2 100644
--- a/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoam.H
+++ b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoam.H
@@ -160,7 +160,17 @@ class vtkPVFoam
             }
         };
 
-    typedef polyDecomp foamVtuData;
+        //- Bookkeeping for vtkPolyData
+        class foamVtpData
+        {
+        };
+
+        //- Bookkeeping for vtkUnstructuredGrid
+        class foamVtuData
+        :
+            public polyDecomp
+        {
+        };
 
 
     // Private Data
@@ -184,20 +194,26 @@ class vtkPVFoam
         int timeIndex_;
 
         //- Track changes in mesh geometry
-        bool meshChanged_;
+        enum polyMesh::readUpdateState meshState_;
 
         //- Track changes in fields
         bool fieldsChanged_;
 
-        //- Selected geometrical parts (internalMesh, patches, ...)
-        boolList partStatus_;
+        //- The index of selected parts mapped to their names
+        Map<string> selectedPartIds_;
 
         //- Datasets corresponding to selected geometrical pieces
-        //  a negative number indicates that no vtkmesh exists for this piece
-        labelList partDataset_;
+        Map<label> partDataset_;
+
+        //- Any information for 2D (VTP) geometries
+        HashTable<foamVtpData, string> cachedVtp_;
+
+        //- Cell maps and other information for 3D (VTU) geometries
+        HashTable<foamVtuData, string> cachedVtu_;
 
         //- First instance and size of various mesh parts
-        //  used to index into partStatus_ and partDataset_
+        //  used to index into selectedPartIds and thus indirectly into
+        //  cachedVtp, cachedVtu and partDataset
         arrayRange rangeVolume_;
         arrayRange rangePatches_;
         arrayRange rangeLagrangian_;
@@ -208,16 +224,6 @@ class vtkPVFoam
         arrayRange rangeFaceSets_;
         arrayRange rangePointSets_;
 
-        //- Decomposed cells information (mesh regions)
-        //  TODO: regions
-        List<foamVtuData> regionVtus_;
-
-        //- Decomposed cells information (cellZone meshes)
-        List<foamVtuData> zoneVtus_;
-
-        //- Decomposed cells information (cellSet meshes)
-        List<foamVtuData> csetVtus_;
-
         //- List of patch names for rendering to window
         List<vtkSmartPointer<vtkTextActor>> patchTextActors_;
 
@@ -230,19 +236,24 @@ class vtkPVFoam
       // Update information helper functions
 
         //- Internal mesh info
-        void updateInfoInternalMesh(vtkDataArraySelection*);
+        void updateInfoInternalMesh(vtkDataArraySelection* select);
 
         //- Lagrangian info
-        void updateInfoLagrangian(vtkDataArraySelection*);
+        void updateInfoLagrangian(vtkDataArraySelection* select);
 
-        //- Patch info
-        void updateInfoPatches(vtkDataArraySelection*, stringList&);
+        //- Patch info, modifies enabledEntries
+        void updateInfoPatches
+        (
+            vtkDataArraySelection* select,
+            HashSet<string>& enabledEntries
+        );
 
         //- Set info
-        void updateInfoSets(vtkDataArraySelection*);
+        void updateInfoSets(vtkDataArraySelection* select);
 
         //- Zone info
-        void updateInfoZones(vtkDataArraySelection*);
+        void updateInfoZones(vtkDataArraySelection* select);
+
 
         //- Get non-empty zone names for zoneType from file
         wordList getZoneNames(const word& zoneType) const;
@@ -395,8 +406,7 @@ class vtkPVFoam
             const GeometricField<Type, fvPatchField, volMesh>& fld,
             autoPtr<GeometricField<Type, pointPatchField, pointMesh>>& ptfPtr,
             vtkMultiBlockDataSet* output,
-            const arrayRange& range,
-            const List<foamVtuData>& vtuDataList
+            const arrayRange& range
         );
 
         //- Lagrangian fields - all types
@@ -423,8 +433,7 @@ class vtkPVFoam
         (
             const GeometricField<Type, pointPatchField, pointMesh>& pfld,
             vtkMultiBlockDataSet* output,
-            const arrayRange& range,
-            const List<foamVtuData>& vtuDataList
+            const arrayRange& range
         );
 
         //- Point field
@@ -447,8 +456,12 @@ class vtkPVFoam
             const hashedWordList& retain
         );
 
+
+        //- Get the first word from selectedPartIds_
+        word getPartName(const int partId) const;
+
         //- Get the first word from the reader 'parts' selection
-        word getPartName(const int partId);
+        word getReaderPartName(const int partId) const;
 
 
     // Constructors
diff --git a/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamFieldTemplates.C b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamFieldTemplates.C
index db477759f6..70d0bdabe4 100644
--- a/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamFieldTemplates.C
+++ b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamFieldTemplates.C
@@ -84,8 +84,7 @@ void Foam::vtkPVFoam::convertVolField
         fld,
         ptfPtr,
         output,
-        rangeVolume_,
-        regionVtus_
+        rangeVolume_
     );
 
     // Convert activated cellZones
@@ -94,8 +93,7 @@ void Foam::vtkPVFoam::convertVolField
         fld,
         ptfPtr,
         output,
-        rangeCellZones_,
-        zoneVtus_
+        rangeCellZones_
     );
 
     // Convert activated cellSets
@@ -104,21 +102,30 @@ void Foam::vtkPVFoam::convertVolField
         fld,
         ptfPtr,
         output,
-        rangeCellSets_,
-        csetVtus_
+        rangeCellSets_
     );
 
 
     //
     // Convert patches - if activated
+    // - skip field conversion for groups
     //
     for (auto partId : rangePatches_)
     {
+        if
+        (
+            !selectedPartIds_.found(partId)
+         || selectedPartIds_[partId].startsWith("group/")
+        )
+        {
+            continue;
+        }
+
         const word patchName = getPartName(partId);
-        const label datasetNo = partDataset_[partId];
+        const label datasetNo = partDataset_.lookup(partId, -1);
         const label patchId = patches.findPatchID(patchName);
 
-        if (!partStatus_[partId] || patchId < 0)
+        if (patchId < 0)
         {
             continue;
         }
@@ -199,10 +206,15 @@ void Foam::vtkPVFoam::convertVolField
     //
     for (auto partId : rangeFaceZones_)
     {
-        const word zoneName = getPartName(partId);
-        const label datasetNo = partDataset_[partId];
+        if (!selectedPartIds_.found(partId))
+        {
+            continue;
+        }
 
-        if (!partStatus_[partId] || datasetNo < 0)
+        const word zoneName = getPartName(partId);
+        const label datasetNo = partDataset_.lookup(partId, -1);
+
+        if (datasetNo < 0)
         {
             continue;
         }
@@ -239,14 +251,14 @@ void Foam::vtkPVFoam::convertVolField
     //
     for (auto partId : rangeFaceSets_)
     {
-        const word selectName = getPartName(partId);
-        const label datasetNo = partDataset_[partId];
-
-        if (!partStatus_[partId])
+        if (!selectedPartIds_.found(partId))
         {
             continue;
         }
 
+        const word selectName = getPartName(partId);
+        const label datasetNo = partDataset_.lookup(partId, -1);
+
         vtkPolyData* vtkmesh = getDataFromBlock<vtkPolyData>
         (
             output, rangeFaceSets_, datasetNo
@@ -373,23 +385,23 @@ void Foam::vtkPVFoam::convertVolFieldBlock
     const GeometricField<Type, fvPatchField, volMesh>& fld,
     autoPtr<GeometricField<Type, pointPatchField, pointMesh>>& ptfPtr,
     vtkMultiBlockDataSet* output,
-    const arrayRange& range,
-    const List<foamVtuData>& vtuDataList
+    const arrayRange& range
 )
 {
     for (auto partId : range)
     {
-        const label datasetNo = partDataset_[partId];
-
-        if (!partStatus_[partId])
+        if (!selectedPartIds_.found(partId))
         {
             continue;
         }
 
+        const auto& longName = selectedPartIds_[partId];
+        const label datasetNo = partDataset_.lookup(partId, -1);
+
         vtkUnstructuredGrid* vtkmesh =
             getDataFromBlock<vtkUnstructuredGrid>(output, range, datasetNo);
 
-        if (!vtkmesh)
+        if (!vtkmesh || !cachedVtu_.found(longName))
         {
             continue;
         }
@@ -397,13 +409,17 @@ void Foam::vtkPVFoam::convertVolFieldBlock
         vtkSmartPointer<vtkFloatArray> cdata = convertVolFieldToVTK
         (
             fld,
-            vtuDataList[datasetNo]
+            cachedVtu_[longName]
         );
         vtkmesh->GetCellData()->AddArray(cdata);
 
         if (ptfPtr.valid())
         {
-            convertPointField(vtkmesh, ptfPtr(), fld, vtuDataList[datasetNo]);
+            convertPointField
+            (
+                vtkmesh, ptfPtr(), fld,
+                cachedVtu_[longName]
+            );
         }
     }
 }
@@ -446,44 +462,53 @@ void Foam::vtkPVFoam::convertPointFields
         GeometricField<Type, pointPatchField, pointMesh> pfld(*iter(), pMesh);
 
 
-        // Convert activated internalMesh regions
+        // Convert internalMesh (if selected)
         convertPointFieldBlock
         (
             pfld,
             output,
-            rangeVolume_,
-            regionVtus_
+            rangeVolume_
         );
 
-        // Convert activated cellZones
+        // Convert (selected) cellZones
         convertPointFieldBlock
         (
             pfld,
             output,
-            rangeCellZones_,
-            zoneVtus_
+            rangeCellZones_
         );
 
-        // Convert activated cellSets
+        // Convert (selected) cellSets
         convertPointFieldBlock
         (
             pfld,
             output,
-            rangeCellSets_,
-            csetVtus_
+            rangeCellSets_
         );
 
 
         //
-        // Convert patches - if activated
+        // Convert patches (if selected)
         //
         for (auto partId : rangePatches_)
         {
+            if (!selectedPartIds_.found(partId))
+            {
+                continue;
+            }
+            const auto& longName = selectedPartIds_[partId];
+
+            if (longName.startsWith("group/"))
+            {
+                // Skip patch-groups
+                continue;
+            }
+
             const word patchName = getPartName(partId);
-            const label datasetNo = partDataset_[partId];
+            const label datasetNo = partDataset_.lookup(partId, -1);
             const label patchId = patches.findPatchID(patchName);
 
-            if (!partStatus_[partId] || patchId < 0)
+            if (patchId < 0)
             {
                 continue;
             }
@@ -506,15 +531,20 @@ void Foam::vtkPVFoam::convertPointFields
         }
 
         //
-        // Convert faceZones - if activated
+        // Convert (selected) faceZones
         //
         for (auto partId : rangeFaceZones_)
         {
+            if (!selectedPartIds_.found(partId))
+            {
+                continue;
+            }
+
             const word zoneName = getPartName(partId);
-            const label datasetNo = partDataset_[partId];
+            const label datasetNo = partDataset_.lookup(partId, -1);
             const label zoneId = mesh.faceZones().findZoneID(zoneName);
 
-            if (!partStatus_[partId] || zoneId < 0)
+            if (zoneId < 0)
             {
                 continue;
             }
@@ -552,34 +582,35 @@ void Foam::vtkPVFoam::convertPointFieldBlock
 (
     const GeometricField<Type, pointPatchField, pointMesh>& pfld,
     vtkMultiBlockDataSet* output,
-    const arrayRange& range,
-    const List<foamVtuData>& vtuDataList
+    const arrayRange& range
 )
 {
     for (auto partId : range)
     {
-        const label datasetNo = partDataset_[partId];
-
-        if (!partStatus_[partId])
+        if (!selectedPartIds_.found(partId))
         {
             continue;
         }
 
+        const auto& longName = selectedPartIds_[partId];
+        const label datasetNo = partDataset_.lookup(partId, -1);
+
         vtkUnstructuredGrid* vtkmesh = getDataFromBlock<vtkUnstructuredGrid>
         (
             output, range, datasetNo
         );
 
-        if (vtkmesh)
+        if (!vtkmesh || !cachedVtu_.found(longName))
         {
             convertPointField
             (
                 vtkmesh,
                 pfld,
                 GeometricField<Type, fvPatchField, volMesh>::null(),
-                vtuDataList[datasetNo]
+                cachedVtu_[longName]
             );
         }
+
     }
 }
 
@@ -878,16 +909,16 @@ Foam::vtkPVFoam::convertVolFieldToVTK
     }
 
     float vec[nComp];
-    forAll(cellMap, i)
+    forAll(cellMap, idx)
     {
-        const Type& t = fld[cellMap[i]];
+        const Type& t = fld[cellMap[idx]];
         for (direction d=0; d<nComp; ++d)
         {
             vec[d] = component(t, d);
         }
         foamPvFields::remapTuple<Type>(vec);
 
-        fldData->SetTuple(i, vec);
+        fldData->SetTuple(idx, vec);
     }
 
     return fldData;
diff --git a/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamFields.C b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamFields.C
index cbf43d1f4e..697737d74d 100644
--- a/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamFields.C
+++ b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamFields.C
@@ -226,10 +226,15 @@ void Foam::vtkPVFoam::convertLagrangianFields
 
     for (auto partId : range)
     {
-        const word  cloudName = getPartName(partId);
-        const label datasetNo = partDataset_[partId];
+        if (!selectedPartIds_.found(partId))
+        {
+            continue;
+        }
 
-        if (!partStatus_[partId] || datasetNo < 0)
+        const word  cloudName = getPartName(partId);
+        const label datasetNo = partDataset_.lookup(partId, -1);
+
+        if (datasetNo < 0)
         {
             continue;
         }
diff --git a/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamMesh.C b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamMesh.C
index cca044671b..9e202a352e 100644
--- a/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamMesh.C
+++ b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamMesh.C
@@ -53,9 +53,6 @@ void Foam::vtkPVFoam::convertMeshVolume
     label datasetNo = 0;       // restart at dataset 0
     const fvMesh& mesh = *meshPtr_;
 
-    // resize for decomposed polyhedra
-    regionVtus_.setSize(range.size());
-
     if (debug)
     {
         Info<< "<beg> convertMeshVolume" << endl;
@@ -66,23 +63,24 @@ void Foam::vtkPVFoam::convertMeshVolume
     // this looks like more than one part, but it isn't
     for (auto partId : range)
     {
-        const word partName = "internalMesh";
-
-        if (!partStatus_[partId])
+        if (!selectedPartIds_.found(partId))
         {
             continue;
         }
 
+        const auto& longName = selectedPartIds_[partId];
+        const word partName = getPartName(partId);
+
         vtkSmartPointer<vtkUnstructuredGrid> vtkmesh = volumeVTKMesh
         (
             mesh,
-            regionVtus_[datasetNo]
+            cachedVtu_(longName)
         );
 
         if (vtkmesh)
         {
             addToBlock(output, vtkmesh, range, datasetNo, partName);
-            partDataset_[partId] = datasetNo++;
+            partDataset_.set(partId, datasetNo++);
         }
     }
 
@@ -119,20 +117,20 @@ void Foam::vtkPVFoam::convertMeshLagrangian
 
     for (auto partId : range)
     {
-        const word cloudName = getPartName(partId);
-
-        if (!partStatus_[partId])
+        if (!selectedPartIds_.found(partId))
         {
             continue;
         }
 
+        const word cloudName = getPartName(partId);
+
         vtkSmartPointer<vtkPolyData> vtkmesh =
             lagrangianVTKMesh(mesh, cloudName);
 
         if (vtkmesh)
         {
             addToBlock(output, vtkmesh, range, datasetNo, cloudName);
-            partDataset_[partId] = datasetNo++;
+            partDataset_.set(partId, datasetNo++);
         }
     }
 
@@ -170,30 +168,28 @@ void Foam::vtkPVFoam::convertMeshPatches
 
     for (auto partId : range)
     {
-        if (!partStatus_[partId])
+        if (!selectedPartIds_.found(partId))
         {
             continue;
         }
-
-        const word patchName = getPartName(partId);
-
-        labelHashSet
-            patchIds(patches.patchSet(List<wordRe>(1, wordRe(patchName))));
-
-        if (debug)
-        {
-            Info<< "Creating VTK mesh for patches [" << patchIds <<"] "
-                << patchName << endl;
-        }
+        const auto& longName = selectedPartIds_[partId];
+        const word partName = getPartName(partId);
 
         vtkSmartPointer<vtkPolyData> vtkmesh;
-        if (patchIds.size() == 1)
-        {
-            vtkmesh = patchVTKMesh(patchName, patches[patchIds.begin().key()]);
-        }
-        else
+
+        if (longName.startsWith("group/"))
         {
             // Patch group. Collect patch faces.
+
+            const labelList& patchIds =
+                patches.groupPatchIDs().lookup(partName, labelList());
+
+            if (debug)
+            {
+                Info<< "Creating VTK mesh for patches [" << patchIds <<"] "
+                    << longName << endl;
+            }
+
             label sz = 0;
             for (auto id : patchIds)
             {
@@ -210,23 +206,37 @@ void Foam::vtkPVFoam::convertMeshPatches
                 }
             }
 
-            uindirectPrimitivePatch pp
-            (
-                UIndirectList<face>
+            if (faceLabels.size())
+            {
+                uindirectPrimitivePatch pp
                 (
-                    mesh.faces(),
-                    faceLabels
-                ),
-                mesh.points()
-            );
+                    UIndirectList<face>(mesh.faces(), faceLabels),
+                    mesh.points()
+                );
 
-            vtkmesh = patchVTKMesh(patchName, pp);
+                vtkmesh = patchVTKMesh(partName, pp);
+            }
+        }
+        else
+        {
+            const label patchId = patches.findPatchID(partName);
+
+            if (debug)
+            {
+                Info<< "Creating VTK mesh for patch [" << patchId <<"] "
+                    << partName << endl;
+            }
+
+            if (patchId >= 0)
+            {
+                vtkmesh = patchVTKMesh(partName, patches[patchId]);
+            }
         }
 
         if (vtkmesh)
         {
-            addToBlock(output, vtkmesh, range, datasetNo, patchName);
-            partDataset_[partId] = datasetNo++;
+            addToBlock(output, vtkmesh, range, datasetNo, partName);
+            partDataset_.set(partId, datasetNo++);
         }
     }
 
@@ -255,9 +265,6 @@ void Foam::vtkPVFoam::convertMeshCellZones
     label datasetNo = 0;       // restart at dataset 0
     const fvMesh& mesh = *meshPtr_;
 
-    // resize for decomposed polyhedra
-    zoneVtus_.setSize(range.size());
-
     if (range.empty())
     {
         return;
@@ -272,10 +279,16 @@ void Foam::vtkPVFoam::convertMeshCellZones
     const cellZoneMesh& zMesh = mesh.cellZones();
     for (auto partId : range)
     {
+        if (!selectedPartIds_.found(partId))
+        {
+            continue;
+        }
+
+        const auto& longName = selectedPartIds_[partId];
         const word zoneName = getPartName(partId);
         const label  zoneId = zMesh.findZoneID(zoneName);
 
-        if (!partStatus_[partId] || zoneId < 0)
+        if (zoneId < 0)
         {
             continue;
         }
@@ -292,28 +305,28 @@ void Foam::vtkPVFoam::convertMeshCellZones
         vtkSmartPointer<vtkUnstructuredGrid> vtkmesh = volumeVTKMesh
         (
             subsetter.subMesh(),
-            zoneVtus_[datasetNo]
+            cachedVtu_(longName)
         );
 
         if (vtkmesh)
         {
-            // cellMap + addPointCellLabels must contain global cell ids
+            // Convert cellMap, addPointCellLabels to global cell ids
             inplaceRenumber
             (
                 subsetter.cellMap(),
-                zoneVtus_[datasetNo].cellMap()
+                cachedVtu_[longName].cellMap()
             );
             inplaceRenumber
             (
                 subsetter.cellMap(),
-                zoneVtus_[datasetNo].additionalIds()
+                cachedVtu_[longName].additionalIds()
             );
 
             // copy pointMap as well, otherwise pointFields fail
-            zoneVtus_[datasetNo].pointMap() = subsetter.pointMap();
+            cachedVtu_[longName].pointMap() = subsetter.pointMap();
 
             addToBlock(output, vtkmesh, range, datasetNo, zoneName);
-            partDataset_[partId] = datasetNo++;
+            partDataset_.set(partId, datasetNo++);
         }
     }
 
@@ -342,9 +355,6 @@ void Foam::vtkPVFoam::convertMeshCellSets
     label datasetNo = 0;       // restart at dataset 0
     const fvMesh& mesh = *meshPtr_;
 
-    // resize for decomposed polyhedra
-    csetVtus_.setSize(range.size());
-
     if (debug)
     {
         Info<< "<beg> convertMeshCellSets" << endl;
@@ -353,13 +363,14 @@ void Foam::vtkPVFoam::convertMeshCellSets
 
     for (auto partId : range)
     {
-        const word partName = getPartName(partId);
-
-        if (!partStatus_[partId])
+        if (!selectedPartIds_.found(partId))
         {
             continue;
         }
 
+        const auto& longName = selectedPartIds_[partId];
+        const word partName = getPartName(partId);
+
         if (debug)
         {
             Info<< "Creating VTK mesh for cellSet=" << partName << endl;
@@ -372,28 +383,28 @@ void Foam::vtkPVFoam::convertMeshCellSets
         vtkSmartPointer<vtkUnstructuredGrid> vtkmesh = volumeVTKMesh
         (
             subsetter.subMesh(),
-            csetVtus_[datasetNo]
+            cachedVtu_(longName)
         );
 
         if (vtkmesh)
         {
-            // cellMap + addPointCellLabels must contain global cell ids
+            // Convert cellMap, addPointCellLabels to global cell ids
             inplaceRenumber
             (
                 subsetter.cellMap(),
-                csetVtus_[datasetNo].cellMap()
+                cachedVtu_[longName].cellMap()
             );
             inplaceRenumber
             (
                 subsetter.cellMap(),
-                csetVtus_[datasetNo].additionalIds()
+                cachedVtu_[longName].additionalIds()
             );
 
             // copy pointMap as well, otherwise pointFields fail
-            csetVtus_[datasetNo].pointMap() = subsetter.pointMap();
+            cachedVtu_[longName].pointMap() = subsetter.pointMap();
 
             addToBlock(output, vtkmesh, range, datasetNo, partName);
-            partDataset_[partId] = datasetNo++;
+            partDataset_.set(partId, datasetNo++);
         }
     }
 
@@ -436,10 +447,15 @@ void Foam::vtkPVFoam::convertMeshFaceZones
     const faceZoneMesh& zMesh = mesh.faceZones();
     for (auto partId : range)
     {
+        if (!selectedPartIds_.found(partId))
+        {
+            continue;
+        }
+
         const word zoneName = getPartName(partId);
         const label  zoneId = zMesh.findZoneID(zoneName);
 
-        if (!partStatus_[partId] || zoneId < 0)
+        if (zoneId < 0)
         {
             continue;
         }
@@ -456,7 +472,7 @@ void Foam::vtkPVFoam::convertMeshFaceZones
         if (vtkmesh)
         {
             addToBlock(output, vtkmesh, range, datasetNo, zoneName);
-            partDataset_[partId] = datasetNo++;
+            partDataset_.set(partId, datasetNo++);
         }
     }
 
@@ -493,26 +509,24 @@ void Foam::vtkPVFoam::convertMeshFaceSets
 
     for (auto partId : range)
     {
-        const word partName = getPartName(partId);
-
-        if (!partStatus_[partId])
+        if (!selectedPartIds_.found(partId))
         {
             continue;
         }
 
+        const word partName = getPartName(partId);
+
         if (debug)
         {
             Info<< "Creating VTK mesh for faceSet=" << partName << endl;
         }
 
         // faces in sorted order for more reliability
+        const labelList faceLabels = faceSet(mesh, partName).sortedToc();
+
         uindirectPrimitivePatch p
         (
-            UIndirectList<face>
-            (
-                mesh.faces(),
-                faceSet(mesh, partName).sortedToc()
-            ),
+            UIndirectList<face>(mesh.faces(), faceLabels),
             mesh.points()
         );
 
@@ -527,7 +541,7 @@ void Foam::vtkPVFoam::convertMeshFaceSets
         if (vtkmesh)
         {
             addToBlock(output, vtkmesh, range, datasetNo, partName);
-            partDataset_[partId] = datasetNo++;
+            partDataset_.set(partId, datasetNo++);
         }
     }
 
@@ -567,10 +581,15 @@ void Foam::vtkPVFoam::convertMeshPointZones
         const pointZoneMesh& zMesh = mesh.pointZones();
         for (auto partId : range)
         {
+            if (!selectedPartIds_.found(partId))
+            {
+                continue;
+            }
+
             const word zoneName = getPartName(partId);
             const label zoneId = zMesh.findZoneID(zoneName);
 
-            if (!partStatus_[partId] || zoneId < 0)
+            if (zoneId < 0)
             {
                 continue;
             }
@@ -600,7 +619,7 @@ void Foam::vtkPVFoam::convertMeshPointZones
             if (vtkmesh)
             {
                 addToBlock(output, vtkmesh, range, datasetNo, zoneName);
-                partDataset_[partId] = datasetNo++;
+                partDataset_.set(partId, datasetNo++);
             }
         }
     }
@@ -619,7 +638,6 @@ void Foam::vtkPVFoam::convertMeshPointZones
 }
 
 
-
 void Foam::vtkPVFoam::convertMeshPointSets
 (
     vtkMultiBlockDataSet* output,
@@ -639,13 +657,13 @@ void Foam::vtkPVFoam::convertMeshPointSets
 
     for (auto partId : range)
     {
-        const word partName = getPartName(partId);
-
-        if (!partStatus_[partId])
+        if (!selectedPartIds_.found(partId))
         {
             continue;
         }
 
+        const word partName = getPartName(partId);
+
         if (debug)
         {
             Info<< "Creating VTK mesh for pointSet=" << partName << endl;
@@ -676,7 +694,7 @@ void Foam::vtkPVFoam::convertMeshPointSets
         if (vtkmesh)
         {
             addToBlock(output, vtkmesh, range, datasetNo, partName);
-            partDataset_[partId] = datasetNo++;
+            partDataset_.set(partId, datasetNo++);
         }
     }
 
diff --git a/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamUpdateInfo.C b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamUpdateInfo.C
index 338fc0c865..d344d949d4 100644
--- a/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamUpdateInfo.C
+++ b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamUpdateInfo.C
@@ -136,7 +136,7 @@ Foam::wordList Foam::vtkPVFoam::getZoneNames(const word& zoneType) const
 
 void Foam::vtkPVFoam::updateInfoInternalMesh
 (
-    vtkDataArraySelection* arraySelection
+    vtkDataArraySelection* select
 )
 {
     if (debug)
@@ -146,8 +146,8 @@ void Foam::vtkPVFoam::updateInfoInternalMesh
 
     // Determine mesh parts (internalMesh, patches...)
     //- Add internal mesh as first entry
-    rangeVolume_.reset(arraySelection->GetNumberOfArrays(), 1);
-    arraySelection->AddArray("internalMesh");
+    rangeVolume_.reset(select->GetNumberOfArrays(), 1);
+    select->AddArray("internalMesh");
 
     if (debug)
     {
@@ -158,7 +158,7 @@ void Foam::vtkPVFoam::updateInfoInternalMesh
 
 void Foam::vtkPVFoam::updateInfoLagrangian
 (
-    vtkDataArraySelection* arraySelection
+    vtkDataArraySelection* select
 )
 {
     if (debug)
@@ -167,7 +167,6 @@ void Foam::vtkPVFoam::updateInfoLagrangian
             << "    " << dbPtr_->timePath()/cloud::prefix << endl;
     }
 
-
     // use the db directly since this might be called without a mesh,
     // but the region must get added back in
     fileName lagrangianPrefix(cloud::prefix);
@@ -182,11 +181,11 @@ void Foam::vtkPVFoam::updateInfoLagrangian
         readDir(dbPtr_->timePath()/lagrangianPrefix, fileName::DIRECTORY)
     );
 
-    rangeLagrangian_.reset(arraySelection->GetNumberOfArrays());
+    rangeLagrangian_.reset(select->GetNumberOfArrays());
     forAll(cloudDirs, cloudi)
     {
         // Add cloud to GUI list
-        arraySelection->AddArray
+        select->AddArray
         (
             ("lagrangian/" + cloudDirs[cloudi]).c_str()
         );
@@ -202,8 +201,8 @@ void Foam::vtkPVFoam::updateInfoLagrangian
 
 void Foam::vtkPVFoam::updateInfoPatches
 (
-    vtkDataArraySelection* arraySelection,
-    stringList& enabledEntries
+    vtkDataArraySelection* select,
+    HashSet<string>& enabledEntries
 )
 {
     if (debug)
@@ -212,14 +211,13 @@ void Foam::vtkPVFoam::updateInfoPatches
             << " [meshPtr=" << (meshPtr_ ? "set" : "null") << "]" << endl;
     }
 
-    HashSet<string> enabledEntriesSet(enabledEntries);
-
-    rangePatches_.reset(arraySelection->GetNumberOfArrays());
+    rangePatches_.reset(select->GetNumberOfArrays());
 
     if (meshPtr_)
     {
         const polyBoundaryMesh& patches = meshPtr_->boundaryMesh();
         const HashTable<labelList>& groups = patches.groupPatchIDs();
+        DynamicList<string> displayNames(groups.size());
 
         // Add (non-zero) patch groups to the list of mesh parts
         // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -243,29 +241,38 @@ void Foam::vtkPVFoam::updateInfoPatches
 
             // Valid patch if nFace > 0 - add patch to GUI list
             const string dpyName = "group/" + groupName;
-            arraySelection->AddArray(dpyName.c_str());
-            ++rangePatches_;
+            displayNames.append(dpyName);
 
-            if (enabledEntriesSet.found(dpyName))
+            // Optionally replace group with patch name selections
+            // - must remove the group from the select itself, otherwise
+            //   it can toggle on, but not toggle off very well
+            if
+            (
+                !reader_->GetShowGroupsOnly()
+             && enabledEntries.erase(dpyName)
+            )
             {
-                if (!reader_->GetShowGroupsOnly())
+                for (auto patchId : patchIDs)
                 {
-                    enabledEntriesSet.erase(dpyName);
-                    for (auto patchId : patchIDs)
+                    const polyPatch& pp = patches[patchId];
+                    if (pp.size())
                     {
-                        const polyPatch& pp = patches[patchId];
-                        if (pp.size())
-                        {
-                            enabledEntriesSet.insert
-                            (
-                                "patch/" + pp.name()
-                            );
-                        }
+                        enabledEntries.insert
+                        (
+                            "patch/" + pp.name()
+                        );
                     }
                 }
             }
         }
 
+        // Sort group names
+        Foam::sort(displayNames);
+        for (const auto& name : displayNames)
+        {
+            select->AddArray(name.c_str());
+            ++rangePatches_;
+        }
 
         // Add (non-zero) patches to the list of mesh parts
         // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -279,7 +286,7 @@ void Foam::vtkPVFoam::updateInfoPatches
                 if (pp.size())
                 {
                     // Add patch to GUI list
-                    arraySelection->AddArray
+                    select->AddArray
                     (
                         ("patch/" + pp.name()).c_str()
                     );
@@ -308,36 +315,24 @@ void Foam::vtkPVFoam::updateInfoPatches
             false
         );
 
-        // this should only ever fail if the mesh region doesn't exist
+        // This should only ever fail if the mesh region doesn't exist
         if (ioObj.typeHeaderOk<polyBoundaryMesh>(true, false))
         {
             polyBoundaryMeshEntries patchEntries(ioObj);
 
-            // Read patches and determine sizes
-            // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
+            // Read patches, determine sizes and patch groups
             wordList names(patchEntries.size());
             labelList sizes(patchEntries.size());
-
-            forAll(patchEntries, patchi)
-            {
-                const dictionary& patchDict = patchEntries[patchi].dict();
-
-                sizes[patchi] = readLabel(patchDict.lookup("nFaces"));
-                names[patchi] = patchEntries[patchi].keyword();
-            }
-
-
-            // Add (non-zero) patch groups to the list of mesh parts
-            // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-            HashTable<labelHashSet> groups(patchEntries.size());
+            HashTable<labelHashSet> groups(2*patchEntries.size());
 
             forAll(patchEntries, patchi)
             {
                 const dictionary& patchDict = patchEntries[patchi].dict();
                 wordList groupNames;
 
+                sizes[patchi] = readLabel(patchDict.lookup("nFaces"));
+                names[patchi] = patchEntries[patchi].keyword();
+
                 if
                 (
                     sizes[patchi]  // Valid patch if nFace > 0
@@ -351,26 +346,31 @@ void Foam::vtkPVFoam::updateInfoPatches
                 }
             }
 
+
+            // Add (non-zero) patch groups to the list of mesh parts
+            // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            DynamicList<string> displayNames(groups.size());
+
             forAllConstIters(groups, iter)
             {
                 const auto& groupName = iter.key();
                 const auto& patchIDs  = iter.object();
 
                 const string dpyName = "group/" + groupName;
-                arraySelection->AddArray(dpyName.c_str());
-                ++rangePatches_;
+                displayNames.append(dpyName);
 
-                // Optionally replace with patch name selection
+                // Optionally replace group with patch name selections
+                // - must remove the group from the select itself, otherwise
+                //   it can toggle on, but not toggle off very well
                 if
                 (
-                    enabledEntriesSet.found(dpyName)
-                 && !reader_->GetShowGroupsOnly()
+                    !reader_->GetShowGroupsOnly()
+                 && enabledEntries.erase(dpyName)
                 )
                 {
-                    enabledEntriesSet.erase(dpyName);
                     for (auto patchId : patchIDs)
                     {
-                        enabledEntriesSet.insert
+                        enabledEntries.insert
                         (
                             "patch/" + names[patchId]
                         );
@@ -378,6 +378,13 @@ void Foam::vtkPVFoam::updateInfoPatches
                 }
             }
 
+            // Sort group names
+            Foam::sort(displayNames);
+            for (const auto& name : displayNames)
+            {
+                select->AddArray(name.c_str());
+                ++rangePatches_;
+            }
 
             // Add (non-zero) patches to the list of mesh parts
             // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -389,7 +396,7 @@ void Foam::vtkPVFoam::updateInfoPatches
                     // Valid patch if nFace > 0 - add patch to GUI list
                     if (sizes[patchi])
                     {
-                        arraySelection->AddArray
+                        select->AddArray
                         (
                             ("patch/" + names[patchi]).c_str()
                         );
@@ -400,9 +407,6 @@ void Foam::vtkPVFoam::updateInfoPatches
         }
     }
 
-    // Update enabled entries in case of group selection
-    enabledEntries = enabledEntriesSet.toc();
-
     if (debug)
     {
         Info<< "<end> updateInfoPatches" << endl;
@@ -412,7 +416,7 @@ void Foam::vtkPVFoam::updateInfoPatches
 
 void Foam::vtkPVFoam::updateInfoZones
 (
-    vtkDataArraySelection* arraySelection
+    vtkDataArraySelection* select
 )
 {
     if (!reader_->GetIncludeZones())
@@ -440,10 +444,10 @@ void Foam::vtkPVFoam::updateInfoZones
         namesLst = getZoneNames("cellZones");
     }
 
-    rangeCellZones_.reset(arraySelection->GetNumberOfArrays());
+    rangeCellZones_.reset(select->GetNumberOfArrays());
     forAll(namesLst, elemI)
     {
-        arraySelection->AddArray
+        select->AddArray
         (
             ("cellZone/" + namesLst[elemI]).c_str()
         );
@@ -463,10 +467,10 @@ void Foam::vtkPVFoam::updateInfoZones
         namesLst = getZoneNames("faceZones");
     }
 
-    rangeFaceZones_.reset(arraySelection->GetNumberOfArrays());
+    rangeFaceZones_.reset(select->GetNumberOfArrays());
     forAll(namesLst, elemI)
     {
-        arraySelection->AddArray
+        select->AddArray
         (
             ("faceZone/" + namesLst[elemI]).c_str()
         );
@@ -486,10 +490,10 @@ void Foam::vtkPVFoam::updateInfoZones
         namesLst = getZoneNames("pointZones");
     }
 
-    rangePointZones_.reset(arraySelection->GetNumberOfArrays());
+    rangePointZones_.reset(select->GetNumberOfArrays());
     forAll(namesLst, elemI)
     {
-        arraySelection->AddArray
+        select->AddArray
         (
             ("pointZone/" + namesLst[elemI]).c_str()
         );
@@ -505,7 +509,7 @@ void Foam::vtkPVFoam::updateInfoZones
 
 void Foam::vtkPVFoam::updateInfoSets
 (
-    vtkDataArraySelection* arraySelection
+    vtkDataArraySelection* select
 )
 {
     if (!reader_->GetIncludeSets())
@@ -545,26 +549,26 @@ void Foam::vtkPVFoam::updateInfoSets
     }
 
 
-    rangeCellSets_.reset(arraySelection->GetNumberOfArrays());
+    rangeCellSets_.reset(select->GetNumberOfArrays());
     rangeCellSets_ += addToSelection<cellSet>
     (
-        arraySelection,
+        select,
         objects,
         "cellSet/"
     );
 
-    rangeFaceSets_.reset(arraySelection->GetNumberOfArrays());
+    rangeFaceSets_.reset(select->GetNumberOfArrays());
     rangeFaceSets_ += addToSelection<faceSet>
     (
-        arraySelection,
+        select,
         objects,
         "faceSet/"
     );
 
-    rangePointSets_.reset(arraySelection->GetNumberOfArrays());
+    rangePointSets_.reset(select->GetNumberOfArrays());
     rangePointSets_ += addToSelection<pointSet>
     (
-        arraySelection,
+        select,
         objects,
         "pointSet/"
     );
@@ -586,8 +590,8 @@ void Foam::vtkPVFoam::updateInfoLagrangianFields
         Info<< "<beg> updateInfoLagrangianFields" << endl;
     }
 
-    // preserve the enabled selections
-    stringList enabledEntries = getSelectedArrayEntries(select);
+    // Preserve the enabled selections
+    HashSet<string> enabledEntries = getSelectedArrayEntries(select);
     select->RemoveAllArrays();
 
     // TODO - currently only get fields from ONE cloud
@@ -600,8 +604,9 @@ void Foam::vtkPVFoam::updateInfoLagrangianFields
         return;
     }
 
-    int partId = range.start();
-    word cloudName = getPartName(partId);
+    // Add Lagrangian fields even if particles are not enabled?
+    const int partId = range.start();
+    const word cloudName = getReaderPartName(partId);
 
     // use the db directly since this might be called without a mesh,
     // but the region must get added back in
@@ -625,7 +630,7 @@ void Foam::vtkPVFoam::updateInfoLagrangianFields
     addToSelection<IOField<symmTensor>>(select, objects);
     addToSelection<IOField<tensor>>(select, objects);
 
-    // restore the enabled selections
+    // Restore the enabled selections
     setSelectedArrayEntries(select, enabledEntries);
 
     if (debug > 1)
diff --git a/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamUpdateTemplates.C b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamUpdateTemplates.C
index 1d2b429467..5f4d78a163 100644
--- a/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamUpdateTemplates.C
+++ b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamUpdateTemplates.C
@@ -45,7 +45,7 @@ void Foam::vtkPVFoam::updateInfoFields
             << endl;
     }
 
-    stringList enabledEntries;
+    HashSet<string> enabledEntries;
     if (!select->GetNumberOfArrays() && !meshPtr_)
     {
         // enable 'p' and 'U' only on the first call
@@ -126,7 +126,7 @@ void Foam::vtkPVFoam::updateInfoFields
     );
 
 
-    // restore the enabled selections
+    // Restore the enabled selections
     setSelectedArrayEntries(select, enabledEntries);
 
     if (debug)
diff --git a/applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/vtkPVblockMesh/vtkPVblockMesh.C b/applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/vtkPVblockMesh/vtkPVblockMesh.C
index 4d85e72982..d5cddbae3b 100644
--- a/applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/vtkPVblockMesh/vtkPVblockMesh.C
+++ b/applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/vtkPVblockMesh/vtkPVblockMesh.C
@@ -303,10 +303,11 @@ void Foam::vtkPVblockMesh::updateInfo()
     vtkDataArraySelection* blockSelection = reader_->GetBlockSelection();
     vtkDataArraySelection* edgeSelection  = reader_->GetCurvedEdgesSelection();
 
-    // preserve the enabled selections if possible
-    stringList enabledParts;
-    stringList enabledEdges;
     const bool firstTime = (!blockSelection->GetNumberOfArrays() && !meshPtr_);
+
+    // Preserve the enabled selections if possible
+    HashSet<string> enabledParts;
+    HashSet<string> enabledEdges;
     if (!firstTime)
     {
         enabledParts = getSelectedArrayEntries(blockSelection);
@@ -326,7 +327,7 @@ void Foam::vtkPVblockMesh::updateInfo()
     // Update curved edges list
     updateInfoEdges(edgeSelection);
 
-    // restore the enabled selections
+    // Restore the enabled selections
     if (!firstTime)
     {
         setSelectedArrayEntries(blockSelection, enabledParts);
diff --git a/applications/utilities/postProcessing/graphics/PVReaders/foamPv/foamPvCore.C b/applications/utilities/postProcessing/graphics/PVReaders/foamPv/foamPvCore.C
index a9a4d1940d..d9c0373460 100644
--- a/applications/utilities/postProcessing/graphics/PVReaders/foamPv/foamPvCore.C
+++ b/applications/utilities/postProcessing/graphics/PVReaders/foamPv/foamPvCore.C
@@ -194,22 +194,22 @@ Foam::hashedWordList Foam::foamPvCore::getSelected
 }
 
 
-Foam::stringList Foam::foamPvCore::getSelectedArrayEntries
+Foam::HashSet<Foam::string>
+Foam::foamPvCore::getSelectedArrayEntries
 (
     vtkDataArraySelection* select
 )
 {
-    stringList selections(select->GetNumberOfArrays());
-    label nElem = 0;
+    const int n = select->GetNumberOfArrays();
+    HashSet<string> selections(2*n);
 
-    forAll(selections, elemI)
+    for (int i=0; i < n; ++i)
     {
-        if (select->GetArraySetting(elemI))
+        if (select->GetArraySetting(i))
         {
-            selections[nElem++] = select->GetArrayName(elemI);
+            selections.insert(select->GetArrayName(i));
         }
     }
-    selections.setSize(nElem);
 
     if (debug > 1)
     {
@@ -221,9 +221,9 @@ Foam::stringList Foam::foamPvCore::getSelectedArrayEntries
         }
         Info<< " )\nselected(";
 
-        forAll(selections, elemI)
+        for (auto k : selections)
         {
-            Info<< " " << selections[elemI];
+            Info<< " " << k;
         }
         Info<< " )\n";
     }
@@ -232,65 +232,61 @@ Foam::stringList Foam::foamPvCore::getSelectedArrayEntries
 }
 
 
-Foam::stringList Foam::foamPvCore::getSelectedArrayEntries
+Foam::HashSet<Foam::string>
+Foam::foamPvCore::getSelectedArrayEntries
 (
     vtkDataArraySelection* select,
-    const arrayRange& selector
+    const arrayRange& slice
 )
 {
-    stringList selections(selector.size());
-    label nElem = 0;
+    const int n = select->GetNumberOfArrays();
+    HashSet<string> enabled(2*n);
 
-    for (auto i : selector)
+    for (auto i : slice)
     {
         if (select->GetArraySetting(i))
         {
-            selections[nElem++] = select->GetArrayName(i);
+            enabled.insert(select->GetArrayName(i));
         }
     }
-    selections.setSize(nElem);
 
     if (debug > 1)
     {
         Info<< "available(";
-        for (auto i : selector)
+        for (auto i : slice)
         {
             Info<< " \"" << select->GetArrayName(i) << "\"";
         }
         Info<< " )\nselected(";
 
-        forAll(selections, elemI)
+        for (auto k : enabled)
         {
-            Info<< " " << selections[elemI];
+            Info<< " " << k;
         }
         Info<< " )\n";
     }
 
-    return selections;
+    return enabled;
 }
 
 
 void Foam::foamPvCore::setSelectedArrayEntries
 (
     vtkDataArraySelection* select,
-    const stringList& selections
+    const HashSet<string>& enabled
 )
 {
     const int n = select->GetNumberOfArrays();
+    // disable everything not explicitly enabled
     select->DisableAllArrays();
 
-    // Loop through entries, setting values from selectedEntries
+    // Loop through entries, enabling as required
     for (int i=0; i < n; ++i)
     {
-        const string arrayName(select->GetArrayName(i));
-
-        forAll(selections, elemI)
+        const char* arrayName = select->GetArrayName(i);
+        if (enabled.found(arrayName))
         {
-            if (selections[elemI] == arrayName)
-            {
-                select->EnableArray(arrayName.c_str());
-                break;
-            }
+            select->EnableArray(arrayName);
         }
     }
 }
diff --git a/applications/utilities/postProcessing/graphics/PVReaders/foamPv/foamPvCore.H b/applications/utilities/postProcessing/graphics/PVReaders/foamPv/foamPvCore.H
index 8a81633408..6243d5343c 100644
--- a/applications/utilities/postProcessing/graphics/PVReaders/foamPv/foamPvCore.H
+++ b/applications/utilities/postProcessing/graphics/PVReaders/foamPv/foamPvCore.H
@@ -39,6 +39,7 @@ SourceFiles
 #include "pointList.H"
 #include "wordList.H"
 #include "Hash.H"
+#include "HashSet.H"
 #include "hashedWordList.H"
 #include "labelRange.H"
 
@@ -208,25 +209,25 @@ public:
     );
 
 
-    //- Retrieve the current selections
-    static stringList getSelectedArrayEntries
+    //- Retrieve the currently enabled selections
+    static HashSet<string> getSelectedArrayEntries
     (
         vtkDataArraySelection* select
     );
 
-    //- Retrieve a sub-list of the current selections
-    static stringList getSelectedArrayEntries
+    //- Retrieve a sub-list of the currently enabled selections
+    static HashSet<string> getSelectedArrayEntries
     (
         vtkDataArraySelection* select,
-        const arrayRange& selector
+        const arrayRange& slice
     );
 
 
-    //- Set selection(s)
+    //- Enable the selection(s)
     static void setSelectedArrayEntries
     (
         vtkDataArraySelection* select,
-        const stringList& selections
+        const HashSet<string>& enabled
     );
 
 

From 2f288cfbef59e07d5f2895a0fffae57b796e0161 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Mon, 15 May 2017 02:06:53 +0200
Subject: [PATCH 10/27] ENH: first pv reader version with delayed assembly of
 output blocks

- this greatly simplifies data management and opens the possibility of
  reusing converted vtk meshes instead of converting each time.
---
 .../PVFoamReader/vtkPVFoam/vtkPVFoam.C        | 131 +++++--
 .../PVFoamReader/vtkPVFoam/vtkPVFoam.H        |  80 ++--
 .../vtkPVFoam/vtkPVFoamFieldTemplates.C       | 278 +++++---------
 .../PVFoamReader/vtkPVFoam/vtkPVFoamFields.C  |  64 ++--
 .../PVFoamReader/vtkPVFoam/vtkPVFoamMesh.C    | 342 ++++++------------
 .../graphics/PVReaders/foamPv/foamPvCore.C    |  22 --
 .../graphics/PVReaders/foamPv/foamPvCore.H    |  17 -
 .../PVReaders/foamPv/foamPvCoreTemplates.C    |  27 --
 8 files changed, 360 insertions(+), 601 deletions(-)

diff --git a/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoam.C b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoam.C
index bade666a7a..c2b9793dc1 100644
--- a/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoam.C
+++ b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoam.C
@@ -38,6 +38,7 @@ License
 #include "vtkTextActor.h"
 #include "vtkTextProperty.h"
 #include "vtkSmartPointer.h"
+#include "vtkInformation.h"
 
 // Templates (only needed here)
 #include "vtkPVFoamUpdateTemplates.C"
@@ -117,6 +118,70 @@ void Foam::vtkPVFoam::resetCounters()
 }
 
 
+template<class Container>
+bool Foam::vtkPVFoam::addOutputBlock
+(
+    vtkMultiBlockDataSet* output,
+    const HashTable<Container, string>& cache,
+    const arrayRange& selector,
+    const bool singleDataset
+) const
+{
+    const auto blockNo = output->GetNumberOfBlocks();
+    vtkSmartPointer<vtkMultiBlockDataSet> block;
+    int datasetNo = 0;
+
+    for (auto partId : selector)
+    {
+        if (selectedPartIds_.found(partId))
+        {
+            const auto& longName = selectedPartIds_[partId];
+            const word shortName = getPartName(partId);
+
+            auto iter = cache.find(longName);
+            if (iter.found() && (*iter).vtkmesh)
+            {
+                auto dataset = (*iter).vtkmesh;
+
+                if (singleDataset)
+                {
+                    output->SetBlock(blockNo, dataset);
+                    output->GetMetaData(blockNo)->Set
+                    (
+                        vtkCompositeDataSet::NAME(),
+                        shortName.c_str()
+                    );
+
+                    ++datasetNo;
+                    break;
+                }
+                else if (datasetNo == 0)
+                {
+                    block = vtkSmartPointer<vtkMultiBlockDataSet>::New();
+                    output->SetBlock(blockNo, block);
+                    output->GetMetaData(blockNo)->Set
+                    (
+                        vtkCompositeDataSet::NAME(),
+                        selector.name()
+                    );
+                }
+
+                block->SetBlock(datasetNo, dataset);
+                block->GetMetaData(datasetNo)->Set
+                (
+                    vtkCompositeDataSet::NAME(),
+                    shortName.c_str()
+                );
+
+                ++datasetNo;
+            }
+        }
+    }
+
+    return datasetNo;
+}
+
+
 int Foam::vtkPVFoam::setTime(int nRequest, const double requestTimes[])
 {
     Time& runTime = dbPtr_();
@@ -417,11 +482,6 @@ void Foam::vtkPVFoam::Update
 
     // Set up mesh parts selection(s)
     {
-        if (debug)
-        {
-            Info<< "<beg> updateMeshPartsStatus" << endl;
-        }
-
         vtkDataArraySelection* selection = reader_->GetPartSelection();
         const int n = selection->GetNumberOfArrays();
 
@@ -464,11 +524,6 @@ void Foam::vtkPVFoam::Update
                     << " : " << str << nl;
             }
         }
-
-        if (debug)
-        {
-            Info<< "<end> updateMeshPartsStatus" << endl;
-        }
     }
 
     reader_->UpdateProgress(0.15);
@@ -538,49 +593,51 @@ void Foam::vtkPVFoam::Update
     cachedVtp_.retain(nowActive);
     cachedVtu_.retain(nowActive);
 
-    // Reset (expire) dataset ids
-    partDataset_.clear();
-
-    // Convert meshes - start port0 at block=0
-    int blockNo = 0;
-
-    convertMeshVolume(output, blockNo);
-    convertMeshPatches(output, blockNo);
+    convertMeshVolume();
+    convertMeshPatches();
     reader_->UpdateProgress(0.6);
 
     if (reader_->GetIncludeZones())
     {
-        convertMeshCellZones(output, blockNo);
-        convertMeshFaceZones(output, blockNo);
-        convertMeshPointZones(output, blockNo);
+        convertMeshCellZones();
+        convertMeshFaceZones();
+        convertMeshPointZones();
         reader_->UpdateProgress(0.65);
     }
 
     if (reader_->GetIncludeSets())
     {
-        convertMeshCellSets(output, blockNo);
-        convertMeshFaceSets(output, blockNo);
-        convertMeshPointSets(output, blockNo);
+        convertMeshCellSets();
+        convertMeshFaceSets();
+        convertMeshPointSets();
         reader_->UpdateProgress(0.7);
     }
 
-    if (outputLagrangian)
-    {
-        // Lagrangian dual port - restart port1 at block=0
-        blockNo = 0;
-        convertMeshLagrangian(outputLagrangian, blockNo);
-    }
-    else
-    {
-        convertMeshLagrangian(output, blockNo);
-    }
+    convertMeshLagrangian();
 
     reader_->UpdateProgress(0.8);
 
     // Update fields
-    convertVolFields(output);
-    convertPointFields(output);
-    convertLagrangianFields(outputLagrangian ? outputLagrangian : output);
+    convertVolFields();
+    convertPointFields();
+    convertLagrangianFields();
+
+
+    // Assemble multiblock output
+    addOutputBlock(output, cachedVtu_, rangeVolume_, true); // One dataset
+    addOutputBlock(output, cachedVtp_, rangePatches_);
+    addOutputBlock(output, cachedVtu_, rangeCellZones_);
+    addOutputBlock(output, cachedVtp_, rangeFaceZones_);
+    addOutputBlock(output, cachedVtp_, rangePointZones_);
+    addOutputBlock(output, cachedVtu_, rangeCellSets_);
+    addOutputBlock(output, cachedVtp_, rangeFaceSets_);
+    addOutputBlock(output, cachedVtp_, rangePointSets_);
+    addOutputBlock
+    (
+        (outputLagrangian ? outputLagrangian : output),
+        cachedVtp_,
+        rangeLagrangian_
+    );
 
     if (debug)
     {
diff --git a/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoam.H b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoam.H
index 4a320affd2..0c520515ba 100644
--- a/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoam.H
+++ b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoam.H
@@ -55,6 +55,10 @@ SourceFiles
 #include "volPointInterpolation.H"
 #include "foamPvCore.H"
 
+#include "vtkSmartPointer.h"
+#include "vtkPolyData.h"
+#include "vtkUnstructuredGrid.h"
+
 // * * * * * * * * * * * * * Forward Declarations  * * * * * * * * * * * * * //
 
 class vtkDataArraySelection;
@@ -65,11 +69,8 @@ class vtkPVFoamReader;
 class vtkRenderer;
 class vtkTextActor;
 class vtkMultiBlockDataSet;
-class vtkPolyData;
-class vtkUnstructuredGrid;
 class vtkIndent;
 
-template<class T> class vtkSmartPointer;
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -82,6 +83,7 @@ class Time;
 class fvMesh;
 class IOobjectList;
 class polyPatch;
+class fvMeshSubset;
 
 template<class Type> class IOField;
 template<class Type> class Field;
@@ -160,16 +162,19 @@ class vtkPVFoam
             }
         };
 
+
         //- Bookkeeping for vtkPolyData
         class foamVtpData
         {
+        public:
+            vtkSmartPointer<vtkPolyData> vtkmesh;
         };
 
         //- Bookkeeping for vtkUnstructuredGrid
-        class foamVtuData
-        :
-            public polyDecomp
+        class foamVtuData : public polyDecomp
         {
+        public:
+            vtkSmartPointer<vtkUnstructuredGrid> vtkmesh;
         };
 
 
@@ -202,9 +207,6 @@ class vtkPVFoam
         //- The index of selected parts mapped to their names
         Map<string> selectedPartIds_;
 
-        //- Datasets corresponding to selected geometrical pieces
-        Map<label> partDataset_;
-
         //- Any information for 2D (VTP) geometries
         HashTable<foamVtpData, string> cachedVtp_;
 
@@ -213,7 +215,7 @@ class vtkPVFoam
 
         //- First instance and size of various mesh parts
         //  used to index into selectedPartIds and thus indirectly into
-        //  cachedVtp, cachedVtu and partDataset
+        //  cachedVtp, cachedVtu
         arrayRange rangeVolume_;
         arrayRange rangePatches_;
         arrayRange rangeLagrangian_;
@@ -230,6 +232,16 @@ class vtkPVFoam
 
     // Private Member Functions
 
+        template<class Container>
+        bool addOutputBlock
+        (
+            vtkMultiBlockDataSet* output,
+            const HashTable<Container, string>& cache,
+            const arrayRange& selector,
+            const bool singleDataset = false
+        ) const;
+
+
         //- Reset data counters
         void resetCounters();
 
@@ -279,31 +291,38 @@ class vtkPVFoam
       // Mesh conversion functions
 
         //- Convert volume mesh
-        void convertMeshVolume(vtkMultiBlockDataSet* output, int& blockNo);
+        void convertMeshVolume();
 
         //- Convert Lagrangian points
-        void convertMeshLagrangian(vtkMultiBlockDataSet* output, int& blockNo);
+        void convertMeshLagrangian();
 
         //- Convert mesh patches
-        void convertMeshPatches(vtkMultiBlockDataSet* output, int& blockNo);
+        void convertMeshPatches();
+
+        //- Convert subsetted mesh
+        void convertMeshSubset
+        (
+            const fvMeshSubset& subsetter,
+            const string& longName
+        );
 
         //- Convert cell zones
-        void convertMeshCellZones(vtkMultiBlockDataSet* output, int& blockNo);
+        void convertMeshCellZones();
 
         //- Convert face zones
-        void convertMeshFaceZones(vtkMultiBlockDataSet* output, int& blockNo);
+        void convertMeshFaceZones();
 
         //- Convert point zones
-        void convertMeshPointZones(vtkMultiBlockDataSet* output, int& blockNo);
+        void convertMeshPointZones();
 
         //- Convert cell sets
-        void convertMeshCellSets(vtkMultiBlockDataSet* output, int& blockNo);
+        void convertMeshCellSets();
 
         //- Convert face sets
-        void convertMeshFaceSets(vtkMultiBlockDataSet* output, int& blockNo);
+        void convertMeshFaceSets();
 
         //- Convert point sets
-        void convertMeshPointSets(vtkMultiBlockDataSet* output, int& blockNo);
+        void convertMeshPointSets();
 
 
       // Add mesh functions
@@ -359,13 +378,13 @@ class vtkPVFoam
 
 
         //- Convert volume fields
-        void convertVolFields(vtkMultiBlockDataSet* output);
+        void convertVolFields();
 
         //- Convert point fields
-        void convertPointFields(vtkMultiBlockDataSet* output);
+        void convertPointFields();
 
         //- Convert Lagrangian fields
-        void convertLagrangianFields(vtkMultiBlockDataSet* output);
+        void convertLagrangianFields();
 
 
       // Convert OpenFOAM fields
@@ -375,8 +394,7 @@ class vtkPVFoam
         void convertVolField
         (
             const PtrList<patchInterpolator>& patchInterpList,
-            const GeometricField<Type, fvPatchField, volMesh>& fld,
-            vtkMultiBlockDataSet* output
+            const GeometricField<Type, fvPatchField, volMesh>& fld
         );
 
         //- Volume fields - all types
@@ -385,8 +403,7 @@ class vtkPVFoam
         (
             const fvMesh& mesh,
             const PtrList<patchInterpolator>& patchInterpList,
-            const IOobjectList& objects,
-            vtkMultiBlockDataSet* output
+            const IOobjectList& objects
         );
 
         //- Volume internal fields (DimensionedField)- all types
@@ -395,8 +412,7 @@ class vtkPVFoam
         (
             const fvMesh& mesh,
             const PtrList<patchInterpolator>& patchInterpList,
-            const IOobjectList& objects,
-            vtkMultiBlockDataSet* output
+            const IOobjectList& objects
         );
 
         //- Volume field - all selected parts
@@ -405,7 +421,6 @@ class vtkPVFoam
         (
             const GeometricField<Type, fvPatchField, volMesh>& fld,
             autoPtr<GeometricField<Type, pointPatchField, pointMesh>>& ptfPtr,
-            vtkMultiBlockDataSet* output,
             const arrayRange& range
         );
 
@@ -414,8 +429,7 @@ class vtkPVFoam
         void convertLagrangianFields
         (
             const IOobjectList& objects,
-            vtkMultiBlockDataSet* output,
-            const label datasetNo
+            vtkPolyData* vtkmesh
         );
 
         //- Point fields - all types
@@ -423,8 +437,7 @@ class vtkPVFoam
         void convertPointFields
         (
             const pointMesh& pMesh,
-            const IOobjectList& objects,
-            vtkMultiBlockDataSet* output
+            const IOobjectList& objectst
         );
 
         //- Point field - all selected parts
@@ -432,7 +445,6 @@ class vtkPVFoam
         void convertPointFieldBlock
         (
             const GeometricField<Type, pointPatchField, pointMesh>& pfld,
-            vtkMultiBlockDataSet* output,
             const arrayRange& range
         );
 
diff --git a/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamFieldTemplates.C b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamFieldTemplates.C
index 70d0bdabe4..3df2eb9925 100644
--- a/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamFieldTemplates.C
+++ b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamFieldTemplates.C
@@ -53,8 +53,7 @@ template<class Type>
 void Foam::vtkPVFoam::convertVolField
 (
     const PtrList<patchInterpolator>& patchInterpList,
-    const GeometricField<Type, fvPatchField, volMesh>& fld,
-    vtkMultiBlockDataSet* output
+    const GeometricField<Type, fvPatchField, volMesh>& fld
 )
 {
     const fvMesh& mesh = fld.mesh();
@@ -78,38 +77,12 @@ void Foam::vtkPVFoam::convertVolField
         );
     }
 
-    // Convert activated internalMesh regions
-    convertVolFieldBlock
-    (
-        fld,
-        ptfPtr,
-        output,
-        rangeVolume_
-    );
-
-    // Convert activated cellZones
-    convertVolFieldBlock
-    (
-        fld,
-        ptfPtr,
-        output,
-        rangeCellZones_
-    );
-
-    // Convert activated cellSets
-    convertVolFieldBlock
-    (
-        fld,
-        ptfPtr,
-        output,
-        rangeCellSets_
-    );
+    convertVolFieldBlock(fld, ptfPtr, rangeVolume_);    // internalMesh
+    convertVolFieldBlock(fld, ptfPtr, rangeCellZones_); // cellZones
+    convertVolFieldBlock(fld, ptfPtr, rangeCellSets_);  // cellSets
 
 
-    //
-    // Convert patches - if activated
-    // - skip field conversion for groups
-    //
+    // Patches - skip field conversion for groups
     for (auto partId : rangePatches_)
     {
         if
@@ -122,7 +95,6 @@ void Foam::vtkPVFoam::convertVolField
         }
 
         const word patchName = getPartName(partId);
-        const label datasetNo = partDataset_.lookup(partId, -1);
         const label patchId = patches.findPatchID(patchName);
 
         if (patchId < 0)
@@ -130,15 +102,12 @@ void Foam::vtkPVFoam::convertVolField
             continue;
         }
 
-        vtkPolyData* vtkmesh = getDataFromBlock<vtkPolyData>
-        (
-            output, rangePatches_, datasetNo
-        );
-
-        if (!vtkmesh)
+        auto iter = cachedVtp_.find(selectedPartIds_[partId]);
+        if (!iter.found() || !(*iter).vtkmesh)
         {
             continue;
         }
+        auto vtkmesh = (*iter).vtkmesh;
 
         const fvPatchField<Type>& ptf = fld.boundaryField()[patchId];
 
@@ -201,9 +170,8 @@ void Foam::vtkPVFoam::convertVolField
         }
     }
 
-    //
-    // Convert face zones - if activated
-    //
+
+    // Face Zones
     for (auto partId : rangeFaceZones_)
     {
         if (!selectedPartIds_.found(partId))
@@ -211,14 +179,14 @@ void Foam::vtkPVFoam::convertVolField
             continue;
         }
 
-        const word zoneName = getPartName(partId);
-        const label datasetNo = partDataset_.lookup(partId, -1);
-
-        if (datasetNo < 0)
+        auto iter = cachedVtu_.find(selectedPartIds_[partId]);
+        if (!iter.found() || !(*iter).vtkmesh)
         {
             continue;
         }
+        auto vtkmesh = (*iter).vtkmesh;
 
+        const word zoneName = getPartName(partId);
         const faceZoneMesh& zMesh = mesh.faceZones();
         const label zoneId = zMesh.findZoneID(zoneName);
 
@@ -227,28 +195,19 @@ void Foam::vtkPVFoam::convertVolField
             continue;
         }
 
-        vtkPolyData* vtkmesh = getDataFromBlock<vtkPolyData>
+        vtkSmartPointer<vtkFloatArray> cdata = convertFaceFieldToVTK
         (
-            output, rangeFaceZones_, datasetNo
+            fld,
+            zMesh[zoneId]
         );
 
-        if (vtkmesh)
-        {
-            vtkSmartPointer<vtkFloatArray> cdata = convertFaceFieldToVTK
-            (
-                fld,
-                zMesh[zoneId]
-            );
-
-            vtkmesh->GetCellData()->AddArray(cdata);
-        }
+        vtkmesh->GetCellData()->AddArray(cdata);
 
         // TODO: points
     }
 
-    //
-    // Convert face sets - if activated
-    //
+
+    // Face Sets
     for (auto partId : rangeFaceSets_)
     {
         if (!selectedPartIds_.found(partId))
@@ -256,19 +215,14 @@ void Foam::vtkPVFoam::convertVolField
             continue;
         }
 
-        const word selectName = getPartName(partId);
-        const label datasetNo = partDataset_.lookup(partId, -1);
-
-        vtkPolyData* vtkmesh = getDataFromBlock<vtkPolyData>
-        (
-            output, rangeFaceSets_, datasetNo
-        );
-
-        if (!vtkmesh)
+        auto iter = cachedVtu_.find(selectedPartIds_[partId]);
+        if (!iter.found() || !(*iter).vtkmesh)
         {
             continue;
         }
+        auto vtkmesh = (*iter).vtkmesh;
 
+        const word selectName = getPartName(partId);
         const faceSet fSet(mesh, selectName);
 
         vtkSmartPointer<vtkFloatArray> cdata = convertFaceFieldToVTK
@@ -289,13 +243,12 @@ void Foam::vtkPVFoam::convertVolFields
 (
     const fvMesh& mesh,
     const PtrList<patchInterpolator>& patchInterpList,
-    const IOobjectList& objects,
-    vtkMultiBlockDataSet* output
+    const IOobjectList& objects
 )
 {
     forAllConstIters(objects, iter)
     {
-        // restrict to GeometricField<Type, ...>
+        // Restrict to GeometricField<Type, ...>
         if
         (
             iter()->headerClassName()
@@ -313,7 +266,7 @@ void Foam::vtkPVFoam::convertVolFields
         );
 
         // Convert
-        convertVolField(patchInterpList, fld, output);
+        convertVolField(patchInterpList, fld);
     }
 }
 
@@ -323,15 +276,14 @@ void Foam::vtkPVFoam::convertDimFields
 (
     const fvMesh& mesh,
     const PtrList<patchInterpolator>& patchInterpList,
-    const IOobjectList& objects,
-    vtkMultiBlockDataSet* output
+    const IOobjectList& objects
 )
 {
     typedef GeometricField<Type, fvPatchField, volMesh> VolFieldType;
 
     forAllConstIters(objects, iter)
     {
-        // restrict to DimensionedField<Type, ...>
+        // Restrict to DimensionedField<Type, ...>
         if
         (
             iter()->headerClassName()
@@ -374,7 +326,7 @@ void Foam::vtkPVFoam::convertDimFields
         );
         volFld.correctBoundaryConditions();
 
-        convertVolField(patchInterpList, volFld, output);
+        convertVolField(patchInterpList, volFld);
     }
 }
 
@@ -384,7 +336,6 @@ void Foam::vtkPVFoam::convertVolFieldBlock
 (
     const GeometricField<Type, fvPatchField, volMesh>& fld,
     autoPtr<GeometricField<Type, pointPatchField, pointMesh>>& ptfPtr,
-    vtkMultiBlockDataSet* output,
     const arrayRange& range
 )
 {
@@ -395,47 +346,39 @@ void Foam::vtkPVFoam::convertVolFieldBlock
             continue;
         }
 
-        const auto& longName = selectedPartIds_[partId];
-        const label datasetNo = partDataset_.lookup(partId, -1);
-
-        vtkUnstructuredGrid* vtkmesh =
-            getDataFromBlock<vtkUnstructuredGrid>(output, range, datasetNo);
-
-        if (!vtkmesh || !cachedVtu_.found(longName))
+        auto iter = cachedVtu_.find(selectedPartIds_[partId]);
+        if (!iter.found() || !(*iter).vtkmesh)
         {
             continue;
         }
+        auto vtuData = (*iter);
+        auto vtkmesh = (*iter).vtkmesh;
 
         vtkSmartPointer<vtkFloatArray> cdata = convertVolFieldToVTK
         (
             fld,
-            cachedVtu_[longName]
+            vtuData
         );
         vtkmesh->GetCellData()->AddArray(cdata);
 
         if (ptfPtr.valid())
         {
-            convertPointField
-            (
-                vtkmesh, ptfPtr(), fld,
-                cachedVtu_[longName]
-            );
+            convertPointField(vtkmesh, ptfPtr(), fld, vtuData);
         }
     }
 }
 
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
 //
 // point-fields
 //
-
 template<class Type>
 void Foam::vtkPVFoam::convertPointFields
 (
     const pointMesh& pMesh,
-    const IOobjectList& objects,
-    vtkMultiBlockDataSet* output
+    const IOobjectList& objects
 )
 {
     const polyMesh& mesh = pMesh.mesh();
@@ -444,7 +387,7 @@ void Foam::vtkPVFoam::convertPointFields
     forAllConstIters(objects, iter)
     {
         const word& fieldName = iter()->name();
-        // restrict to this GeometricField<Type, ...>
+        // Restrict to this GeometricField<Type, ...>
         if
         (
             iter()->headerClassName()
@@ -462,34 +405,12 @@ void Foam::vtkPVFoam::convertPointFields
         GeometricField<Type, pointPatchField, pointMesh> pfld(*iter(), pMesh);
 
 
-        // Convert internalMesh (if selected)
-        convertPointFieldBlock
-        (
-            pfld,
-            output,
-            rangeVolume_
-        );
-
-        // Convert (selected) cellZones
-        convertPointFieldBlock
-        (
-            pfld,
-            output,
-            rangeCellZones_
-        );
-
-        // Convert (selected) cellSets
-        convertPointFieldBlock
-        (
-            pfld,
-            output,
-            rangeCellSets_
-        );
+        convertPointFieldBlock(pfld, rangeVolume_);     // internalMesh
+        convertPointFieldBlock(pfld, rangeCellZones_);  // cellZones
+        convertPointFieldBlock(pfld, rangeCellSets_);   // cellSets
 
 
-        //
-        // Convert patches (if selected)
-        //
+        // Patches)
         for (auto partId : rangePatches_)
         {
             if (!selectedPartIds_.found(partId))
@@ -505,7 +426,6 @@ void Foam::vtkPVFoam::convertPointFields
             }
 
             const word patchName = getPartName(partId);
-            const label datasetNo = partDataset_.lookup(partId, -1);
             const label patchId = patches.findPatchID(patchName);
 
             if (patchId < 0)
@@ -513,21 +433,20 @@ void Foam::vtkPVFoam::convertPointFields
                 continue;
             }
 
-            vtkPolyData* vtkmesh = getDataFromBlock<vtkPolyData>
+            auto iter = cachedVtp_.find(selectedPartIds_[partId]);
+            if (!iter.found() || !(*iter).vtkmesh)
+            {
+                continue;
+            }
+            auto vtkmesh = (*iter).vtkmesh;
+
+            vtkSmartPointer<vtkFloatArray> pdata = convertFieldToVTK
             (
-                output, rangePatches_, datasetNo
+                fieldName,
+                pfld.boundaryField()[patchId].patchInternalField()()
             );
 
-            if (vtkmesh)
-            {
-                vtkSmartPointer<vtkFloatArray> pdata = convertFieldToVTK
-                (
-                    fieldName,
-                    pfld.boundaryField()[patchId].patchInternalField()()
-                );
-
-                vtkmesh->GetPointData()->AddArray(pdata);
-            }
+            vtkmesh->GetPointData()->AddArray(pdata);
         }
 
         //
@@ -540,8 +459,14 @@ void Foam::vtkPVFoam::convertPointFields
                 continue;
             }
 
+            auto iter = cachedVtp_.find(selectedPartIds_[partId]);
+            if (!iter.found() || !(*iter).vtkmesh)
+            {
+                continue;
+            }
+            auto vtkmesh = (*iter).vtkmesh;
+
             const word zoneName = getPartName(partId);
-            const label datasetNo = partDataset_.lookup(partId, -1);
             const label zoneId = mesh.faceZones().findZoneID(zoneName);
 
             if (zoneId < 0)
@@ -549,29 +474,21 @@ void Foam::vtkPVFoam::convertPointFields
                 continue;
             }
 
-            vtkPolyData* vtkmesh = getDataFromBlock<vtkPolyData>
+            // Extract the field on the zone
+            Field<Type> znfld
             (
-                output, rangeFaceZones_, datasetNo
+                pfld.primitiveField(),
+                mesh.faceZones()[zoneId]().meshPoints()
             );
 
-            if (vtkmesh)
-            {
-                // Extract the field on the zone
-                Field<Type> znfld
+            vtkSmartPointer<vtkFloatArray> pdata =
+                convertFieldToVTK
                 (
-                    pfld.primitiveField(),
-                    mesh.faceZones()[zoneId]().meshPoints()
+                    fieldName,
+                    znfld
                 );
 
-                vtkSmartPointer<vtkFloatArray> pdata =
-                    convertFieldToVTK
-                    (
-                        fieldName,
-                        znfld
-                    );
-
-                vtkmesh->GetPointData()->AddArray(pdata);
-            }
+            vtkmesh->GetPointData()->AddArray(pdata);
         }
     }
 }
@@ -581,7 +498,6 @@ template<class Type>
 void Foam::vtkPVFoam::convertPointFieldBlock
 (
     const GeometricField<Type, pointPatchField, pointMesh>& pfld,
-    vtkMultiBlockDataSet* output,
     const arrayRange& range
 )
 {
@@ -592,25 +508,21 @@ void Foam::vtkPVFoam::convertPointFieldBlock
             continue;
         }
 
-        const auto& longName = selectedPartIds_[partId];
-        const label datasetNo = partDataset_.lookup(partId, -1);
-
-        vtkUnstructuredGrid* vtkmesh = getDataFromBlock<vtkUnstructuredGrid>
-        (
-            output, range, datasetNo
-        );
-
-        if (!vtkmesh || !cachedVtu_.found(longName))
+        auto iter = cachedVtu_.find(selectedPartIds_[partId]);
+        if (!iter.found() || ! (*iter).vtkmesh)
         {
-            convertPointField
-            (
-                vtkmesh,
-                pfld,
-                GeometricField<Type, fvPatchField, volMesh>::null(),
-                cachedVtu_[longName]
-            );
+            continue;
         }
+        auto vtuData = (*iter);
+        auto vtkmesh = (*iter).vtkmesh;
 
+        convertPointField
+        (
+            vtkmesh,
+            pfld,
+            GeometricField<Type, fvPatchField, volMesh>::null(),
+            vtuData
+        );
     }
 }
 
@@ -739,32 +651,24 @@ template<class Type>
 void Foam::vtkPVFoam::convertLagrangianFields
 (
     const IOobjectList& objects,
-    vtkMultiBlockDataSet* output,
-    const label datasetNo
+    vtkPolyData* vtkmesh
 )
 {
-    const arrayRange& range = rangeLagrangian_;
-
     forAllConstIters(objects, iter)
     {
         // restrict to this IOField<Type>
         if (iter()->headerClassName() == IOField<Type>::typeName)
         {
-            vtkPolyData* vtkmesh =
-                getDataFromBlock<vtkPolyData>(output, range, datasetNo);
+            IOField<Type> fld(*iter());
 
-            if (vtkmesh)
-            {
-                IOField<Type> fld(*iter());
+            vtkSmartPointer<vtkFloatArray> fldData =
+                convertFieldToVTK
+                (
+                    fld.name(),
+                    fld
+                );
 
-                vtkSmartPointer<vtkFloatArray> fldData =
-                    convertFieldToVTK
-                    (
-                        fld.name(),
-                        fld
-                    );
-                vtkmesh->GetPointData()->AddArray(fldData);
-            }
+            vtkmesh->GetPointData()->AddArray(fldData);
         }
     }
 }
diff --git a/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamFields.C b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamFields.C
index 697737d74d..8f1ca82460 100644
--- a/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamFields.C
+++ b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamFields.C
@@ -62,10 +62,7 @@ void Foam::vtkPVFoam::pruneObjectList
 }
 
 
-void Foam::vtkPVFoam::convertVolFields
-(
-    vtkMultiBlockDataSet* output
-)
+void Foam::vtkPVFoam::convertVolFields()
 {
     const fvMesh& mesh = *meshPtr_;
 
@@ -121,17 +118,17 @@ void Foam::vtkPVFoam::convertVolFields
         }
     }
 
-    convertVolFields<scalar>(mesh, interpLst, objects, output);
-    convertVolFields<vector>(mesh, interpLst, objects, output);
-    convertVolFields<sphericalTensor>(mesh, interpLst, objects, output);
-    convertVolFields<symmTensor>(mesh, interpLst, objects, output);
-    convertVolFields<tensor>(mesh, interpLst, objects, output);
+    convertVolFields<scalar>(mesh, interpLst, objects);
+    convertVolFields<vector>(mesh, interpLst, objects);
+    convertVolFields<sphericalTensor>(mesh, interpLst, objects);
+    convertVolFields<symmTensor>(mesh, interpLst, objects);
+    convertVolFields<tensor>(mesh, interpLst, objects);
 
-    convertDimFields<scalar>(mesh, interpLst, objects, output);
-    convertDimFields<vector>(mesh, interpLst, objects, output);
-    convertDimFields<sphericalTensor>(mesh, interpLst, objects, output);
-    convertDimFields<symmTensor>(mesh, interpLst, objects, output);
-    convertDimFields<tensor>(mesh, interpLst, objects, output);
+    convertDimFields<scalar>(mesh, interpLst, objects);
+    convertDimFields<vector>(mesh, interpLst, objects);
+    convertDimFields<sphericalTensor>(mesh, interpLst, objects);
+    convertDimFields<symmTensor>(mesh, interpLst, objects);
+    convertDimFields<tensor>(mesh, interpLst, objects);
 
     if (debug)
     {
@@ -141,10 +138,7 @@ void Foam::vtkPVFoam::convertVolFields
 }
 
 
-void Foam::vtkPVFoam::convertPointFields
-(
-    vtkMultiBlockDataSet* output
-)
+void Foam::vtkPVFoam::convertPointFields()
 {
     const fvMesh& mesh = *meshPtr_;
 
@@ -186,11 +180,11 @@ void Foam::vtkPVFoam::convertPointFields
     // Construct interpolation on the raw mesh
     const pointMesh& pMesh = pointMesh::New(mesh);
 
-    convertPointFields<scalar>(pMesh, objects, output);
-    convertPointFields<vector>(pMesh, objects, output);
-    convertPointFields<sphericalTensor>(pMesh, objects, output);
-    convertPointFields<symmTensor>(pMesh, objects, output);
-    convertPointFields<tensor>(pMesh, objects, output);
+    convertPointFields<scalar>(pMesh, objects);
+    convertPointFields<vector>(pMesh, objects);
+    convertPointFields<sphericalTensor>(pMesh, objects);
+    convertPointFields<symmTensor>(pMesh, objects);
+    convertPointFields<tensor>(pMesh, objects);
 
     if (debug)
     {
@@ -200,10 +194,7 @@ void Foam::vtkPVFoam::convertPointFields
 }
 
 
-void Foam::vtkPVFoam::convertLagrangianFields
-(
-    vtkMultiBlockDataSet* output
-)
+void Foam::vtkPVFoam::convertLagrangianFields()
 {
     arrayRange& range = rangeLagrangian_;
     const fvMesh& mesh = *meshPtr_;
@@ -231,13 +222,14 @@ void Foam::vtkPVFoam::convertLagrangianFields
             continue;
         }
 
-        const word  cloudName = getPartName(partId);
-        const label datasetNo = partDataset_.lookup(partId, -1);
+        const word cloudName = getPartName(partId);
+        auto iter = cachedVtp_.find(selectedPartIds_[partId]);
 
-        if (datasetNo < 0)
+        if (!iter.found() || !(*iter).vtkmesh)
         {
             continue;
         }
+        auto vtkmesh = (*iter).vtkmesh;
 
         // Get the Lagrangian fields for this time and this cloud
         // but only keep selected fields
@@ -265,12 +257,12 @@ void Foam::vtkPVFoam::convertLagrangianFields
             }
         }
 
-        convertLagrangianFields<label>(objects, output, datasetNo);
-        convertLagrangianFields<scalar>(objects, output, datasetNo);
-        convertLagrangianFields<vector>(objects, output, datasetNo);
-        convertLagrangianFields<sphericalTensor>(objects, output, datasetNo);
-        convertLagrangianFields<symmTensor>(objects, output, datasetNo);
-        convertLagrangianFields<tensor>(objects, output, datasetNo);
+        convertLagrangianFields<label>(objects, vtkmesh);
+        convertLagrangianFields<scalar>(objects, vtkmesh);
+        convertLagrangianFields<vector>(objects, vtkmesh);
+        convertLagrangianFields<sphericalTensor>(objects, vtkmesh);
+        convertLagrangianFields<symmTensor>(objects, vtkmesh);
+        convertLagrangianFields<tensor>(objects, vtkmesh);
     }
 
     if (debug)
diff --git a/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamMesh.C b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamMesh.C
index 9e202a352e..e133417912 100644
--- a/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamMesh.C
+++ b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamMesh.C
@@ -42,20 +42,14 @@ License
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-void Foam::vtkPVFoam::convertMeshVolume
-(
-    vtkMultiBlockDataSet* output,
-    int& blockNo
-)
+void Foam::vtkPVFoam::convertMeshVolume()
 {
     arrayRange& range = rangeVolume_;
-    range.block(blockNo);      // set output block
-    label datasetNo = 0;       // restart at dataset 0
     const fvMesh& mesh = *meshPtr_;
 
     if (debug)
     {
-        Info<< "<beg> convertMeshVolume" << endl;
+        Info<< "<beg> " << FUNCTION_NAME << endl;
         printMemory();
     }
 
@@ -63,106 +57,75 @@ void Foam::vtkPVFoam::convertMeshVolume
     // this looks like more than one part, but it isn't
     for (auto partId : range)
     {
-        if (!selectedPartIds_.found(partId))
+        if (selectedPartIds_.found(partId))
         {
-            continue;
+            const auto& longName = selectedPartIds_[partId];
+
+            vtkSmartPointer<vtkUnstructuredGrid> vtkmesh =
+                volumeVTKMesh
+                (
+                    mesh,
+                    cachedVtu_(longName)
+                );
+
+            cachedVtu_[longName].vtkmesh = vtkmesh;
         }
-
-        const auto& longName = selectedPartIds_[partId];
-        const word partName = getPartName(partId);
-
-        vtkSmartPointer<vtkUnstructuredGrid> vtkmesh = volumeVTKMesh
-        (
-            mesh,
-            cachedVtu_(longName)
-        );
-
-        if (vtkmesh)
-        {
-            addToBlock(output, vtkmesh, range, datasetNo, partName);
-            partDataset_.set(partId, datasetNo++);
-        }
-    }
-
-    // anything added?
-    if (datasetNo)
-    {
-        ++blockNo;
     }
 
     if (debug)
     {
-        Info<< "<end> convertMeshVolume" << endl;
+        Info<< "<end> " << FUNCTION_NAME << endl;
         printMemory();
     }
 }
 
 
-void Foam::vtkPVFoam::convertMeshLagrangian
-(
-    vtkMultiBlockDataSet* output,
-    int& blockNo
-)
+void Foam::vtkPVFoam::convertMeshLagrangian()
 {
     arrayRange& range = rangeLagrangian_;
-    range.block(blockNo);      // set output block
-    label datasetNo = 0;       // restart at dataset 0
     const fvMesh& mesh = *meshPtr_;
 
     if (debug)
     {
-        Info<< "<beg> convertMeshLagrangian" << endl;
+        Info<< "<beg> " << FUNCTION_NAME << endl;
         printMemory();
     }
 
     for (auto partId : range)
     {
-        if (!selectedPartIds_.found(partId))
+        if (selectedPartIds_.found(partId))
         {
-            continue;
+            const auto& longName = selectedPartIds_[partId];
+            const word cloudName = getPartName(partId);
+
+            vtkSmartPointer<vtkPolyData> vtkmesh =
+                lagrangianVTKMesh
+                (
+                    mesh,
+                    cloudName
+                );
+
+            cachedVtp_(longName).vtkmesh = vtkmesh;
         }
-
-        const word cloudName = getPartName(partId);
-
-        vtkSmartPointer<vtkPolyData> vtkmesh =
-            lagrangianVTKMesh(mesh, cloudName);
-
-        if (vtkmesh)
-        {
-            addToBlock(output, vtkmesh, range, datasetNo, cloudName);
-            partDataset_.set(partId, datasetNo++);
-        }
-    }
-
-    // anything added?
-    if (datasetNo)
-    {
-        ++blockNo;
     }
 
     if (debug)
     {
-        Info<< "<end> convertMeshLagrangian" << endl;
+        Info<< "<end> " << FUNCTION_NAME << endl;
         printMemory();
     }
 }
 
 
-void Foam::vtkPVFoam::convertMeshPatches
-(
-    vtkMultiBlockDataSet* output,
-    int& blockNo
-)
+void Foam::vtkPVFoam::convertMeshPatches()
 {
     arrayRange& range = rangePatches_;
-    range.block(blockNo);      // set output block
-    label datasetNo = 0;       // restart at dataset 0
     const fvMesh& mesh = *meshPtr_;
     const polyBoundaryMesh& patches = mesh.boundaryMesh();
 
     if (debug)
     {
-        Info<< "<beg> convertMeshPatches" << endl;
+        Info<< "<beg> " << FUNCTION_NAME << endl;
         printMemory();
     }
 
@@ -235,34 +198,51 @@ void Foam::vtkPVFoam::convertMeshPatches
 
         if (vtkmesh)
         {
-            addToBlock(output, vtkmesh, range, datasetNo, partName);
-            partDataset_.set(partId, datasetNo++);
+            cachedVtp_(longName).vtkmesh = vtkmesh;
         }
     }
 
-    // anything added?
-    if (datasetNo)
-    {
-        ++blockNo;
-    }
-
     if (debug)
     {
-        Info<< "<end> convertMeshPatches" << endl;
+        Info<< "<end> " << FUNCTION_NAME << endl;
         printMemory();
     }
 }
 
 
-void Foam::vtkPVFoam::convertMeshCellZones
+void Foam::vtkPVFoam::convertMeshSubset
 (
-    vtkMultiBlockDataSet* output,
-    int& blockNo
+    const fvMeshSubset& subsetter,
+    const string& longName
 )
 {
-    arrayRange& range = rangeCellZones_;
-    range.block(blockNo);      // set output block
-    label datasetNo = 0;       // restart at dataset 0
+    vtkSmartPointer<vtkUnstructuredGrid> vtkmesh = volumeVTKMesh
+    (
+        subsetter.subMesh(),
+        cachedVtu_(longName)
+    );
+
+    // Convert cellMap, addPointCellLabels to global cell ids
+    inplaceRenumber
+    (
+        subsetter.cellMap(),
+        cachedVtu_[longName].cellMap()
+    );
+    inplaceRenumber
+    (
+        subsetter.cellMap(),
+        cachedVtu_[longName].additionalIds()
+    );
+
+    // copy pointMap as well, otherwise pointFields fail
+    cachedVtu_[longName].pointMap() = subsetter.pointMap();
+    cachedVtu_[longName].vtkmesh = vtkmesh;
+}
+
+
+void Foam::vtkPVFoam::convertMeshCellZones()
+{
+    const arrayRange& range = rangeCellZones_;
     const fvMesh& mesh = *meshPtr_;
 
     if (range.empty())
@@ -272,7 +252,7 @@ void Foam::vtkPVFoam::convertMeshCellZones
 
     if (debug)
     {
-        Info<< "<beg> convertMeshCellZones" << endl;
+        Info<< "<beg> " << FUNCTION_NAME << endl;
         printMemory();
     }
 
@@ -302,62 +282,25 @@ void Foam::vtkPVFoam::convertMeshCellZones
         fvMeshSubset subsetter(mesh);
         subsetter.setLargeCellSubset(zMesh[zoneId]);
 
-        vtkSmartPointer<vtkUnstructuredGrid> vtkmesh = volumeVTKMesh
-        (
-            subsetter.subMesh(),
-            cachedVtu_(longName)
-        );
-
-        if (vtkmesh)
-        {
-            // Convert cellMap, addPointCellLabels to global cell ids
-            inplaceRenumber
-            (
-                subsetter.cellMap(),
-                cachedVtu_[longName].cellMap()
-            );
-            inplaceRenumber
-            (
-                subsetter.cellMap(),
-                cachedVtu_[longName].additionalIds()
-            );
-
-            // copy pointMap as well, otherwise pointFields fail
-            cachedVtu_[longName].pointMap() = subsetter.pointMap();
-
-            addToBlock(output, vtkmesh, range, datasetNo, zoneName);
-            partDataset_.set(partId, datasetNo++);
-        }
-    }
-
-    // anything added?
-    if (datasetNo)
-    {
-        ++blockNo;
+        convertMeshSubset(subsetter, longName);
     }
 
     if (debug)
     {
-        Info<< "<end> convertMeshCellZones" << endl;
+        Info<< "<end> " << FUNCTION_NAME << endl;
         printMemory();
     }
 }
 
 
-void Foam::vtkPVFoam::convertMeshCellSets
-(
-    vtkMultiBlockDataSet* output,
-    int& blockNo
-)
+void Foam::vtkPVFoam::convertMeshCellSets()
 {
-    arrayRange& range = rangeCellSets_;
-    range.block(blockNo);      // set output block
-    label datasetNo = 0;       // restart at dataset 0
+    const arrayRange& range = rangeCellSets_;
     const fvMesh& mesh = *meshPtr_;
 
     if (debug)
     {
-        Info<< "<beg> convertMeshCellSets" << endl;
+        Info<< "<beg> " << FUNCTION_NAME << endl;
         printMemory();
     }
 
@@ -380,57 +323,20 @@ void Foam::vtkPVFoam::convertMeshCellSets
         fvMeshSubset subsetter(mesh);
         subsetter.setLargeCellSubset(cSet);
 
-        vtkSmartPointer<vtkUnstructuredGrid> vtkmesh = volumeVTKMesh
-        (
-            subsetter.subMesh(),
-            cachedVtu_(longName)
-        );
-
-        if (vtkmesh)
-        {
-            // Convert cellMap, addPointCellLabels to global cell ids
-            inplaceRenumber
-            (
-                subsetter.cellMap(),
-                cachedVtu_[longName].cellMap()
-            );
-            inplaceRenumber
-            (
-                subsetter.cellMap(),
-                cachedVtu_[longName].additionalIds()
-            );
-
-            // copy pointMap as well, otherwise pointFields fail
-            cachedVtu_[longName].pointMap() = subsetter.pointMap();
-
-            addToBlock(output, vtkmesh, range, datasetNo, partName);
-            partDataset_.set(partId, datasetNo++);
-        }
-    }
-
-    // anything added?
-    if (datasetNo)
-    {
-        ++blockNo;
+        convertMeshSubset(subsetter, longName);
     }
 
     if (debug)
     {
-        Info<< "<end> convertMeshCellSets" << endl;
+        Info<< "<end> " << FUNCTION_NAME << endl;
         printMemory();
     }
 }
 
 
-void Foam::vtkPVFoam::convertMeshFaceZones
-(
-    vtkMultiBlockDataSet* output,
-    int& blockNo
-)
+void Foam::vtkPVFoam::convertMeshFaceZones()
 {
     arrayRange& range = rangeFaceZones_;
-    range.block(blockNo);      // set output block
-    label datasetNo = 0;       // restart at dataset 0
     const fvMesh& mesh = *meshPtr_;
 
     if (range.empty())
@@ -440,7 +346,7 @@ void Foam::vtkPVFoam::convertMeshFaceZones
 
     if (debug)
     {
-        Info<< "<beg> convertMeshFaceZones" << endl;
+        Info<< "<beg> " << FUNCTION_NAME << endl;
         printMemory();
     }
 
@@ -452,6 +358,7 @@ void Foam::vtkPVFoam::convertMeshFaceZones
             continue;
         }
 
+        const auto& longName = selectedPartIds_[partId];
         const word zoneName = getPartName(partId);
         const label  zoneId = zMesh.findZoneID(zoneName);
 
@@ -467,43 +374,31 @@ void Foam::vtkPVFoam::convertMeshFaceZones
         }
 
         vtkSmartPointer<vtkPolyData> vtkmesh =
-            patchVTKMesh(zoneName, zMesh[zoneId]());
+            patchVTKMesh
+            (
+                zoneName,
+                zMesh[zoneId]()
+            );
 
-        if (vtkmesh)
-        {
-            addToBlock(output, vtkmesh, range, datasetNo, zoneName);
-            partDataset_.set(partId, datasetNo++);
-        }
-    }
-
-    // anything added?
-    if (datasetNo)
-    {
-        ++blockNo;
+        cachedVtp_(longName).vtkmesh = vtkmesh;
     }
 
     if (debug)
     {
-        Info<< "<end> convertMeshFaceZones" << endl;
+        Info<< "<end> " << FUNCTION_NAME << endl;
         printMemory();
     }
 }
 
 
-void Foam::vtkPVFoam::convertMeshFaceSets
-(
-    vtkMultiBlockDataSet* output,
-    int& blockNo
-)
+void Foam::vtkPVFoam::convertMeshFaceSets()
 {
     arrayRange& range = rangeFaceSets_;
-    range.block(blockNo);      // set output block
-    label datasetNo = 0;       // restart at dataset 0
     const fvMesh& mesh = *meshPtr_;
 
     if (debug)
     {
-        Info<< "<beg> convertMeshFaceSets" << endl;
+        Info<< "<beg> " << FUNCTION_NAME << endl;
         printMemory();
     }
 
@@ -514,6 +409,7 @@ void Foam::vtkPVFoam::convertMeshFaceSets
             continue;
         }
 
+        const auto& longName = selectedPartIds_[partId];
         const word partName = getPartName(partId);
 
         if (debug)
@@ -536,43 +432,31 @@ void Foam::vtkPVFoam::convertMeshFaceSets
         }
 
         vtkSmartPointer<vtkPolyData> vtkmesh =
-            patchVTKMesh("faceSet:" + partName, p);
+            patchVTKMesh
+            (
+                "faceSet:" + partName,
+                p
+            );
 
-        if (vtkmesh)
-        {
-            addToBlock(output, vtkmesh, range, datasetNo, partName);
-            partDataset_.set(partId, datasetNo++);
-        }
-    }
-
-    // anything added?
-    if (datasetNo)
-    {
-        ++blockNo;
+        cachedVtp_(longName).vtkmesh = vtkmesh;
     }
 
     if (debug)
     {
-        Info<< "<end> convertMeshFaceSets" << endl;
+        Info<< "<end> " << FUNCTION_NAME << endl;
         printMemory();
     }
 }
 
 
-void Foam::vtkPVFoam::convertMeshPointZones
-(
-    vtkMultiBlockDataSet* output,
-    int& blockNo
-)
+void Foam::vtkPVFoam::convertMeshPointZones()
 {
     arrayRange& range = rangePointZones_;
-    range.block(blockNo);      // set output block
-    label datasetNo = 0;       // restart at dataset 0
     const fvMesh& mesh = *meshPtr_;
 
     if (debug)
     {
-        Info<< "<beg> convertMeshPointZones" << endl;
+        Info<< "<beg> " << FUNCTION_NAME << endl;
         printMemory();
     }
 
@@ -586,6 +470,7 @@ void Foam::vtkPVFoam::convertMeshPointZones
                 continue;
             }
 
+            const auto& longName = selectedPartIds_[partId];
             const word zoneName = getPartName(partId);
             const label zoneId = zMesh.findZoneID(zoneName);
 
@@ -616,42 +501,26 @@ void Foam::vtkPVFoam::convertMeshPointZones
 
             vtkmesh->SetPoints(vtkpoints);
 
-            if (vtkmesh)
-            {
-                addToBlock(output, vtkmesh, range, datasetNo, zoneName);
-                partDataset_.set(partId, datasetNo++);
-            }
+            cachedVtp_(longName).vtkmesh = vtkmesh;
         }
     }
 
-    // anything added?
-    if (datasetNo)
-    {
-        ++blockNo;
-    }
-
     if (debug)
     {
-        Info<< "<end> convertMeshPointZones" << endl;
+        Info<< "<end> " << FUNCTION_NAME << endl;
         printMemory();
     }
 }
 
 
-void Foam::vtkPVFoam::convertMeshPointSets
-(
-    vtkMultiBlockDataSet* output,
-    int& blockNo
-)
+void Foam::vtkPVFoam::convertMeshPointSets()
 {
     arrayRange& range = rangePointSets_;
-    range.block(blockNo);      // set output block
-    label datasetNo = 0;       // restart at dataset 0
     const fvMesh& mesh = *meshPtr_;
 
     if (debug)
     {
-        Info<< "<beg> convertMeshPointSets" << endl;
+        Info<< "<beg> " << FUNCTION_NAME << endl;
         printMemory();
     }
 
@@ -662,6 +531,7 @@ void Foam::vtkPVFoam::convertMeshPointSets
             continue;
         }
 
+        const auto& longName = selectedPartIds_[partId];
         const word partName = getPartName(partId);
 
         if (debug)
@@ -691,22 +561,12 @@ void Foam::vtkPVFoam::convertMeshPointSets
 
         vtkmesh->SetPoints(vtkpoints);
 
-        if (vtkmesh)
-        {
-            addToBlock(output, vtkmesh, range, datasetNo, partName);
-            partDataset_.set(partId, datasetNo++);
-        }
-    }
-
-    // anything added?
-    if (datasetNo)
-    {
-        ++blockNo;
+        cachedVtp_(longName).vtkmesh = vtkmesh;
     }
 
     if (debug)
     {
-        Info<< "<end> convertMeshPointSets" << endl;
+        Info<< "<end> " << FUNCTION_NAME << endl;
         printMemory();
     }
 }
diff --git a/applications/utilities/postProcessing/graphics/PVReaders/foamPv/foamPvCore.C b/applications/utilities/postProcessing/graphics/PVReaders/foamPv/foamPvCore.C
index d9c0373460..7e67d10a11 100644
--- a/applications/utilities/postProcessing/graphics/PVReaders/foamPv/foamPvCore.C
+++ b/applications/utilities/postProcessing/graphics/PVReaders/foamPv/foamPvCore.C
@@ -103,28 +103,6 @@ void Foam::foamPvCore::addToBlock
 }
 
 
-int Foam::foamPvCore::getNumberOfDataSets
-(
-    vtkMultiBlockDataSet* output,
-    const arrayRange& selector
-)
-{
-    const int blockNo = selector.block();
-
-    vtkMultiBlockDataSet* block = vtkMultiBlockDataSet::SafeDownCast
-    (
-        output->GetBlock(blockNo)
-    );
-
-    if (block)
-    {
-        return block->GetNumberOfBlocks();
-    }
-
-    return 0;
-}
-
-
 int Foam::foamPvCore::getSelected
 (
     boolList& status,
diff --git a/applications/utilities/postProcessing/graphics/PVReaders/foamPv/foamPvCore.H b/applications/utilities/postProcessing/graphics/PVReaders/foamPv/foamPvCore.H
index 6243d5343c..e4ab28316d 100644
--- a/applications/utilities/postProcessing/graphics/PVReaders/foamPv/foamPvCore.H
+++ b/applications/utilities/postProcessing/graphics/PVReaders/foamPv/foamPvCore.H
@@ -158,23 +158,6 @@ public:
         const std::string& datasetName
     );
 
-    //- Convenience method for the VTK multiblock API
-    //  Always returns a nullptr if datasetNo is negative
-    template<class Type=vtkDataSet>
-    static Type* getDataFromBlock
-    (
-        vtkMultiBlockDataSet* output,
-        const arrayRange& selector,
-        const label datasetNo
-    );
-
-    //- Convenience method for the VTK multiblock API
-    static int getNumberOfDataSets
-    (
-        vtkMultiBlockDataSet* output,
-        const arrayRange& selector
-    );
-
     //- Add objects of Type to array selection
     template<class Type>
     static label addToSelection
diff --git a/applications/utilities/postProcessing/graphics/PVReaders/foamPv/foamPvCoreTemplates.C b/applications/utilities/postProcessing/graphics/PVReaders/foamPv/foamPvCoreTemplates.C
index 7908a7752d..46c4bf3eb7 100644
--- a/applications/utilities/postProcessing/graphics/PVReaders/foamPv/foamPvCoreTemplates.C
+++ b/applications/utilities/postProcessing/graphics/PVReaders/foamPv/foamPvCoreTemplates.C
@@ -25,36 +25,9 @@ License
 
 #include "IOobjectList.H"
 #include "vtkDataArraySelection.h"
-#include "vtkMultiBlockDataSet.h"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-template<class Type>
-Type* Foam::foamPvCore::getDataFromBlock
-(
-    vtkMultiBlockDataSet* output,
-    const arrayRange& selector,
-    const label datasetNo
-)
-{
-    const int blockNo = selector.block();
-
-    vtkMultiBlockDataSet* block =
-    (
-        datasetNo < 0
-      ? nullptr
-      : vtkMultiBlockDataSet::SafeDownCast(output->GetBlock(blockNo))
-    );
-
-    if (block)
-    {
-        return Type::SafeDownCast(block->GetBlock(datasetNo));
-    }
-
-    return nullptr;
-}
-
-
 template<class Type>
 Foam::label Foam::foamPvCore::addToSelection
 (

From 1f18a0f97f188d8696bc19a19fd9cc76e631591d Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Mon, 15 May 2017 12:57:36 +0200
Subject: [PATCH 11/27] ENH: replace internal meshmaps with foamVtkMeshMaps

---
 .../PVFoamReader/PVFoamReader/CMakeLists.txt  |  2 +
 .../PVFoamReader/vtkPVFoam/vtkPVFoam.H        | 64 +------------------
 2 files changed, 5 insertions(+), 61 deletions(-)

diff --git a/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/PVFoamReader/CMakeLists.txt b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/PVFoamReader/CMakeLists.txt
index ce13bed97a..f2fd631fd1 100644
--- a/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/PVFoamReader/CMakeLists.txt
+++ b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/PVFoamReader/CMakeLists.txt
@@ -12,6 +12,7 @@ link_directories(
 include_directories(
     $ENV{WM_PROJECT_DIR}/src/OpenFOAM/lnInclude
     $ENV{WM_PROJECT_DIR}/src/OSspecific/$ENV{WM_OSTYPE}/lnInclude
+    $ENV{WM_PROJECT_DIR}/src/conversion/lnInclude
     $ENV{WM_PROJECT_DIR}/src/finiteVolume/lnInclude
     ${PROJECT_SOURCE_DIR}/../vtkPVFoam
     ${PROJECT_SOURCE_DIR}/../../foamPv/lnInclude
@@ -64,6 +65,7 @@ target_link_libraries(
     LINK_PUBLIC
     vtkPVFoam-pv${PARAVIEW_VERSION_MAJOR}.${PARAVIEW_VERSION_MINOR}
     foamPv-pv${PARAVIEW_VERSION_MAJOR}.${PARAVIEW_VERSION_MINOR}
+    conversion
     finiteVolume
     OpenFOAM
 )
diff --git a/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoam.H b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoam.H
index 0c520515ba..680fcb139d 100644
--- a/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoam.H
+++ b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoam.H
@@ -54,6 +54,7 @@ SourceFiles
 #include "PrimitivePatchInterpolation.H"
 #include "volPointInterpolation.H"
 #include "foamPvCore.H"
+#include "foamVtkMeshMaps.H"
 
 #include "vtkSmartPointer.h"
 #include "vtkPolyData.h"
@@ -103,66 +104,6 @@ class vtkPVFoam
 
     // Private classes
 
-        //- Bookkeeping for polyhedral cell decomposition
-        //  hide in extra pointMap (cellSet/cellZone) for now
-        class polyDecomp
-        {
-            labelList cellMap_;
-            labelList pointMap_;
-            labelList additionalIds_;
-
-        public:
-
-            polyDecomp()
-            {}
-
-            //- Label of original cell for decomposed cells
-            labelList& cellMap()
-            {
-                return cellMap_;
-            }
-
-            //- Label of original cell for decomposed cells
-            const labelList& cellMap() const
-            {
-                return cellMap_;
-            }
-
-            //- Point labels for subsetted meshes
-            labelList& pointMap()
-            {
-                return pointMap_;
-            }
-
-            //- Point labels for subsetted meshes
-            const labelList& pointMap() const
-            {
-                return pointMap_;
-            }
-
-
-            //- Cell-centre labels for additional points of decomposed cells
-            labelList& additionalIds()
-            {
-                return additionalIds_;
-            }
-
-            //- Cell-centre labels for additional points of decomposed cells
-            const labelList& additionalIds() const
-            {
-                return additionalIds_;
-            }
-
-            //- Clear
-            void clear()
-            {
-                cellMap_.clear();
-                pointMap_.clear();
-                additionalIds_.clear();
-            }
-        };
-
-
         //- Bookkeeping for vtkPolyData
         class foamVtpData
         {
@@ -170,8 +111,9 @@ class vtkPVFoam
             vtkSmartPointer<vtkPolyData> vtkmesh;
         };
 
+
         //- Bookkeeping for vtkUnstructuredGrid
-        class foamVtuData : public polyDecomp
+        class foamVtuData : public foamVtkMeshMaps
         {
         public:
             vtkSmartPointer<vtkUnstructuredGrid> vtkmesh;

From 8a66ec997526fd5e8da2995b1a9dd30676ea30eb Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Mon, 15 May 2017 13:01:38 +0200
Subject: [PATCH 12/27] ENH: replace paraview vtk conversion with library
 utilities

- this allows filling in the VTK structures without intermediate data
  and without sequencial insertion. Should be faster and smaller
  than the previous cell-wise insertion methods.
  Most importantly, it improves code reuse.
---
 .../PVFoamReader/vtkPVFoam/foamVtkAdaptors.H  | 115 +++++
 .../vtkPVFoam/vtkPVFoamMeshVolume.C           | 451 ++++--------------
 2 files changed, 215 insertions(+), 351 deletions(-)
 create mode 100644 applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/foamVtkAdaptors.H

diff --git a/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/foamVtkAdaptors.H b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/foamVtkAdaptors.H
new file mode 100644
index 0000000000..89146bc889
--- /dev/null
+++ b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/foamVtkAdaptors.H
@@ -0,0 +1,115 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2017 OpenCFD Ltd.
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef foamVtkAdaptors_H
+#define foamVtkAdaptors_H
+
+// OpenFOAM includes
+#include "labelList.H"
+
+// VTK includes
+#include "vtkCellArray.h"
+#include "vtkIdTypeArray.h"
+#include "vtkSmartPointer.h"
+#include "vtkUnsignedCharArray.h"
+#include "vtkAOSDataArrayTemplate.h"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+    //- Attach a smart pointer, or generate a non-null one.
+    template<class T>
+    inline vtkSmartPointer<T> nonNullSmartPointer(T* ptr)
+    {
+        return vtkSmartPointer<T>(ptr ? ptr : T::New());
+    }
+
+
+    //- Helper to wrap vtkUnsignedCharArray as a UList
+    inline UList<uint8_t> vtkUList
+    (
+        vtkUnsignedCharArray* array,
+        const label size
+    )
+    {
+        array->SetNumberOfComponents(1);
+        array->SetNumberOfTuples(size);
+
+        UList<uint8_t> list
+        (
+            array->WritePointer(0, size),
+            size
+        );
+
+        return list;
+    }
+
+
+    //- Helper to wrap vtkIdTypeArray as a UList
+    inline UList<vtkIdType> vtkUList
+    (
+        vtkIdTypeArray* array,
+        const label size
+    )
+    {
+        array->SetNumberOfComponents(1);
+        array->SetNumberOfTuples(size);
+
+        UList<vtkIdType> list
+        (
+            array->WritePointer(0, size),
+            size
+        );
+
+        return list;
+    }
+
+
+    //- Special helper to wrap vtkCellArray as a UList
+    inline UList<vtkIdType> vtkUList
+    (
+        vtkCellArray* cells,
+        const label nCells,
+        const label size
+    )
+    {
+        cells->GetData()->SetNumberOfTuples(size);
+
+        UList<vtkIdType> list
+        (
+            cells->WritePointer(nCells, size),
+            size
+        );
+
+        return list;
+    }
+}
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamMeshVolume.C b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamMeshVolume.C
index 487687f689..48dc989ff3 100644
--- a/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamMeshVolume.C
+++ b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamMeshVolume.C
@@ -28,13 +28,11 @@ License
 
 // OpenFOAM includes
 #include "fvMesh.H"
-#include "cellModeller.H"
+#include "foamVtuSizing.H"
 
 // VTK includes
-#include "vtkCellArray.h"
-#include "vtkIdTypeArray.h"
 #include "vtkUnstructuredGrid.h"
-#include "vtkSmartPointer.h"
+#include "foamVtkAdaptors.H"
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
@@ -44,383 +42,134 @@ vtkSmartPointer<vtkUnstructuredGrid> Foam::vtkPVFoam::volumeVTKMesh
     foamVtuData& vtuData
 )
 {
-    const cellModel& tet = *(cellModeller::lookup("tet"));
-    const cellModel& pyr = *(cellModeller::lookup("pyr"));
-    const cellModel& prism = *(cellModeller::lookup("prism"));
-    const cellModel& wedge = *(cellModeller::lookup("wedge"));
-    const cellModel& tetWedge = *(cellModeller::lookup("tetWedge"));
-    const cellModel& hex = *(cellModeller::lookup("hex"));
+    if (debug)
+    {
+        Info<< "<beg> " << FUNCTION_NAME << endl;
+        printMemory();
+    }
+
+    foamVtuSizing sizing(mesh, !reader_->GetUseVTKPolyhedron());
 
     vtkSmartPointer<vtkUnstructuredGrid> vtkmesh =
         vtkSmartPointer<vtkUnstructuredGrid>::New();
 
-    if (debug)
-    {
-        Info<< "<beg> volumeVTKMesh" << endl;
-        printMemory();
-    }
+    auto cellTypes =
+        nonNullSmartPointer<vtkUnsignedCharArray>(vtkmesh->GetCellTypesArray());
 
-    const cellShapeList& cellShapes = mesh.cellShapes();
+    auto cells =
+        nonNullSmartPointer<vtkCellArray>(vtkmesh->GetCells());
 
-    // Number of additional points needed by the decomposition of polyhedra
-    label nAddPoints = 0;
+    auto faces =
+        nonNullSmartPointer<vtkIdTypeArray>(vtkmesh->GetFaces());
 
-    // Number of additional cells generated by the decomposition of polyhedra
-    label nAddCells = 0;
+    auto cellLocations =
+        nonNullSmartPointer<vtkIdTypeArray>(vtkmesh->GetCellLocationsArray());
 
-    // face owner is needed to determine the face orientation
-    const labelList& owner = mesh.faceOwner();
+    auto faceLocations =
+        nonNullSmartPointer<vtkIdTypeArray>(vtkmesh->GetFaceLocations());
 
-    labelList& cellMap = vtuData.cellMap();
-    labelList& addPointCellLabels = vtuData.additionalIds();
+    UList<uint8_t> cellTypesUL =
+        vtkUList
+        (
+            cellTypes,
+            sizing.nFieldCells()
+        );
 
-    // Scan for cells which need to be decomposed and count additional points
-    // and cells
-    if (!reader_->GetUseVTKPolyhedron())
-    {
-        forAll(cellShapes, celli)
-        {
-            const cellModel& model = cellShapes[celli].model();
+    UList<vtkIdType> cellsUL =
+        vtkUList
+        (
+            cells,
+            sizing.nFieldCells(),
+            sizing.sizeInternal(foamVtuSizing::slotType::CELLS)
+        );
 
-            if
-            (
-                model != hex
-             && model != wedge
-             && model != prism
-             && model != pyr
-             && model != tet
-             && model != tetWedge
-            )
-            {
-                const cell& cFaces = mesh.cells()[celli];
+    UList<vtkIdType> cellLocationsUL =
+        vtkUList
+        (
+            cellLocations,
+            sizing.sizeInternal(foamVtuSizing::slotType::CELLS_OFFSETS)
+        );
 
-                forAll(cFaces, cFacei)
-                {
-                    const face& f = mesh.faces()[cFaces[cFacei]];
+    UList<vtkIdType> facesUL =
+        vtkUList
+        (
+            faces,
+            sizing.sizeInternal(foamVtuSizing::slotType::FACES)
+        );
 
-                    label nQuads = 0;
-                    label nTris = 0;
-                    f.nTrianglesQuads(mesh.points(), nTris, nQuads);
+    UList<vtkIdType> faceLocationsUL =
+        vtkUList
+        (
+            faceLocations,
+            sizing.sizeInternal(foamVtuSizing::slotType::FACES_OFFSETS)
+        );
 
-                    nAddCells += nQuads + nTris;
-                }
 
-                nAddCells--;
-                nAddPoints++;
-            }
-        }
-    }
+    sizing.populateInternal
+    (
+        mesh,
+        cellTypesUL,
+        cellsUL,
+        cellLocationsUL,
+        facesUL,
+        faceLocationsUL,
+        static_cast<foamVtkMeshMaps&>(vtuData)
+    );
 
-    // Set size of additional point addressing array
-    // (from added point to original cell)
-    addPointCellLabels.setSize(nAddPoints);
-
-    // Set size of additional cells mapping array
-    // (from added cell to original cell)
-
-    cellMap.setSize(mesh.nCells() + nAddCells);
 
     // Convert OpenFOAM mesh vertices to VTK
-    vtkSmartPointer<vtkPoints> vtkpoints = vtkSmartPointer<vtkPoints>::New();
+    // - can only do this *after* populating the decompInfo with cell-ids
+    //   for any additional points (ie, mesh cell-centres)
+    vtkSmartPointer<vtkPoints> vtkpoints = vtkmesh->GetPoints();
+    if (!vtkpoints)
+    {
+        // No points previously, add an entry
+        vtkpoints = vtkSmartPointer<vtkPoints>::New();
+        vtkmesh->SetPoints(vtkpoints);
+    }
 
-    vtkpoints->Allocate(mesh.nPoints() + nAddPoints);
+    vtkpoints->SetNumberOfPoints(sizing.nFieldPoints());
 
-    const Foam::pointField& points = mesh.points();
+    // Normal points
+    const pointField& points = mesh.points();
+    const labelList& addPoints = vtuData.additionalIds();
 
+    label pointi = 0;
     forAll(points, i)
     {
-        vtkpoints->InsertNextPoint(points[i].v_);
+        vtkpoints->SetPoint(pointi++, points[i].v_);
     }
-
-    vtkmesh->Allocate(mesh.nCells() + nAddCells);
-
-    // Set counters for additional points and additional cells
-    label addPointi = 0, addCelli = 0;
-
-    // Create storage for points - needed for mapping from OpenFOAM to VTK
-    // data types - max 'order' = hex = 8 points
-    vtkIdType nodeIds[8];
-
-    // face-stream for a polyhedral cell
-    // [numFace0Pts, id1, id2, id3, numFace1Pts, id1, id2, id3, ...]
-    DynamicList<vtkIdType> faceStream(256);
-
-    forAll(cellShapes, celli)
+    forAll(addPoints, i)
     {
-        const cellShape& cellShape = cellShapes[celli];
-        const cellModel& cellModel = cellShape.model();
-
-        cellMap[addCelli++] = celli;
-
-        if (cellModel == tet)
-        {
-            for (int j = 0; j < 4; j++)
-            {
-                nodeIds[j] = cellShape[j];
-            }
-            vtkmesh->InsertNextCell
-            (
-                VTK_TETRA,
-                4,
-                nodeIds
-            );
-        }
-        else if (cellModel == pyr)
-        {
-            for (int j = 0; j < 5; j++)
-            {
-                nodeIds[j] = cellShape[j];
-            }
-            vtkmesh->InsertNextCell
-            (
-                VTK_PYRAMID,
-                5,
-                nodeIds
-            );
-        }
-        else if (cellModel == prism)
-        {
-            // VTK has a different node order for VTK_WEDGE
-            // their triangles point outwards!
-            nodeIds[0] = cellShape[0];
-            nodeIds[1] = cellShape[2];
-            nodeIds[2] = cellShape[1];
-            nodeIds[3] = cellShape[3];
-            nodeIds[4] = cellShape[5];
-            nodeIds[5] = cellShape[4];
-
-            vtkmesh->InsertNextCell
-            (
-                VTK_WEDGE,
-                6,
-                nodeIds
-            );
-        }
-        else if (cellModel == tetWedge && !reader_->GetUseVTKPolyhedron())
-        {
-            // Treat as squeezed prism (VTK_WEDGE)
-
-            nodeIds[0] = cellShape[0];
-            nodeIds[1] = cellShape[2];
-            nodeIds[2] = cellShape[1];
-            nodeIds[3] = cellShape[3];
-            nodeIds[4] = cellShape[4];
-            nodeIds[5] = cellShape[3];
-
-            vtkmesh->InsertNextCell
-            (
-                VTK_WEDGE,
-                6,
-                nodeIds
-            );
-        }
-        else if (cellModel == wedge)
-        {
-            // Treat as squeezed hex
-
-            nodeIds[0] = cellShape[0];
-            nodeIds[1] = cellShape[1];
-            nodeIds[2] = cellShape[2];
-            nodeIds[3] = cellShape[2];
-            nodeIds[4] = cellShape[3];
-            nodeIds[5] = cellShape[4];
-            nodeIds[6] = cellShape[5];
-            nodeIds[7] = cellShape[6];
-
-            vtkmesh->InsertNextCell
-            (
-                VTK_HEXAHEDRON,
-                8,
-                nodeIds
-            );
-        }
-        else if (cellModel == hex)
-        {
-            for (int j = 0; j < 8; j++)
-            {
-                nodeIds[j] = cellShape[j];
-            }
-            vtkmesh->InsertNextCell
-            (
-                VTK_HEXAHEDRON,
-                8,
-                nodeIds
-            );
-        }
-        else if (reader_->GetUseVTKPolyhedron())
-        {
-            // Polyhedral cell - use VTK_POLYHEDRON
-            const labelList& cFaces = mesh.cells()[celli];
-
-            vtkIdType nFaces = cFaces.size();
-            vtkIdType nLabels = nFaces;
-
-            // count size for face stream
-            forAll(cFaces, cFacei)
-            {
-                const face& f = mesh.faces()[cFaces[cFacei]];
-                nLabels += f.size();
-            }
-
-            // build face-stream
-            // [numFace0Pts, id1, id2, id3, numFace1Pts, id1, id2, id3, ...]
-            // point Ids are global
-            faceStream.clear();
-            faceStream.reserve(nLabels + nFaces);
-
-            forAll(cFaces, cFacei)
-            {
-                const face& f = mesh.faces()[cFaces[cFacei]];
-                const bool isOwner = (owner[cFaces[cFacei]] == celli);
-                const label nFacePoints = f.size();
-
-                // number of labels for this face
-                faceStream.append(nFacePoints);
-
-                if (isOwner)
-                {
-                    forAll(f, fp)
-                    {
-                        faceStream.append(f[fp]);
-                    }
-                }
-                else
-                {
-                    // fairly immaterial if we reverse the list
-                    // or use face::reverseFace()
-                    forAllReverse(f, fp)
-                    {
-                        faceStream.append(f[fp]);
-                    }
-                }
-            }
-
-            vtkmesh->InsertNextCell(VTK_POLYHEDRON, nFaces, faceStream.data());
-        }
-        else
-        {
-            // Polyhedral cell. Decompose into tets + prisms.
-
-            // Mapping from additional point to cell
-            addPointCellLabels[addPointi] = celli;
-
-            // The new vertex from the cell-centre
-            const label newVertexLabel = mesh.nPoints() + addPointi;
-            vtkpoints->InsertNextPoint(mesh.C()[celli].v_);
-
-            // Whether to insert cell in place of original or not.
-            bool substituteCell = true;
-
-            const labelList& cFaces = mesh.cells()[celli];
-            forAll(cFaces, cFacei)
-            {
-                const face& f = mesh.faces()[cFaces[cFacei]];
-                const bool isOwner = (owner[cFaces[cFacei]] == celli);
-
-                // Number of triangles and quads in decomposition
-                label nTris = 0;
-                label nQuads = 0;
-                f.nTrianglesQuads(mesh.points(), nTris, nQuads);
-
-                // Do actual decomposition into triFcs and quadFcs.
-                faceList triFcs(nTris);
-                faceList quadFcs(nQuads);
-                label trii = 0;
-                label quadi = 0;
-                f.trianglesQuads(mesh.points(), trii, quadi, triFcs, quadFcs);
-
-                forAll(quadFcs, quadI)
-                {
-                    if (substituteCell)
-                    {
-                        substituteCell = false;
-                    }
-                    else
-                    {
-                        cellMap[addCelli++] = celli;
-                    }
-
-                    const face& quad = quadFcs[quadI];
-
-                    // Ensure we have the correct orientation for the
-                    // base of the primitive cell shape.
-                    // If the cell is face owner, the orientation needs to be
-                    // flipped.
-                    // At the moment, VTK doesn't actually seem to care if
-                    // negative cells are defined, but we'll do it anyhow
-                    // (for safety).
-                    if (isOwner)
-                    {
-                        nodeIds[0] = quad[3];
-                        nodeIds[1] = quad[2];
-                        nodeIds[2] = quad[1];
-                        nodeIds[3] = quad[0];
-                    }
-                    else
-                    {
-                        nodeIds[0] = quad[0];
-                        nodeIds[1] = quad[1];
-                        nodeIds[2] = quad[2];
-                        nodeIds[3] = quad[3];
-                    }
-                    nodeIds[4] = newVertexLabel;
-                    vtkmesh->InsertNextCell
-                    (
-                        VTK_PYRAMID,
-                        5,
-                        nodeIds
-                    );
-                }
-
-                forAll(triFcs, triI)
-                {
-                    if (substituteCell)
-                    {
-                        substituteCell = false;
-                    }
-                    else
-                    {
-                        cellMap[addCelli++] = celli;
-                    }
-
-                    const face& tri = triFcs[triI];
-
-                    // See note above about the orientation.
-                    if (isOwner)
-                    {
-                        nodeIds[0] = tri[2];
-                        nodeIds[1] = tri[1];
-                        nodeIds[2] = tri[0];
-                    }
-                    else
-                    {
-                        nodeIds[0] = tri[0];
-                        nodeIds[1] = tri[1];
-                        nodeIds[2] = tri[2];
-                    }
-                    nodeIds[3] = newVertexLabel;
-
-                    vtkmesh->InsertNextCell
-                    (
-                        VTK_TETRA,
-                        4,
-                        nodeIds
-                    );
-                }
-            }
-
-            addPointi++;
-        }
+        vtkpoints->SetPoint(pointi++, mesh.C()[addPoints[i]].v_);
     }
 
-    vtkmesh->SetPoints(vtkpoints);
+    if (facesUL.size())
+    {
+        vtkmesh->SetCells
+        (
+            cellTypes,
+            cellLocations,
+            cells,
+            faceLocations,
+            faces
+        );
+    }
+    else
+    {
+        vtkmesh->SetCells
+        (
+            cellTypes,
+            cellLocations,
+            cells,
+            nullptr,
+            nullptr
+        );
+    }
 
     if (debug)
     {
-        Info<<"nCells=" << mesh.nCells() <<" nPoints=" << mesh.nPoints()
-            <<" nAddCells=" << nAddCells <<" nAddPoints=" << nAddPoints
-            << nl
-            << "<end> volumeVTKMesh" << endl;
+        Info<< "<end> " << FUNCTION_NAME << endl;
         printMemory();
     }
 

From 2495fcb42e9697aebde36288495335b40dacca47 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Mon, 22 May 2017 16:13:53 +0200
Subject: [PATCH 13/27] ENH: replace foamToVTK routines with library-level
 equivalents

---
 .../dataConversion/foamToVTK/Allwmake         |  10 -
 .../dataConversion/foamToVTK/Make/files       |   1 +
 .../dataConversion/foamToVTK/Make/options     |   5 +-
 .../dataConversion/foamToVTK/foamToVTK.C      | 857 ++++++++++--------
 .../foamToVTK/foamToVTK/Make/files            |  13 -
 .../foamToVTK/foamToVTK/Make/options          |  10 -
 .../foamToVTK/foamToVTK/internalWriter.C      | 165 ----
 .../foamToVTK/foamToVTK/internalWriter.H      | 135 ---
 .../foamToVTK/internalWriterTemplates.C       |  99 --
 .../foamToVTK/foamToVTK/vtkMesh.H             | 137 ---
 .../foamToVTK/foamToVTK/vtkTopo.C             | 373 --------
 .../foamToVTK/foamToVTK/vtkTopo.H             | 139 ---
 .../foamToVTK/foamToVTK/writeFaceSet.C        | 127 ---
 .../foamToVTK/foamToVTK/writeFaceSet.H        |  63 --
 .../foamToVTK/foamToVTK/writeFuns.C           | 264 ------
 .../foamToVTK/foamToVTK/writeFuns.H           | 161 ----
 .../foamToVTK/foamToVTK/writeFunsTemplates.C  | 146 ---
 .../foamToVTK/foamToVTK/writePointSet.C       | 103 ---
 .../foamToVTK/foamToVTK/writePointSet.H       |  63 --
 .../foamToVTK/foamToVTK/writeVTK/controlDict  |  81 --
 ...gianWriter.C => foamVtkLagrangianWriter.C} |  55 +-
 ...gianWriter.H => foamVtkLagrangianWriter.H} |  34 +-
 ...s.C => foamVtkLagrangianWriterTemplates.C} |  22 +-
 .../foamToVTK/{foamToVTK => }/readFields.C    |   0
 .../foamToVTK/{foamToVTK => }/readFields.H    |   2 +-
 src/conversion/Make/files                     |   5 +
 .../vtk/output/foamVtkInternalWriter.C        | 132 +++
 .../vtk/output/foamVtkInternalWriter.H        | 191 ++++
 .../output/foamVtkInternalWriterTemplates.C   | 195 ++++
 .../vtk/output/foamVtkOutputFieldsTemplates.C |   1 -
 .../vtk/output/foamVtkPatchWriter.C           | 106 ++-
 .../vtk/output/foamVtkPatchWriter.H           |  83 +-
 .../vtk/output/foamVtkPatchWriterTemplates.C  |  88 +-
 .../vtk/output/foamVtkSurfaceMeshWriter.C     |  61 +-
 .../vtk/output/foamVtkSurfaceMeshWriter.H     |  40 +-
 .../foamVtkSurfaceMeshWriterTemplates.C       |  20 +-
 .../vtk/output/foamVtkWriteSurfFields.C       |  67 +-
 .../vtk/output/foamVtkWriteSurfFields.H       |  17 +-
 src/functionObjects/utilities/Make/files      |   1 +
 .../utilities}/writeVTK/writeVTK.C            |  53 +-
 .../utilities}/writeVTK/writeVTK.H            |  16 +-
 .../utilities}/writeVTK/writeVTKTemplates.C   |   0
 42 files changed, 1381 insertions(+), 2760 deletions(-)
 delete mode 100755 applications/utilities/postProcessing/dataConversion/foamToVTK/Allwmake
 delete mode 100644 applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/Make/files
 delete mode 100644 applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/Make/options
 delete mode 100644 applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/internalWriter.C
 delete mode 100644 applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/internalWriter.H
 delete mode 100644 applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/internalWriterTemplates.C
 delete mode 100644 applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/vtkMesh.H
 delete mode 100644 applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/vtkTopo.C
 delete mode 100644 applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/vtkTopo.H
 delete mode 100644 applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/writeFaceSet.C
 delete mode 100644 applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/writeFaceSet.H
 delete mode 100644 applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/writeFuns.C
 delete mode 100644 applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/writeFuns.H
 delete mode 100644 applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/writeFunsTemplates.C
 delete mode 100644 applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/writePointSet.C
 delete mode 100644 applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/writePointSet.H
 delete mode 100644 applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/writeVTK/controlDict
 rename applications/utilities/postProcessing/dataConversion/foamToVTK/{foamToVTK/lagrangianWriter.C => foamVtkLagrangianWriter.C} (66%)
 rename applications/utilities/postProcessing/dataConversion/foamToVTK/{foamToVTK/lagrangianWriter.H => foamVtkLagrangianWriter.H} (82%)
 rename applications/utilities/postProcessing/dataConversion/foamToVTK/{foamToVTK/lagrangianWriterTemplates.C => foamVtkLagrangianWriterTemplates.C} (80%)
 rename applications/utilities/postProcessing/dataConversion/foamToVTK/{foamToVTK => }/readFields.C (100%)
 rename applications/utilities/postProcessing/dataConversion/foamToVTK/{foamToVTK => }/readFields.H (98%)
 create mode 100644 src/conversion/vtk/output/foamVtkInternalWriter.C
 create mode 100644 src/conversion/vtk/output/foamVtkInternalWriter.H
 create mode 100644 src/conversion/vtk/output/foamVtkInternalWriterTemplates.C
 rename applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/patchWriter.C => src/conversion/vtk/output/foamVtkPatchWriter.C (55%)
 rename applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/patchWriter.H => src/conversion/vtk/output/foamVtkPatchWriter.H (64%)
 rename applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/patchWriterTemplates.C => src/conversion/vtk/output/foamVtkPatchWriterTemplates.C (51%)
 rename applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/surfaceMeshWriter.C => src/conversion/vtk/output/foamVtkSurfaceMeshWriter.C (56%)
 rename applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/surfaceMeshWriter.H => src/conversion/vtk/output/foamVtkSurfaceMeshWriter.H (81%)
 rename applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/surfaceMeshWriterTemplates.C => src/conversion/vtk/output/foamVtkSurfaceMeshWriterTemplates.C (83%)
 rename applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/writeSurfFields.C => src/conversion/vtk/output/foamVtkWriteSurfFields.C (64%)
 rename applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/writeSurfFields.H => src/conversion/vtk/output/foamVtkWriteSurfFields.H (87%)
 rename {applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK => src/functionObjects/utilities}/writeVTK/writeVTK.C (81%)
 rename {applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK => src/functionObjects/utilities}/writeVTK/writeVTK.H (92%)
 rename {applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK => src/functionObjects/utilities}/writeVTK/writeVTKTemplates.C (100%)

diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/Allwmake b/applications/utilities/postProcessing/dataConversion/foamToVTK/Allwmake
deleted file mode 100755
index 81e0196f99..0000000000
--- a/applications/utilities/postProcessing/dataConversion/foamToVTK/Allwmake
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-cd ${0%/*} || exit 1    # Run from this directory
-
-# Parse arguments for library compilation
-. $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
-
-wmake $targetType foamToVTK
-wmake $targetType
-
-#------------------------------------------------------------------------------
diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/Make/files b/applications/utilities/postProcessing/dataConversion/foamToVTK/Make/files
index f10482758a..aaec9f26ab 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToVTK/Make/files
+++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/Make/files
@@ -1,3 +1,4 @@
+foamVtkLagrangianWriter.C
 foamToVTK.C
 
 EXE = $(FOAM_APPBIN)/foamToVTK
diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/Make/options b/applications/utilities/postProcessing/dataConversion/foamToVTK/Make/options
index c2445fd549..541ffa86ae 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToVTK/Make/options
+++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/Make/options
@@ -1,12 +1,13 @@
 EXE_INC = \
-    -IfoamToVTK/lnInclude \
+    -I$(LIB_SRC)/fileFormats/lnInclude \
+    -I$(LIB_SRC)/conversion/lnInclude \
     -I$(LIB_SRC)/lagrangian/basic/lnInclude \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/dynamicMesh/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude
 
 EXE_LIBS = \
-    -lfoamToVTK \
+    -lconversion \
     -ldynamicMesh \
     -llagrangian \
     -lgenericPatchFields
diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK.C b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK.C
index dcf612a663..1cc6bed8ec 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK.C
+++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK.C
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
-     \\/     M anipulation  | Copyright (C) 2016 OpenCFD Ltd.
+     \\/     M anipulation  | Copyright (C) 2016-2017 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -103,7 +103,7 @@ Usage
         use the time index in the VTK file name instead of the time index
 
 Note
-    mesh subset is handled by vtkMesh. Slight inconsistency in
+    mesh subset is handled by meshSubsetHelper. Slight inconsistency in
     interpolation: on the internal field it interpolates the whole volField
     to the whole-mesh pointField and then selects only those values it
     needs for the subMesh (using the fvMeshSubset cellMap(), pointMap()
@@ -154,25 +154,26 @@ Note
 #include "passiveParticle.H"
 #include "stringListOps.H"
 
-#include "vtkMesh.H"
+#include "meshSubsetHelper.H"
 #include "readFields.H"
-#include "writeFuns.H"
+#include "faceSet.H"
+#include "pointSet.H"
 
-#include "internalWriter.H"
-#include "patchWriter.H"
-#include "lagrangianWriter.H"
-
-#include "writeFaceSet.H"
-#include "writePointSet.H"
-#include "surfaceMeshWriter.H"
-#include "writeSurfFields.H"
+#include "foamVtkOutputOptions.H"
+#include "foamVtkInternalWriter.H"
+#include "foamVtkPatchWriter.H"
+#include "foamVtkSurfaceMeshWriter.H"
+#include "foamVtkLagrangianWriter.H"
+#include "foamVtkWriteFaceSet.H"
+#include "foamVtkWritePointSet.H"
+#include "foamVtkWriteSurfFields.H"
 
 #include "memInfo.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 template<class GeoField>
-void print(const char* msg, Ostream& os, const PtrList<const GeoField>& flds)
+void print(const char* msg, Ostream& os, const UPtrList<const GeoField>& flds)
 {
     if (flds.size())
     {
@@ -234,6 +235,56 @@ labelList getSelectedPatches
 }
 
 
+//
+// Process args for output options
+// Default from foamVtkOutputOptions is inline ASCII xml
+//
+enum foamVtkOutput::formatType getOutputOptions(const argList& args)
+{
+    if (!args.optionFound("ascii"))
+    {
+        if (sizeof(floatScalar) != 4 || sizeof(label) != 4)
+        {
+            WarningInFunction
+                << "Using ASCII rather than binary VTK format since "
+                << "floatScalar and/or label are not 4 bytes in size."
+                << nl << endl;
+        }
+        else
+        {
+            return foamVtkOutput::formatType::LEGACY_BINARY;
+        }
+    }
+
+    return foamVtkOutput::formatType::LEGACY_ASCII;
+}
+
+
+fileName relativeName(const fileName& parent, const fileName& file)
+{
+    string::size_type next = parent.size();
+    if
+    (
+        file.startsWith(parent)
+     && next < file.size()
+     && file[next] == '/'
+    )
+    {
+        return file.substr(next+1);
+    }
+    else
+    {
+        return file;
+    }
+}
+
+
+fileName relativeName(const Time& runTime, const fileName& file)
+{
+    return relativeName(runTime.path(), file);
+}
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 int main(int argc, char *argv[])
@@ -245,6 +296,7 @@ int main(int argc, char *argv[])
     timeSelector::addOptions();
 
     #include "addRegionOption.H"
+
     argList::addOption
     (
         "fields",
@@ -299,7 +351,6 @@ int main(int argc, char *argv[])
         "noLagrangian",
         "suppress writing lagrangian positions and fields"
     );
-
     argList::addBoolOption
     (
         "noPointValues",
@@ -345,22 +396,11 @@ int main(int argc, char *argv[])
     const bool doWriteInternal = !args.optionFound("noInternal");
     const bool doFaceZones     = !args.optionFound("noFaceZones");
     const bool doLinks         = !args.optionFound("noLinks");
-    bool binary                = !args.optionFound("ascii");
     const bool useTimeName     = args.optionFound("useTimeName");
     const bool noLagrangian    = args.optionFound("noLagrangian");
 
-    // Decomposition of polyhedral cells into tets/pyramids cells
-    vtkTopo::decomposePoly     = decomposePoly;
-
-    if (binary && (sizeof(floatScalar) != 4 || sizeof(label) != 4))
-    {
-        WarningInFunction
-            << "Using ASCII rather than binary VTK format because "
-               "floatScalar and/or label are not 4 bytes in size."
-            << nl << endl;
-        binary = false;
-    }
-
+    const enum foamVtkOutput::formatType fmtType = getOutputOptions(args);
+    const bool binary = (fmtType == foamVtkOutput::formatType::LEGACY_BINARY);
     const bool nearCellValue = args.optionFound("nearCellValue");
 
     if (nearCellValue)
@@ -388,11 +428,9 @@ int main(int argc, char *argv[])
         Info<< "Not including patches " << excludePatches << nl << endl;
     }
 
-    word cellSetName;
-    word faceSetName;
-    word pointSetName;
     string vtkName = runTime.caseName();
 
+    word cellSetName;
     if (args.optionReadIfPresent("cellSet", cellSetName))
     {
         vtkName = cellSetName;
@@ -407,9 +445,12 @@ int main(int argc, char *argv[])
             vtkName = vtkName.substr(i);
         }
     }
-    args.optionReadIfPresent("faceSet", faceSetName);
-    args.optionReadIfPresent("pointSet", pointSetName);
 
+    word faceSetName;
+    args.optionReadIfPresent("faceSet", faceSetName);
+
+    word pointSetName;
+    args.optionReadIfPresent("pointSet", pointSetName);
 
     #include "createNamedMesh.H"
 
@@ -450,9 +491,15 @@ int main(int argc, char *argv[])
 
     instantList timeDirs = timeSelector::select0(runTime, args);
 
-
     // Mesh wrapper: does subsetting and decomposition
-    vtkMesh vMesh(mesh, cellSetName);
+    meshSubsetHelper meshRef(mesh, meshSubsetHelper::SET, cellSetName);
+
+    // Collect decomposition information etc.
+    foamVtkCells foamVtkMeshCells
+    (
+        foamVtkCells::contentType::LEGACY,
+        decomposePoly
+    );
 
     Info<< "VTK mesh topology: "
         << timer.cpuTimeIncrement() << " s, "
@@ -471,20 +518,19 @@ int main(int argc, char *argv[])
 
         // Check for new polyMesh/ and update mesh, fvMeshSubset and cell
         // decomposition.
-        polyMesh::readUpdateState meshState = vMesh.readUpdate();
-
-        const fvMesh& mesh = vMesh.mesh();
+        polyMesh::readUpdateState meshState = meshRef.readUpdate();
 
+        const fvMesh& mesh = meshRef.mesh();
         if
         (
             meshState == polyMesh::TOPO_CHANGE
          || meshState == polyMesh::TOPO_PATCH_CHANGE
         )
         {
-            Info<< "    Read new mesh" << nl << endl;
+            // Trigger change for vtk cells too
+            foamVtkMeshCells.clear();
         }
 
-
         // If faceSet: write faceSet only (as polydata)
         if (faceSetName.size())
         {
@@ -501,10 +547,16 @@ int main(int argc, char *argv[])
               + timeDesc
               + ".vtk"
             );
+            Info<< "    faceSet   : "
+                << relativeName(runTime, outputName) << nl;
 
-            Info<< "    faceSet   : " << outputName << endl;
-
-            writeFaceSet(binary, vMesh.mesh(), set, outputName);
+            foamVtkOutput::writeFaceSet
+            (
+                binary,
+                meshRef.mesh(),
+                set,
+                outputName
+            );
             continue;
         }
 
@@ -524,10 +576,16 @@ int main(int argc, char *argv[])
               + timeDesc
               + ".vtk"
             );
+            Info<< "    pointSet  : "
+                << relativeName(runTime, outputName) << nl;
 
-            Info<< "    pointSet   : " << outputName << endl;
-
-            writePointSet(binary, vMesh.mesh(), set, outputName);
+            foamVtkOutput::writePointSet
+            (
+                binary,
+                meshRef.mesh(),
+                set,
+                outputName
+            );
             continue;
         }
 
@@ -544,97 +602,139 @@ int main(int argc, char *argv[])
 
         // Construct the vol fields (on the original mesh if subsetted)
 
-        PtrList<const volScalarField> vsf;
-        PtrList<const volVectorField> vvf;
-        PtrList<const volSphericalTensorField> vSpheretf;
-        PtrList<const volSymmTensorField> vSymmtf;
-        PtrList<const volTensorField> vtf;
+        PtrList<const volScalarField> vScalarFld;
+        PtrList<const volVectorField> vVectorFld;
+        PtrList<const volSphericalTensorField> vSphTensorf;
+        PtrList<const volSymmTensorField> vSymTensorFld;
+        PtrList<const volTensorField> vTensorFld;
 
         if (!specifiedFields || selectedFields.size())
         {
-            readFields(vMesh, vMesh.baseMesh(), objects, selectedFields, vsf);
-            print("    volScalarFields            :", Info, vsf);
-
-            readFields(vMesh, vMesh.baseMesh(), objects, selectedFields, vvf);
-            print("    volVectorFields            :", Info, vvf);
+            readFields
+            (
+                meshRef,
+                meshRef.baseMesh(),
+                objects,
+                selectedFields,
+                vScalarFld
+            );
+            print("    volScalar            :", Info, vScalarFld);
 
             readFields
             (
-                vMesh,
-                vMesh.baseMesh(),
+                meshRef,
+                meshRef.baseMesh(),
                 objects,
                 selectedFields,
-                vSpheretf
+                vVectorFld
             );
-            print("    volSphericalTensorFields   :", Info, vSpheretf);
+            print("    volVector            :", Info, vVectorFld);
 
             readFields
             (
-                vMesh,
-                vMesh.baseMesh(),
+                meshRef,
+                meshRef.baseMesh(),
                 objects,
                 selectedFields,
-                vSymmtf
+                vSphTensorf
             );
-            print("    volSymmTensorFields        :", Info, vSymmtf);
+            print("    volSphericalTensor   :", Info, vSphTensorf);
 
-            readFields(vMesh, vMesh.baseMesh(), objects, selectedFields, vtf);
-            print("    volTensorFields            :", Info, vtf);
+            readFields
+            (
+                meshRef,
+                meshRef.baseMesh(),
+                objects,
+                selectedFields,
+                vSymTensorFld
+            );
+            print("    volSymmTensor        :", Info, vSymTensorFld);
+
+            readFields
+            (
+                meshRef,
+                meshRef.baseMesh(),
+                objects,
+                selectedFields,
+                vTensorFld
+            );
+            print("    volTensor            :", Info, vTensorFld);
         }
 
-        label nVolFields =
-                vsf.size()
-              + vvf.size()
-              + vSpheretf.size()
-              + vSymmtf.size()
-              + vtf.size();
+        const label nVolFields =
+                vScalarFld.size()
+              + vVectorFld.size()
+              + vSphTensorf.size()
+              + vSymTensorFld.size()
+              + vTensorFld.size();
 
 
         // Construct dimensioned fields
-        PtrList<const volScalarField::Internal> dsf;
-        PtrList<const volVectorField::Internal> dvf;
-        PtrList<const volSphericalTensorField::Internal> dSpheretf;
-        PtrList<const volSymmTensorField::Internal> dSymmtf;
-        PtrList<const volTensorField::Internal> dtf;
+        PtrList<const volScalarField::Internal> dScalarFld;
+        PtrList<const volVectorField::Internal> dVectorFld;
+        PtrList<const volSphericalTensorField::Internal> dSphTensorFld;
+        PtrList<const volSymmTensorField::Internal> dSymTensorFld;
+        PtrList<const volTensorField::Internal> dTensorFld;
 
         if (!specifiedFields || selectedFields.size())
         {
-            readFields(vMesh, vMesh.baseMesh(), objects, selectedFields, dsf);
-            print("    volScalarFields::Internal          :", Info, dsf);
-
-            readFields(vMesh, vMesh.baseMesh(), objects, selectedFields, dvf);
-            print("    volVectorFields::Internal          :", Info, dvf);
+            readFields
+            (
+                meshRef,
+                meshRef.baseMesh(),
+                objects,
+                selectedFields,
+                dScalarFld
+            );
+            print("    volScalar::Internal          :", Info, dScalarFld);
 
             readFields
             (
-                vMesh,
-                vMesh.baseMesh(),
+                meshRef,
+                meshRef.baseMesh(),
                 objects,
                 selectedFields,
-                dSpheretf
+                dVectorFld
             );
-            print("    volSphericalTensorFields::Internal :", Info, dSpheretf);
+            print("    volVector::Internal          :", Info, dVectorFld);
 
             readFields
             (
-                vMesh,
-                vMesh.baseMesh(),
+                meshRef,
+                meshRef.baseMesh(),
                 objects,
                 selectedFields,
-                dSymmtf
+                dSphTensorFld
             );
-            print("    volSymmTensorFields::Internal      :", Info, dSymmtf);
+            print("    volSphericalTensor::Internal :", Info, dSphTensorFld);
 
-            readFields(vMesh, vMesh.baseMesh(), objects, selectedFields, dtf);
-            print("    volTensorFields::Internal          :", Info, dtf);
+            readFields
+            (
+                meshRef,
+                meshRef.baseMesh(),
+                objects,
+                selectedFields,
+                dSymTensorFld
+            );
+            print("    volSymmTensor::Internal      :", Info, dSymTensorFld);
+
+            readFields
+            (
+                meshRef,
+                meshRef.baseMesh(),
+                objects,
+                selectedFields,
+                dTensorFld
+            );
+            print("    volTensor::Internal          :", Info, dTensorFld);
         }
 
-        label nDimFields =
-                dsf.size()
-              + dvf.size()
-              + dSpheretf.size()
-              + dSymmtf.size()
-              + dtf.size();
+        const label nDimFields =
+                dScalarFld.size()
+              + dVectorFld.size()
+              + dSphTensorFld.size()
+              + dSymTensorFld.size()
+              + dTensorFld.size();
 
 
         // Construct pointMesh only if necessary since constructs edge
@@ -647,143 +747,160 @@ int main(int argc, char *argv[])
                 << " (\"-noPointValues\" (at your option)\n";
         }
 
-        PtrList<const pointScalarField> psf;
-        PtrList<const pointVectorField> pvf;
-        PtrList<const pointSphericalTensorField> pSpheretf;
-        PtrList<const pointSymmTensorField> pSymmtf;
-        PtrList<const pointTensorField> ptf;
+        PtrList<const pointScalarField> pScalarFld;
+        PtrList<const pointVectorField> pVectorFld;
+        PtrList<const pointSphericalTensorField> pSphTensorFld;
+        PtrList<const pointSymmTensorField> pSymTensorFld;
+        PtrList<const pointTensorField> pTensorFld;
 
         if (!noPointValues && !(specifiedFields && selectedFields.empty()))
         {
             readFields
             (
-                vMesh,
-                pointMesh::New(vMesh.baseMesh()),
+                meshRef,
+                pointMesh::New(meshRef.baseMesh()),
                 objects,
                 selectedFields,
-                psf
+                pScalarFld
             );
-            print("    pointScalarFields          :", Info, psf);
+            print("    pointScalar          :", Info, pScalarFld);
 
             readFields
             (
-                vMesh,
-                pointMesh::New(vMesh.baseMesh()),
+                meshRef,
+                pointMesh::New(meshRef.baseMesh()),
                 objects,
                 selectedFields,
-                pvf
+                pVectorFld
             );
-            print("    pointVectorFields          :", Info, pvf);
+            print("    pointVector          :", Info, pVectorFld);
 
             readFields
             (
-                vMesh,
-                pointMesh::New(vMesh.baseMesh()),
+                meshRef,
+                pointMesh::New(meshRef.baseMesh()),
                 objects,
                 selectedFields,
-                pSpheretf
+                pSphTensorFld
             );
-            print("    pointSphericalTensorFields :", Info, pSpheretf);
+            print("    pointSphericalTensor :", Info, pSphTensorFld);
 
             readFields
             (
-                vMesh,
-                pointMesh::New(vMesh.baseMesh()),
+                meshRef,
+                pointMesh::New(meshRef.baseMesh()),
                 objects,
                 selectedFields,
-                pSymmtf
+                pSymTensorFld
             );
-            print("    pointSymmTensorFields      :", Info, pSymmtf);
+            print("    pointSymmTensor      :", Info, pSymTensorFld);
 
             readFields
             (
-                vMesh,
-                pointMesh::New(vMesh.baseMesh()),
+                meshRef,
+                pointMesh::New(meshRef.baseMesh()),
                 objects,
                 selectedFields,
-                ptf
+                pTensorFld
             );
-            print("    pointTensorFields          :", Info, ptf);
+            print("    pointTensor          :", Info, pTensorFld);
         }
         Info<< endl;
 
-        label nPointFields =
-            psf.size()
-          + pvf.size()
-          + pSpheretf.size()
-          + pSymmtf.size()
-          + ptf.size();
+        const label nPointFields =
+            pScalarFld.size()
+          + pVectorFld.size()
+          + pSphTensorFld.size()
+          + pSymTensorFld.size()
+          + pTensorFld.size();
 
         if (doWriteInternal)
         {
+            if (foamVtkMeshCells.empty())
+            {
+                foamVtkMeshCells.reset(meshRef.mesh());
+
+                // Convert cellMap, addPointCellLabels to global cell ids
+                if (meshRef.useSubMesh())
+                {
+                    foamVtkMeshCells.renumberCells
+                    (
+                        meshRef.subsetter().cellMap()
+                    );
+                }
+            }
+
             // Create file and write header
-            fileName vtkFileName
+            fileName outputName
             (
                 fvPath/vtkName
               + "_"
               + timeDesc
               + ".vtk"
             );
-
-            Info<< "    Internal  : " << vtkFileName << endl;
+            Info<< "    Internal  : "
+                << relativeName(runTime, outputName) << endl;
 
             // Write mesh
-            internalWriter writer(vMesh, binary, vtkFileName);
-
-            // VolFields + cellID
-            writeFuns::writeCellDataHeader
+            foamVtkOutput::internalWriter writer
             (
-                writer.os(),
-                vMesh.nFieldCells(),
-                1 + nVolFields + nDimFields
+                meshRef.baseMesh(),
+                fmtType,
+                foamVtkMeshCells,
+                outputName
             );
 
-            // Write cellID field
-            writer.writeCellIDs();
+            // CellData
+            {
+                writer.beginCellData(1 + nVolFields + nDimFields);
 
-            // Write volFields
-            writer.write(vsf);
-            writer.write(vvf);
-            writer.write(vSpheretf);
-            writer.write(vSymmtf);
-            writer.write(vtf);
+                // Write cellID field
+                writer.writeCellIDs();
 
-            // Write dimensionedFields
-            writer.write<scalar, volMesh>(dsf);
-            writer.write<vector, volMesh>(dvf);
-            writer.write<sphericalTensor, volMesh>(dSpheretf);
-            writer.write<symmTensor, volMesh>(dSymmtf);
-            writer.write<tensor, volMesh>(dtf);
+                // Write volFields
+                writer.write(vScalarFld);
+                writer.write(vVectorFld);
+                writer.write(vSphTensorf);
+                writer.write(vSymTensorFld);
+                writer.write(vTensorFld);
 
+                // Write dimensionedFields
+                writer.write(dScalarFld);
+                writer.write(dVectorFld);
+                writer.write(dSphTensorFld);
+                writer.write(dSymTensorFld);
+                writer.write(dTensorFld);
+
+                writer.endCellData();
+            }
+
+            // PointData
             if (!noPointValues)
             {
-                writeFuns::writePointDataHeader
-                (
-                    writer.os(),
-                    vMesh.nFieldPoints(),
-                    nVolFields + nDimFields + nPointFields
-                );
+                writer.beginPointData(nVolFields + nDimFields + nPointFields);
 
                 // pointFields
-                writer.write(psf);
-                writer.write(pvf);
-                writer.write(pSpheretf);
-                writer.write(pSymmtf);
-                writer.write(ptf);
+                writer.write(pScalarFld);
+                writer.write(pVectorFld);
+                writer.write(pSphTensorFld);
+                writer.write(pSymTensorFld);
+                writer.write(pTensorFld);
 
                 // Interpolated volFields
                 volPointInterpolation pInterp(mesh);
-                writer.write(pInterp, vsf);
-                writer.write(pInterp, vvf);
-                writer.write(pInterp, vSpheretf);
-                writer.write(pInterp, vSymmtf);
-                writer.write(pInterp, vtf);
+                writer.write(pInterp, vScalarFld);
+                writer.write(pInterp, vVectorFld);
+                writer.write(pInterp, vSphTensorf);
+                writer.write(pInterp, vSymTensorFld);
+                writer.write(pInterp, vTensorFld);
 
-                writer.write<scalar, volMesh>(pInterp, dsf);
-                writer.write<vector, volMesh>(pInterp, dvf);
-                writer.write<sphericalTensor, volMesh>(pInterp, dSpheretf);
-                writer.write<symmTensor, volMesh>(pInterp, dSymmtf);
-                writer.write<tensor, volMesh>(pInterp, dtf);
+                writer.write(pInterp, dScalarFld);
+                writer.write(pInterp, dVectorFld);
+                writer.write(pInterp, dSphTensorFld);
+                writer.write(pInterp, dSymTensorFld);
+                writer.write(pInterp, dTensorFld);
+
+                writer.endPointData();
             }
         }
 
@@ -795,63 +912,66 @@ int main(int argc, char *argv[])
 
         if (args.optionFound("surfaceFields"))
         {
-            PtrList<const surfaceScalarField> ssf;
+            PtrList<const surfaceScalarField> sScalarFld;
             readFields
             (
-                vMesh,
-                vMesh.baseMesh(),
+                meshRef,
+                meshRef.baseMesh(),
                 objects,
                 selectedFields,
-                ssf
+                sScalarFld
             );
-            print("    surfScalarFields  :", Info, ssf);
+            print("    surfScalar  :", Info, sScalarFld);
 
-            PtrList<const surfaceVectorField> svf;
+            PtrList<const surfaceVectorField> sVectorFld;
             readFields
             (
-                vMesh,
-                vMesh.baseMesh(),
+                meshRef,
+                meshRef.baseMesh(),
                 objects,
                 selectedFields,
-                svf
+                sVectorFld
             );
-            print("    surfVectorFields  :", Info, svf);
+            print("    surfVector  :", Info, sVectorFld);
 
-            if (ssf.size() + svf.size() > 0)
+            if (sScalarFld.size())
             {
-                // Rework the scalar fields into vectorfields.
-                label sz = svf.size();
+                // Rework the scalar fields into vector fields.
+                const label sz = sVectorFld.size();
 
-                svf.setSize(sz+ssf.size());
+                sVectorFld.setSize(sz + sScalarFld.size());
 
                 surfaceVectorField n(mesh.Sf()/mesh.magSf());
 
-                forAll(ssf, i)
+                forAll(sScalarFld, i)
                 {
-                    surfaceVectorField* ssfiPtr = (ssf[i]*n).ptr();
-                    ssfiPtr->rename(ssf[i].name());
-                    svf.set(sz+i, ssfiPtr);
+                    surfaceVectorField* ssfPtr = (sScalarFld[i]*n).ptr();
+                    ssfPtr->rename(sScalarFld[i].name());
+                    sVectorFld.set(sz+i, ssfPtr);
                 }
-                ssf.clear();
+                sScalarFld.clear();
+            }
 
+            if (sVectorFld.size())
+            {
                 mkDir(fvPath / "surfaceFields");
 
-                fileName surfFileName
+                fileName outputName
                 (
                     fvPath
-                   /"surfaceFields"
-                   /"surfaceFields"
-                   + "_"
-                   + timeDesc
-                   + ".vtk"
+                  / "surfaceFields"
+                  / "surfaceFields"
+                  + "_"
+                  + timeDesc
+                  + ".vtk"
                 );
 
-                writeSurfFields
+                foamVtkOutput::writeSurfFields
                 (
                     binary,
-                    vMesh.mesh(),
-                    surfFileName,
-                    svf
+                    meshRef.mesh(),
+                    outputName,
+                    sVectorFld
                 );
             }
         }
@@ -869,72 +989,59 @@ int main(int argc, char *argv[])
         {
             mkDir(fvPath/"allPatches");
 
-            fileName outputName;
-
-            if (vMesh.useSubMesh())
-            {
-                outputName =
-                    fvPath/"allPatches"/cellSetName
-                  + "_"
-                  + timeDesc
-                  + ".vtk";
-            }
-            else
-            {
-                outputName =
-                    fvPath/"allPatches"/"allPatches"
-                  + "_"
-                  + timeDesc
-                  + ".vtk";
-            }
-
-            Info<< "    Combined patches     : " << outputName << endl;
-
-            patchWriter writer
+            fileName outputName
             (
-                vMesh.mesh(),
+                fvPath/"allPatches"
+              / (meshRef.useSubMesh() ? cellSetName : "allPatches")
+              + "_"
+              + timeDesc
+              + ".vtk"
+            );
+            Info<< "    Combined patches     : "
+                << relativeName(runTime, outputName) << nl;
+
+            foamVtkOutput::patchWriter writer
+            (
+                meshRef.mesh(),
                 binary,
                 nearCellValue,
                 outputName,
                 getSelectedPatches(patches, excludePatches)
             );
 
-            // VolFields + patchID
-            writeFuns::writeCellDataHeader
-            (
-                writer.os(),
-                writer.nFaces(),
-                1+nVolFields
-            );
+            // CellData
+            {
+                writer.beginCellData(1 + nVolFields);
 
-            // Write patchID field
-            writer.writePatchIDs();
+                // Write patchID field
+                writer.writePatchIDs();
 
-            // Write volFields
-            writer.write(vsf);
-            writer.write(vvf);
-            writer.write(vSpheretf);
-            writer.write(vSymmtf);
-            writer.write(vtf);
+                // Write volFields
+                writer.write(vScalarFld);
+                writer.write(vVectorFld);
+                writer.write(vSphTensorf);
+                writer.write(vSymTensorFld);
+                writer.write(vTensorFld);
 
+                writer.endCellData();
+            }
+
+            // PointData
             if (!noPointValues)
             {
-                writeFuns::writePointDataHeader
-                (
-                    writer.os(),
-                    writer.nPoints(),
-                    nPointFields
-                );
+                writer.beginPointData(nPointFields);
 
                 // Write pointFields
-                writer.write(psf);
-                writer.write(pvf);
-                writer.write(pSpheretf);
-                writer.write(pSymmtf);
-                writer.write(ptf);
+                writer.write(pScalarFld);
+                writer.write(pVectorFld);
+                writer.write(pSphTensorFld);
+                writer.write(pSymTensorFld);
+                writer.write(pTensorFld);
 
                 // no interpolated volFields since I cannot be bothered to
                 // create the patchInterpolation for all subpatches.
+
+                writer.endPointData();
             }
         }
         else
@@ -943,89 +1050,75 @@ int main(int argc, char *argv[])
             {
                 const polyPatch& pp = patches[patchi];
 
-                if (!findStrings(excludePatches, pp.name()))
+                if (findStrings(excludePatches, pp.name()))
                 {
-                    mkDir(fvPath/pp.name());
+                    // Skip excluded patch
+                    continue;
+                }
 
-                    fileName outputName;
+                mkDir(fvPath/pp.name());
 
-                    if (vMesh.useSubMesh())
+                fileName outputName
+                (
+                    fvPath/pp.name()
+                  / (meshRef.useSubMesh() ? cellSetName : pp.name())
+                  + "_"
+                  + timeDesc
+                  + ".vtk"
+                );
+                Info<< "    Patch     : "
+                    << relativeName(runTime, outputName) << nl;
+
+                foamVtkOutput::patchWriter writer
+                (
+                    meshRef.mesh(),
+                    binary,
+                    nearCellValue,
+                    outputName,
+                    labelList{patchi}
+                );
+
+                if (!isA<emptyPolyPatch>(pp))
+                {
+                    // VolFields + patchID
+                    writer.beginCellData(1+nVolFields);
+
+                    // Write patchID field
+                    writer.writePatchIDs();
+
+                    // Write volFields
+                    writer.write(vScalarFld);
+                    writer.write(vVectorFld);
+                    writer.write(vSphTensorf);
+                    writer.write(vSymTensorFld);
+                    writer.write(vTensorFld);
+
+                    writer.endCellData();
+
+                    if (!noPointValues)
                     {
-                        outputName =
-                            fvPath/pp.name()/cellSetName
-                          + "_"
-                          + timeDesc
-                          + ".vtk";
-                    }
-                    else
-                    {
-                        outputName =
-                            fvPath/pp.name()/pp.name()
-                          + "_"
-                          + timeDesc
-                          + ".vtk";
-                    }
+                        writer.beginPointData(nVolFields + nPointFields);
 
-                    Info<< "    Patch     : " << outputName << endl;
+                        // Write pointFields
+                        writer.write(pScalarFld);
+                        writer.write(pVectorFld);
+                        writer.write(pSphTensorFld);
+                        writer.write(pSymTensorFld);
+                        writer.write(pTensorFld);
 
-                    patchWriter writer
-                    (
-                        vMesh.mesh(),
-                        binary,
-                        nearCellValue,
-                        outputName,
-                        labelList{patchi}
-                    );
-
-                    if (!isA<emptyPolyPatch>(pp))
-                    {
-                        // VolFields + patchID
-                        writeFuns::writeCellDataHeader
+                        PrimitivePatchInterpolation<primitivePatch> pInter
                         (
-                            writer.os(),
-                            writer.nFaces(),
-                            1+nVolFields
+                            pp
                         );
 
-                        // Write patchID field
-                        writer.writePatchIDs();
+                        // Write interpolated volFields
+                        writer.write(pInter, vScalarFld);
+                        writer.write(pInter, vVectorFld);
+                        writer.write(pInter, vSphTensorf);
+                        writer.write(pInter, vSymTensorFld);
+                        writer.write(pInter, vTensorFld);
 
-                        // Write volFields
-                        writer.write(vsf);
-                        writer.write(vvf);
-                        writer.write(vSpheretf);
-                        writer.write(vSymmtf);
-                        writer.write(vtf);
-
-                        if (!noPointValues)
-                        {
-                            writeFuns::writePointDataHeader
-                            (
-                                writer.os(),
-                                writer.nPoints(),
-                                nVolFields
-                              + nPointFields
-                            );
-
-                            // Write pointFields
-                            writer.write(psf);
-                            writer.write(pvf);
-                            writer.write(pSpheretf);
-                            writer.write(pSymmtf);
-                            writer.write(ptf);
-
-                            PrimitivePatchInterpolation<primitivePatch> pInter
-                            (
-                                pp
-                            );
-
-                            // Write interpolated volFields
-                            writer.write(pInter, vsf);
-                            writer.write(pInter, vvf);
-                            writer.write(pInter, vSpheretf);
-                            writer.write(pInter, vSymmtf);
-                            writer.write(pInter, vtf);
-                        }
+                        writer.endPointData();
                     }
                 }
             }
@@ -1039,27 +1132,27 @@ int main(int argc, char *argv[])
 
         if (doFaceZones)
         {
-            PtrList<const surfaceScalarField> ssf;
+            PtrList<const surfaceScalarField> sScalarFld;
             readFields
             (
-                vMesh,
-                vMesh.baseMesh(),
+                meshRef,
+                meshRef.baseMesh(),
                 objects,
                 selectedFields,
-                ssf
+                sScalarFld
             );
-            print("    surfScalarFields  :", Info, ssf);
+            print("    surfScalar  :", Info, sScalarFld);
 
-            PtrList<const surfaceVectorField> svf;
+            PtrList<const surfaceVectorField> sVectorFld;
             readFields
             (
-                vMesh,
-                vMesh.baseMesh(),
+                meshRef,
+                meshRef.baseMesh(),
                 objects,
                 selectedFields,
-                svf
+                sVectorFld
             );
-            print("    surfVectorFields  :", Info, svf);
+            print("    surfVector  :", Info, sVectorFld);
 
             const faceZoneMesh& zones = mesh.faceZones();
 
@@ -1069,26 +1162,16 @@ int main(int argc, char *argv[])
 
                 mkDir(fvPath/fz.name());
 
-                fileName outputName;
-
-                if (vMesh.useSubMesh())
-                {
-                    outputName =
-                        fvPath/fz.name()/cellSetName
-                      + "_"
-                      + timeDesc
-                      + ".vtk";
-                }
-                else
-                {
-                    outputName =
-                        fvPath/fz.name()/fz.name()
-                      + "_"
-                      + timeDesc
-                      + ".vtk";
-                }
-
-                Info<< "    FaceZone  : " << outputName << endl;
+                fileName outputName =
+                (
+                    fvPath/fz.name()
+                  / (meshRef.useSubMesh() ? cellSetName : fz.name())
+                  + "_"
+                  + timeDesc
+                  + ".vtk"
+                );
+                Info<< "    FaceZone  : "
+                    << relativeName(runTime, outputName) << nl;
 
                 indirectPrimitivePatch pp
                 (
@@ -1096,7 +1179,7 @@ int main(int argc, char *argv[])
                     mesh.points()
                 );
 
-                surfaceMeshWriter writer
+                foamVtkOutput::surfaceMeshWriter writer
                 (
                     binary,
                     pp,
@@ -1105,20 +1188,16 @@ int main(int argc, char *argv[])
                 );
 
                 // Number of fields
-                writeFuns::writeCellDataHeader
-                (
-                    writer.os(),
-                    pp.size(),
-                    ssf.size()+svf.size()
-                );
+                writer.beginCellData(sScalarFld.size() + sVectorFld.size());
 
-                writer.write(ssf);
-                writer.write(svf);
+                writer.write(sScalarFld);
+                writer.write(sVectorFld);
+
+                writer.endCellData();
             }
         }
 
 
-
         //---------------------------------------------------------------------
         //
         // Write lagrangian data
@@ -1137,8 +1216,8 @@ int main(int argc, char *argv[])
                 fvPath/cloud::prefix/cloudName/cloudName
               + "_" + timeDesc + ".vtk"
             );
-
-            Info<< "    Lagrangian: " << outputName << endl;
+            Info<< "    Lagrangian: "
+                << relativeName(runTime, outputName) << nl;
 
             IOobjectList sprayObjs
             (
@@ -1185,9 +1264,9 @@ int main(int argc, char *argv[])
                 Info<< "        tensors           :";
                 print(Info, tensorNames);
 
-                lagrangianWriter writer
+                foamVtkOutput::lagrangianWriter writer
                 (
-                    vMesh.mesh(),
+                    meshRef.mesh(),
                     binary,
                     outputName,
                     cloudName,
@@ -1195,7 +1274,7 @@ int main(int argc, char *argv[])
                 );
 
                 // Write number of fields
-                writer.writeParcelHeader
+                writer.beginParcelData
                 (
                     labelNames.size()
                   + scalarNames.size()
@@ -1212,12 +1291,14 @@ int main(int argc, char *argv[])
                 writer.writeIOField<sphericalTensor>(sphereNames);
                 writer.writeIOField<symmTensor>(symmNames);
                 writer.writeIOField<tensor>(tensorNames);
+
+                writer.endParcelData();
             }
             else
             {
-                lagrangianWriter writer
+                foamVtkOutput::lagrangianWriter writer
                 (
-                    vMesh.mesh(),
+                    meshRef.mesh(),
                     binary,
                     outputName,
                     cloudName,
@@ -1225,7 +1306,9 @@ int main(int argc, char *argv[])
                 );
 
                 // Write number of fields
-                writer.writeParcelHeader(0);
+                writer.beginParcelData(0);
+
+                writer.endParcelData();
             }
         }
 
@@ -1253,8 +1336,8 @@ int main(int argc, char *argv[])
         fileName procVTK
         (
             fileName("..")
-           /"processor" + name(Pstream::myProcNo())
-           /"VTK"
+          / "processor" + Foam::name(Pstream::myProcNo())
+          / "VTK"
         );
 
         fileNameList dirs(readDir(procVTK, fileName::DIRECTORY));
@@ -1272,17 +1355,21 @@ int main(int argc, char *argv[])
 
                 if (exists(procFile))
                 {
-                    string cmd
-                    (
-                        "ln -s "
-                      + procFile
-                      + " "
-                      + "processor"
-                      + name(Pstream::myProcNo())
-                      + "_"
-                      + procFile.name()
-                    );
-                    if (Foam::system(cmd.c_str()) == -1)
+                    // Could likely also use Foam::ln() directly
+                    List<string> cmd
+                    {
+                        "ln",
+                        "-s",
+                        procFile,
+                        (
+                            "processor"
+                          + Foam::name(Pstream::myProcNo())
+                          + "_"
+                          + procFile.name()
+                        )
+                    };
+
+                    if (Foam::system(cmd) == -1)
                     {
                         WarningInFunction
                             << "Could not execute command " << cmd << endl;
diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/Make/files b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/Make/files
deleted file mode 100644
index 02de5b47e6..0000000000
--- a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/Make/files
+++ /dev/null
@@ -1,13 +0,0 @@
-surfaceMeshWriter.C
-internalWriter.C
-lagrangianWriter.C
-patchWriter.C
-writeFuns.C
-writeFaceSet.C
-writePointSet.C
-writeSurfFields.C
-vtkTopo.C
-
-writeVTK/writeVTK.C
-
-LIB = $(FOAM_LIBBIN)/libfoamToVTK
diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/Make/options b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/Make/options
deleted file mode 100644
index f10e4ec1d6..0000000000
--- a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/Make/options
+++ /dev/null
@@ -1,10 +0,0 @@
-EXE_INC = \
-    -I$(LIB_SRC)/lagrangian/basic/lnInclude \
-    -I$(LIB_SRC)/finiteVolume/lnInclude \
-    -I$(LIB_SRC)/dynamicMesh/lnInclude \
-    -I$(LIB_SRC)/meshTools/lnInclude
-
-LIB_LIBS = \
-    -ldynamicMesh \
-    -llagrangian \
-    -lgenericPatchFields
diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/internalWriter.C b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/internalWriter.C
deleted file mode 100644
index 4db9f9c069..0000000000
--- a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/internalWriter.C
+++ /dev/null
@@ -1,165 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-License
-    This file is part of OpenFOAM.
-
-    OpenFOAM is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "internalWriter.H"
-#include "writeFuns.H"
-
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
-
-Foam::internalWriter::internalWriter
-(
-    const vtkMesh& vMesh,
-    const bool binary,
-    const fileName& fName
-)
-:
-    vMesh_(vMesh),
-    binary_(binary),
-    fName_(fName),
-    os_(fName.c_str())
-{
-    const fvMesh& mesh = vMesh_.mesh();
-    const vtkTopo& topo = vMesh_.topo();
-
-    // Write header
-    writeFuns::writeHeader(os_, binary_, mesh.time().caseName());
-    os_ << "DATASET UNSTRUCTURED_GRID" << std::endl;
-
-
-    //------------------------------------------------------------------
-    //
-    // Write topology
-    //
-    //------------------------------------------------------------------
-
-    const labelList& addPointCellLabels = topo.addPointCellLabels();
-    const label nTotPoints = mesh.nPoints() + addPointCellLabels.size();
-
-    os_ << "POINTS " << nTotPoints << " float" << std::endl;
-
-    DynamicList<floatScalar> ptField(3*nTotPoints);
-
-    writeFuns::insert(mesh.points(), ptField);
-
-    const pointField& ctrs = mesh.cellCentres();
-    forAll(addPointCellLabels, api)
-    {
-        writeFuns::insert(ctrs[addPointCellLabels[api]], ptField);
-    }
-    writeFuns::write(os_, binary_, ptField);
-
-
-    //
-    // Write cells
-    //
-
-    const labelListList& vtkVertLabels = topo.vertLabels();
-
-    // Count total number of vertices referenced.
-    label nFaceVerts = 0;
-
-    forAll(vtkVertLabels, celli)
-    {
-        nFaceVerts += vtkVertLabels[celli].size() + 1;
-    }
-
-    os_ << "CELLS " << vtkVertLabels.size() << ' ' << nFaceVerts << std::endl;
-
-    DynamicList<label> vertLabels(nFaceVerts);
-
-    forAll(vtkVertLabels, celli)
-    {
-        const labelList& vtkVerts = vtkVertLabels[celli];
-
-        vertLabels.append(vtkVerts.size());
-
-        writeFuns::insert(vtkVerts, vertLabels);
-    }
-    writeFuns::write(os_, binary_, vertLabels);
-
-
-    const labelList& vtkCellTypes = topo.cellTypes();
-
-    os_ << "CELL_TYPES " << vtkCellTypes.size() << std::endl;
-
-    // Make copy since writing might swap stuff.
-    DynamicList<label> cellTypes(vtkCellTypes.size());
-
-    writeFuns::insert(vtkCellTypes, cellTypes);
-
-    writeFuns::write(os_, binary_, cellTypes);
-}
-
-
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-
-void Foam::internalWriter::writeCellIDs()
-{
-    const fvMesh& mesh = vMesh_.mesh();
-    const vtkTopo& topo = vMesh_.topo();
-    const labelList& vtkCellTypes = topo.cellTypes();
-    const labelList& superCells = topo.superCells();
-
-    // Cell ids first
-    os_ << "cellID 1 " << vtkCellTypes.size() << " int" << std::endl;
-
-    labelList cellId(vtkCellTypes.size());
-    label labelI = 0;
-
-
-    if (vMesh_.useSubMesh())
-    {
-        const labelList& cMap = vMesh_.subsetter().cellMap();
-
-        forAll(mesh.cells(), celli)
-        {
-            cellId[labelI++] = cMap[celli];
-        }
-        forAll(superCells, superCelli)
-        {
-            label origCelli = cMap[superCells[superCelli]];
-
-            cellId[labelI++] = origCelli;
-        }
-    }
-    else
-    {
-        forAll(mesh.cells(), celli)
-        {
-            cellId[labelI++] = celli;
-        }
-        forAll(superCells, superCelli)
-        {
-            label origCelli = superCells[superCelli];
-
-            cellId[labelI++] = origCelli;
-        }
-    }
-
-    writeFuns::write(os_, binary_, cellId);
-}
-
-
-// ************************************************************************* //
diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/internalWriter.H b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/internalWriter.H
deleted file mode 100644
index b1836afb60..0000000000
--- a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/internalWriter.H
+++ /dev/null
@@ -1,135 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
-     \\/     M anipulation  | Copyright (C) 2016 OpenCFD Ltd.
--------------------------------------------------------------------------------
-License
-    This file is part of OpenFOAM.
-
-    OpenFOAM is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
-
-Class
-    Foam::internalWriter
-
-Description
-    Write fields (internal).
-
-SourceFiles
-    internalWriter.C
-    internalWriterTemplates.C
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef internalWriter_H
-#define internalWriter_H
-
-#include "OFstream.H"
-#include "volFields.H"
-#include "pointFields.H"
-#include "vtkMesh.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-class volPointInterpolation;
-
-/*---------------------------------------------------------------------------*\
-                           Class internalWriter Declaration
-\*---------------------------------------------------------------------------*/
-
-class internalWriter
-{
-    const vtkMesh& vMesh_;
-
-    const bool binary_;
-
-    const fileName fName_;
-
-    std::ofstream os_;
-
-public:
-
-    // Constructors
-
-        //- Construct from components
-        internalWriter
-        (
-            const vtkMesh&,
-            const bool binary,
-            const fileName&
-        );
-
-
-    // Member Functions
-
-        std::ofstream& os()
-        {
-            return os_;
-        }
-
-        //- Write cellIDs
-        void writeCellIDs();
-
-        //- Write generic GeometricFields
-        template<class Type, template<class> class PatchField, class GeoMesh>
-        void write
-        (
-            const UPtrList<const GeometricField<Type, PatchField, GeoMesh>>&
-        );
-
-        //- Write generic internal fields
-        template<class Type, class GeoMesh>
-        void write
-        (
-            const PtrList<const DimensionedField<Type, volMesh>>& flds
-        );
-
-        //- Interpolate and write volFields
-        template<class Type>
-        void write
-        (
-            const volPointInterpolation&,
-            const UPtrList<const GeometricField<Type, fvPatchField, volMesh>>&
-        );
-
-        //- Interpolate and internal fields
-        template<class Type, class GeoMesh>
-        void write
-        (
-            const volPointInterpolation&,
-            const PtrList<const DimensionedField<Type, volMesh>>&
-        );
-};
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#ifdef NoRepository
-    #include "internalWriterTemplates.C"
-#endif
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/internalWriterTemplates.C b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/internalWriterTemplates.C
deleted file mode 100644
index f5e3b1aa39..0000000000
--- a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/internalWriterTemplates.C
+++ /dev/null
@@ -1,99 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-License
-    This file is part of OpenFOAM.
-
-    OpenFOAM is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "internalWriter.H"
-#include "writeFuns.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-template<class Type, template<class> class PatchField, class GeoMesh>
-void Foam::internalWriter::write
-(
-    const UPtrList<const GeometricField<Type, PatchField, GeoMesh>>& flds
-)
-{
-    forAll(flds, i)
-    {
-        writeFuns::write(os_, binary_, flds[i], vMesh_);
-    }
-}
-
-
-template<class Type, class GeoMesh>
-void Foam::internalWriter::write
-(
-    const PtrList<const DimensionedField<Type, volMesh>>& flds
-)
-{
-    forAll(flds, i)
-    {
-        writeFuns::write(os_, binary_, flds[i], vMesh_);
-    }
-}
-
-
-template<class Type>
-void Foam::internalWriter::write
-(
-    const volPointInterpolation& pInterp,
-    const UPtrList<const GeometricField<Type, fvPatchField, volMesh>>& flds
-)
-{
-    forAll(flds, i)
-    {
-        writeFuns::write
-        (
-            os_,
-            binary_,
-            flds[i],
-            pInterp.interpolate(flds[i])(),
-            vMesh_
-        );
-    }
-}
-
-
-template<class Type, class GeoMesh>
-void Foam::internalWriter::write
-(
-    const volPointInterpolation& pInterp,
-    const PtrList<const DimensionedField<Type, volMesh>>& flds
-)
-{
-    forAll(flds, i)
-    {
-        writeFuns::write
-        (
-            os_,
-            binary_,
-            flds[i],
-            pInterp.interpolate(flds[i])(),
-            vMesh_
-        );
-    }
-}
-
-
-// ************************************************************************* //
diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/vtkMesh.H b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/vtkMesh.H
deleted file mode 100644
index f0a80db4ea..0000000000
--- a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/vtkMesh.H
+++ /dev/null
@@ -1,137 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
-     \\/     M anipulation  | Copyright (C) 2016 OpenCFD Ltd.
--------------------------------------------------------------------------------
-License
-    This file is part of OpenFOAM.
-
-    OpenFOAM is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
-
-Class
-    Foam::vtkMesh
-
-Description
-    Encapsulation of VTK mesh data. Holds mesh or meshsubset and
-    polyhedral-cell decomposition on it.
-
-SourceFiles
-    vtkMesh.C
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef vtkMesh_H
-#define vtkMesh_H
-
-#include "meshSubsetHelper.H"
-#include "vtkTopo.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-/*---------------------------------------------------------------------------*\
-                           Class vtkMesh Declaration
-\*---------------------------------------------------------------------------*/
-
-class vtkMesh
-:
-    public meshSubsetHelper
-{
-    // Private data
-
-        //- Current decomposition of topology
-        mutable autoPtr<vtkTopo> topoPtr_;
-
-
-    // Private Member Functions
-
-        //- Disallow default bitwise copy construct
-        vtkMesh(const vtkMesh&) = delete;
-
-        //- Disallow default bitwise assignment
-        void operator=(const vtkMesh&) = delete;
-
-
-public:
-
-    // Constructors
-
-        //- Construct from components
-        vtkMesh(fvMesh& baseMesh, const word& setName = word::null)
-        :
-            meshSubsetHelper(baseMesh, meshSubsetHelper::SET, setName)
-        {}
-
-
-    // Member Functions
-
-        // Access
-
-            //- Topology
-            const vtkTopo& topo() const
-            {
-                if (topoPtr_.empty())
-                {
-                    topoPtr_.reset(new vtkTopo(mesh()));
-                }
-                return topoPtr_();
-            }
-
-
-            //- Number of field cells
-            label nFieldCells() const
-            {
-                return topo().cellTypes().size();
-            }
-
-
-            //- Number of field points
-            label nFieldPoints() const
-            {
-                return mesh().nPoints() + topo().addPointCellLabels().size();
-            }
-
-
-        // Edit
-
-            //- Read mesh, forcing topo update if necessary
-            polyMesh::readUpdateState readUpdate()
-            {
-                polyMesh::readUpdateState meshState
-                    = meshSubsetHelper::readUpdate();
-
-                if (meshState != polyMesh::UNCHANGED)
-                {
-                    topoPtr_.clear();
-                }
-
-                return meshState;
-            }
-
-};
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/vtkTopo.C b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/vtkTopo.C
deleted file mode 100644
index dc6ece136b..0000000000
--- a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/vtkTopo.C
+++ /dev/null
@@ -1,373 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-License
-    This file is part of OpenFOAM.
-
-    OpenFOAM is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
-
-Description
-    Note: bug in vtk displaying wedges? Seems to display ok if we decompose
-    them. Should be thoroughly tested!
-    (they appear rarely in polyhedral meshes, do appear in some cut meshes)
-
-\*---------------------------------------------------------------------------*/
-
-#include "vtkTopo.H"
-#include "polyMesh.H"
-#include "cellShape.H"
-#include "cellModeller.H"
-#include "Swap.H"
-
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-bool Foam::vtkTopo::decomposePoly = true;
-
-
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
-
-Foam::vtkTopo::vtkTopo(const polyMesh& mesh)
-:
-    mesh_(mesh),
-    vertLabels_(),
-    cellTypes_(),
-    addPointCellLabels_(),
-    superCells_()
-{
-    const cellModel& tet = *(cellModeller::lookup("tet"));
-    const cellModel& pyr = *(cellModeller::lookup("pyr"));
-    const cellModel& prism = *(cellModeller::lookup("prism"));
-    const cellModel& wedge = *(cellModeller::lookup("wedge"));
-    const cellModel& tetWedge = *(cellModeller::lookup("tetWedge"));
-    const cellModel& hex = *(cellModeller::lookup("hex"));
-
-    const cellShapeList& cellShapes = mesh_.cellShapes();
-
-    // Number of additional points needed by the decomposition of polyhedra
-    label nAddPoints = 0;
-
-    // Number of additional cells generated by the decomposition of polyhedra
-    label nAddCells = 0;
-
-    // face owner is needed to determine the face orientation
-    const labelList& owner = mesh.faceOwner();
-
-    // Scan for cells which need to be decomposed and count additional points
-    // and cells
-    if (decomposePoly)
-    {
-        forAll(cellShapes, celli)
-        {
-            const cellModel& model = cellShapes[celli].model();
-
-            if
-            (
-                model != hex
-             && model != wedge    // See above.
-             && model != prism
-             && model != pyr
-             && model != tet
-             && model != tetWedge
-            )
-            {
-                const cell& cFaces = mesh_.cells()[celli];
-
-                forAll(cFaces, cFacei)
-                {
-                    const face& f = mesh_.faces()[cFaces[cFacei]];
-
-                    label nQuads = 0;
-                    label nTris = 0;
-                    f.nTrianglesQuads(mesh_.points(), nTris, nQuads);
-
-                    nAddCells += nQuads + nTris;
-                }
-
-                nAddCells--;
-                nAddPoints++;
-            }
-        }
-    }
-
-
-    // Set size of additional point addressing array
-    // (from added point to original cell)
-    addPointCellLabels_.setSize(nAddPoints);
-
-    // Set size of additional cells mapping array
-    // (from added cell to original cell)
-    superCells_.setSize(nAddCells);
-
-    // List of vertex labels in VTK ordering
-    vertLabels_.setSize(cellShapes.size() + nAddCells);
-
-    // Label of vtk type
-    cellTypes_.setSize(cellShapes.size() + nAddCells);
-
-    // Set counters for additional points and additional cells
-    label addPointi = 0, addCelli = 0;
-
-    forAll(cellShapes, celli)
-    {
-        const cellShape& cellShape = cellShapes[celli];
-        const cellModel& cellModel = cellShape.model();
-
-        labelList& vtkVerts = vertLabels_[celli];
-
-        if (cellModel == tet)
-        {
-            vtkVerts = cellShape;
-
-            cellTypes_[celli] = VTK_TETRA;
-        }
-        else if (cellModel == pyr)
-        {
-            vtkVerts = cellShape;
-
-            cellTypes_[celli] = VTK_PYRAMID;
-        }
-        else if (cellModel == prism)
-        {
-            // VTK has a different node order for VTK_WEDGE
-            // their triangles point outwards!
-            vtkVerts = cellShape;
-
-            Foam::Swap(vtkVerts[1], vtkVerts[2]);
-            Foam::Swap(vtkVerts[4], vtkVerts[5]);
-
-            cellTypes_[celli] = VTK_WEDGE;
-        }
-        else if (cellModel == tetWedge && decomposePoly)
-        {
-            // Treat as squeezed prism (VTK_WEDGE)
-            vtkVerts.setSize(6);
-            vtkVerts[0] = cellShape[0];
-            vtkVerts[1] = cellShape[2];
-            vtkVerts[2] = cellShape[1];
-            vtkVerts[3] = cellShape[3];
-            vtkVerts[4] = cellShape[4];
-            vtkVerts[5] = cellShape[3];
-
-            cellTypes_[celli] = VTK_WEDGE;
-        }
-        else if (cellModel == wedge)
-        {
-            // Treat as squeezed hex
-            vtkVerts.setSize(8);
-            vtkVerts[0] = cellShape[0];
-            vtkVerts[1] = cellShape[1];
-            vtkVerts[2] = cellShape[2];
-            vtkVerts[3] = cellShape[2];
-            vtkVerts[4] = cellShape[3];
-            vtkVerts[5] = cellShape[4];
-            vtkVerts[6] = cellShape[5];
-            vtkVerts[7] = cellShape[6];
-
-            cellTypes_[celli] = VTK_HEXAHEDRON;
-        }
-        else if (cellModel == hex)
-        {
-            vtkVerts = cellShape;
-
-            cellTypes_[celli] = VTK_HEXAHEDRON;
-        }
-        else if (decomposePoly)
-        {
-            // Polyhedral cell. Decompose into tets + pyramids.
-
-            // Mapping from additional point to cell
-            addPointCellLabels_[addPointi] = celli;
-
-            // The new vertex from the cell-centre
-            const label newVertexLabel = mesh_.nPoints() + addPointi;
-
-            // Whether to insert cell in place of original or not.
-            bool substituteCell = true;
-
-            const labelList& cFaces = mesh_.cells()[celli];
-            forAll(cFaces, cFacei)
-            {
-                const face& f = mesh_.faces()[cFaces[cFacei]];
-                const bool isOwner = (owner[cFaces[cFacei]] == celli);
-
-                // Number of triangles and quads in decomposition
-                label nTris = 0;
-                label nQuads = 0;
-                f.nTrianglesQuads(mesh_.points(), nTris, nQuads);
-
-                // Do actual decomposition into triFcs and quadFcs.
-                faceList triFcs(nTris);
-                faceList quadFcs(nQuads);
-                label trii = 0;
-                label quadi = 0;
-                f.trianglesQuads(mesh_.points(), trii, quadi, triFcs, quadFcs);
-
-                forAll(quadFcs, quadI)
-                {
-                    label thisCelli;
-
-                    if (substituteCell)
-                    {
-                        thisCelli = celli;
-                        substituteCell = false;
-                    }
-                    else
-                    {
-                        thisCelli = mesh_.nCells() + addCelli;
-                        superCells_[addCelli++] = celli;
-                    }
-
-                    labelList& addVtkVerts = vertLabels_[thisCelli];
-
-                    addVtkVerts.setSize(5);
-
-                    const face& quad = quadFcs[quadI];
-
-                    // Ensure we have the correct orientation for the
-                    // base of the primitive cell shape.
-                    // If the cell is face owner, the orientation needs to be
-                    // flipped.
-                    // At the moment, VTK doesn't actually seem to care if
-                    // negative cells are defined, but we'll do it anyhow
-                    // (for safety).
-                    if (isOwner)
-                    {
-                        addVtkVerts[0] = quad[3];
-                        addVtkVerts[1] = quad[2];
-                        addVtkVerts[2] = quad[1];
-                        addVtkVerts[3] = quad[0];
-                    }
-                    else
-                    {
-                        addVtkVerts[0] = quad[0];
-                        addVtkVerts[1] = quad[1];
-                        addVtkVerts[2] = quad[2];
-                        addVtkVerts[3] = quad[3];
-                    }
-                    addVtkVerts[4] = newVertexLabel;
-
-                    cellTypes_[thisCelli] = VTK_PYRAMID;
-                }
-
-                forAll(triFcs, triI)
-                {
-                    label thisCelli;
-
-                    if (substituteCell)
-                    {
-                        thisCelli = celli;
-                        substituteCell = false;
-                    }
-                    else
-                    {
-                        thisCelli = mesh_.nCells() + addCelli;
-                        superCells_[addCelli++] = celli;
-                    }
-
-
-                    labelList& addVtkVerts = vertLabels_[thisCelli];
-
-                    const face& tri = triFcs[triI];
-
-                    addVtkVerts.setSize(4);
-
-                    // See note above about the orientation.
-                    if (isOwner)
-                    {
-                        addVtkVerts[0] = tri[2];
-                        addVtkVerts[1] = tri[1];
-                        addVtkVerts[2] = tri[0];
-                    }
-                    else
-                    {
-                        addVtkVerts[0] = tri[0];
-                        addVtkVerts[1] = tri[1];
-                        addVtkVerts[2] = tri[2];
-                    }
-                    addVtkVerts[3] = newVertexLabel;
-
-                    cellTypes_[thisCelli] = VTK_TETRA;
-                }
-            }
-
-            addPointi++;
-        }
-        else
-        {
-            // Polyhedral cell - not decomposed
-            cellTypes_[celli] = VTK_POLYHEDRON;
-
-            const labelList& cFaces = mesh_.cells()[celli];
-
-            // space for the number of faces and size of each face
-            label nData = 1 + cFaces.size();
-
-            // count total number of face points
-            forAll(cFaces, cFacei)
-            {
-                const face& f = mesh.faces()[cFaces[cFacei]];
-                nData += f.size();   // space for the face labels
-            }
-
-            vtkVerts.setSize(nData);
-
-            nData = 0;
-            vtkVerts[nData++] = cFaces.size();
-
-            // build face stream
-            forAll(cFaces, cFacei)
-            {
-                const face& f = mesh.faces()[cFaces[cFacei]];
-                const bool isOwner = (owner[cFaces[cFacei]] == celli);
-
-                // number of labels for this face
-                vtkVerts[nData++] = f.size();
-
-                if (isOwner)
-                {
-                    forAll(f, fp)
-                    {
-                        vtkVerts[nData++] = f[fp];
-                    }
-                }
-                else
-                {
-                    // fairly immaterial if we reverse the list
-                    // or use face::reverseFace()
-                    forAllReverse(f, fp)
-                    {
-                        vtkVerts[nData++] = f[fp];
-                    }
-                }
-            }
-        }
-    }
-
-    if (decomposePoly)
-    {
-        Pout<< "    Original cells:" << mesh_.nCells()
-            << " points:" << mesh_.nPoints()
-            << "   Additional cells:" << superCells_.size()
-            << "  additional points:" << addPointCellLabels_.size()
-            << nl << endl;
-    }
-
-}
-
-
-// ************************************************************************* //
diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/vtkTopo.H b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/vtkTopo.H
deleted file mode 100644
index c6f9a4eea9..0000000000
--- a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/vtkTopo.H
+++ /dev/null
@@ -1,139 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-License
-    This file is part of OpenFOAM.
-
-    OpenFOAM is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
-
-Class
-    Foam::vtkTopo
-
-Description
-    Polyhedral cell decomposition for VTK.
-
-SourceFiles
-    vtkTopo.C
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef vtkTopo_H
-#define vtkTopo_H
-
-#include "labelList.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-// Forward declaration of classes
-class polyMesh;
-
-/*---------------------------------------------------------------------------*\
-                           Class vtkTopo Declaration
-\*---------------------------------------------------------------------------*/
-
-class vtkTopo
-{
-    // Private data
-
-        const polyMesh& mesh_;
-
-        //- Vertices per cell (including added cells) in vtk ordering
-        labelListList vertLabels_;
-
-        //- Cell types (including added cells) in vtk numbering
-        labelList cellTypes_;
-
-        labelList addPointCellLabels_;
-
-        labelList superCells_;
-
-
-    // Private Member Functions
-
-        //- Disallow default bitwise copy construct
-        vtkTopo(const vtkTopo&);
-
-        //- Disallow default bitwise assignment
-        void operator=(const vtkTopo&);
-
-
-public:
-
-   // Public static data
-
-        //- Equivalent to enumeration in "vtkCellType.h"
-        enum vtkTypes
-        {
-            VTK_TRIANGLE   = 5,
-            VTK_POLYGON    = 7,
-            VTK_QUAD       = 9,
-
-            VTK_TETRA      = 10,
-            VTK_HEXAHEDRON = 12,
-            VTK_WEDGE      = 13,
-            VTK_PYRAMID    = 14,
-            VTK_POLYHEDRON = 42
-        };
-
-    //- Enable/disable polyhedron decomposition. Default = true
-    static bool decomposePoly;
-
-
-    // Constructors
-
-        //- Construct from components
-        vtkTopo(const polyMesh&);
-
-    // Member Functions
-
-        // Access
-
-            const labelListList& vertLabels() const
-            {
-                return vertLabels_;
-            }
-
-            const labelList& cellTypes() const
-            {
-                return cellTypes_;
-            }
-
-            const labelList& addPointCellLabels() const
-            {
-                return addPointCellLabels_;
-            }
-
-            const labelList& superCells() const
-            {
-                return superCells_;
-            }
-};
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/writeFaceSet.C b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/writeFaceSet.C
deleted file mode 100644
index 0556b7aaf2..0000000000
--- a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/writeFaceSet.C
+++ /dev/null
@@ -1,127 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
-     \\/     M anipulation  | Copyright (C) 2016 OpenCFD Ltd.
--------------------------------------------------------------------------------
-License
-    This file is part of OpenFOAM.
-
-    OpenFOAM is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "writeFaceSet.H"
-#include "OFstream.H"
-#include "writeFuns.H"
-
-// * * * * * * * * * * * * * * * Global Functions  * * * * * * * * * * * * * //
-
-void Foam::writeFaceSet
-(
-    const bool binary,
-    const fvMesh& mesh,
-    const faceSet& set,
-    const fileName& fileName
-)
-{
-    const faceList& faces = mesh.faces();
-
-    std::ofstream ostr(fileName.c_str());
-
-    writeFuns::writeHeader
-    (
-        ostr,
-        binary,
-        set.name()
-    );
-
-    ostr<< "DATASET POLYDATA" << std::endl;
-
-    //------------------------------------------------------------------
-    //
-    // Write topology
-    //
-    //------------------------------------------------------------------
-
-
-    // Construct primitivePatch of faces in faceSet.
-
-    faceList setFaces(set.size());
-    labelList setFaceLabels(set.size());
-    label setFacei = 0;
-
-    forAllConstIter(faceSet, set, iter)
-    {
-        setFaceLabels[setFacei] = iter.key();
-        setFaces[setFacei] = faces[iter.key()];
-        setFacei++;
-    }
-    primitiveFacePatch fp(setFaces, mesh.points());
-
-
-    // Write points and faces as polygons
-
-    ostr<< "POINTS " << fp.nPoints() << " float" << std::endl;
-
-    DynamicList<floatScalar> ptField(3*fp.nPoints());
-
-    writeFuns::insert(fp.localPoints(), ptField);
-
-    writeFuns::write(ostr, binary, ptField);
-
-
-    label nFaceVerts = 0;
-
-    forAll(fp.localFaces(), facei)
-    {
-        nFaceVerts += fp.localFaces()[facei].size() + 1;
-    }
-    ostr<< "POLYGONS " << fp.size() << ' ' << nFaceVerts << std::endl;
-
-
-    DynamicList<label> vertLabels(nFaceVerts);
-
-    forAll(fp.localFaces(), facei)
-    {
-        const face& f = fp.localFaces()[facei];
-
-        vertLabels.append(f.size());
-
-        writeFuns::insert(f, vertLabels);
-    }
-    writeFuns::write(ostr, binary, vertLabels);
-
-
-    //-----------------------------------------------------------------
-    //
-    // Write data
-    //
-    //-----------------------------------------------------------------
-
-    // Write faceID
-
-    ostr
-        << "CELL_DATA " << fp.size() << std::endl
-        << "FIELD attributes 1" << std::endl;
-
-    // Cell ids first
-    ostr<< "faceID 1 " << fp.size() << " int" << std::endl;
-
-    writeFuns::write(ostr, binary, setFaceLabels);
-}
-
-
-// ************************************************************************* //
diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/writeFaceSet.H b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/writeFaceSet.H
deleted file mode 100644
index 73ca4f0741..0000000000
--- a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/writeFaceSet.H
+++ /dev/null
@@ -1,63 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
-     \\/     M anipulation  | Copyright (C) 2016 OpenCFD Ltd.
--------------------------------------------------------------------------------
-License
-    This file is part of OpenFOAM.
-
-    OpenFOAM is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
-
-InClass
-    Foam::writeFaceSet
-
-Description
-    Write faceSet to vtk polydata file. Only one data which is original
-    faceID.
-
-SourceFiles
-    writeFaceSet.C
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef writeFaceSet_H
-#define writeFaceSet_H
-
-#include "fvMesh.H"
-#include "faceSet.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-// Write lagrangian fields.
-void writeFaceSet
-(
-    const bool binary,
-    const fvMesh&,
-    const faceSet& set,
-    const fileName& fileName
-);
-
-} // End namespace Foam
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/writeFuns.C b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/writeFuns.C
deleted file mode 100644
index 24eef341f6..0000000000
--- a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/writeFuns.C
+++ /dev/null
@@ -1,264 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-License
-    This file is part of OpenFOAM.
-
-    OpenFOAM is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "writeFuns.H"
-#include "vtkTopo.H"
-#include "endian.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-void Foam::writeFuns::swapWord(label& word32)
-{
-    char* mem = reinterpret_cast<char*>(&word32);
-
-    char a = mem[0];
-    mem[0] = mem[3];
-    mem[3] = a;
-
-    a = mem[1];
-    mem[1] = mem[2];
-    mem[2] = a;
-}
-
-
-void Foam::writeFuns::swapWords(const label nWords, label* words32)
-{
-    for (label i = 0; i < nWords; i++)
-    {
-        swapWord(words32[i]);
-    }
-}
-
-
-void Foam::writeFuns::write
-(
-    std::ostream& os,
-    const bool binary,
-    List<floatScalar>& fField
-)
-{
-    if (binary)
-    {
-        #ifdef WM_LITTLE_ENDIAN
-        swapWords(fField.size(), reinterpret_cast<label*>(fField.begin()));
-        #endif
-        os.write
-        (
-            reinterpret_cast<char*>(fField.begin()),
-            fField.size()*sizeof(float)
-        );
-
-        os  << std::endl;
-    }
-    else
-    {
-        forAll(fField, i)
-        {
-            os  << fField[i];
-
-            if (i > 0 && (i % 10) == 0)
-            {
-                os  << std::endl;
-            }
-            else
-            {
-                os  << ' ';
-            }
-        }
-        os << std::endl;
-    }
-}
-
-
-void Foam::writeFuns::write
-(
-    std::ostream& os,
-    const bool binary,
-    DynamicList<floatScalar>& fField
-)
-{
-    List<floatScalar>& fld = fField.shrink();
-
-    write(os, binary, fld);
-}
-
-
-void Foam::writeFuns::write
-(
-    std::ostream& os,
-    const bool binary,
-    labelList& elems
-)
-{
-    if (binary)
-    {
-        #ifdef WM_LITTLE_ENDIAN
-        swapWords(elems.size(), reinterpret_cast<label*>(elems.begin()));
-        #endif
-        os.write
-        (
-            reinterpret_cast<char*>(elems.begin()),
-            elems.size()*sizeof(label)
-        );
-
-        os  << std::endl;
-    }
-    else
-    {
-        forAll(elems, i)
-        {
-            os  << elems[i];
-
-            if (i > 0 && (i % 10) == 0)
-            {
-                os  << std::endl;
-            }
-            else
-            {
-                os  << ' ';
-            }
-        }
-        os  << std::endl;
-    }
-}
-
-
-void Foam::writeFuns::write
-(
-    std::ostream& os,
-    const bool binary,
-    DynamicList<label>& elems
-)
-{
-    labelList& fld = elems.shrink();
-
-    write(os, binary, fld);
-}
-
-
-void Foam::writeFuns::writeHeader
-(
-    std::ostream& os,
-    const bool binary,
-    const std::string& title
-)
-{
-    os  << "# vtk DataFile Version 2.0" << std::endl
-        << title << std::endl;
-
-    if (binary)
-    {
-        os  << "BINARY" << std::endl;
-    }
-    else
-    {
-        os  << "ASCII" << std::endl;
-    }
-}
-
-
-void Foam::writeFuns::writeCellDataHeader
-(
-    std::ostream& os,
-    const label nCells,
-    const label nFields
-)
-{
-    os  << "CELL_DATA " << nCells << std::endl
-        << "FIELD attributes " << nFields << std::endl;
-}
-
-
-void Foam::writeFuns::writePointDataHeader
-(
-    std::ostream& os,
-    const label nPoints,
-    const label nFields
-)
-{
-    os  << "POINT_DATA  " << nPoints << std::endl
-        << "FIELD attributes " << nFields << std::endl;
-}
-
-
-void Foam::writeFuns::insert(const scalar src, DynamicList<floatScalar>& dest)
-{
-    dest.append(float(src));
-}
-
-
-void Foam::writeFuns::insert(const vector& src, DynamicList<floatScalar>& dest)
-{
-    for (direction cmpt = 0; cmpt < vector::nComponents; ++cmpt)
-    {
-        dest.append(float(src[cmpt]));
-    }
-}
-
-
-void Foam::writeFuns::insert
-(
-    const sphericalTensor& src,
-    DynamicList<floatScalar>& dest
-)
-{
-    for (direction cmpt = 0; cmpt < sphericalTensor::nComponents; ++cmpt)
-    {
-        dest.append(float(src[cmpt]));
-    }
-}
-
-
-void Foam::writeFuns::insert
-(
-    const symmTensor& src,
-    DynamicList<floatScalar>& dest
-)
-{
-    dest.append(float(src.xx()));
-    dest.append(float(src.yy()));
-    dest.append(float(src.zz()));
-    dest.append(float(src.xy()));
-    dest.append(float(src.yz()));
-    dest.append(float(src.xz()));
-}
-
-
-void Foam::writeFuns::insert(const tensor& src, DynamicList<floatScalar>& dest)
-{
-    for (direction cmpt = 0; cmpt < tensor::nComponents; ++cmpt)
-    {
-        dest.append(float(src[cmpt]));
-    }
-}
-
-
-void Foam::writeFuns::insert(const labelList& src, DynamicList<label>& dest)
-{
-    dest.append(src);
-}
-
-
-// ************************************************************************* //
diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/writeFuns.H b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/writeFuns.H
deleted file mode 100644
index 60fe2a6d01..0000000000
--- a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/writeFuns.H
+++ /dev/null
@@ -1,161 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-License
-    This file is part of OpenFOAM.
-
-    OpenFOAM is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
-
-Class
-    Foam::writeFuns
-
-Description
-    Various functions for collecting and writing binary data.
-
-SourceFiles
-    writeFuns.C
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef writeFuns_H
-#define writeFuns_H
-
-#include "floatScalar.H"
-#include "DynamicList.H"
-#include "volFieldsFwd.H"
-#include "pointFieldsFwd.H"
-#include "vtkMesh.H"
-#include "volPointInterpolation.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-/*---------------------------------------------------------------------------*\
-                           Class writeFuns Declaration
-\*---------------------------------------------------------------------------*/
-
-class writeFuns
-{
-    // Private Member Functions
-
-        // Swap halves of word.
-
-            static void swapWord(label& word32);
-            static void swapWords(const label nWords, label* words32);
-
-
-public:
-
-    // Write ascii or binary. If binary optionally in-place swaps argument
-
-        static void write(std::ostream&, const bool, List<floatScalar>&);
-        static void write(std::ostream&, const bool, DynamicList<floatScalar>&);
-        static void write(std::ostream&, const bool, labelList&);
-        static void write(std::ostream&, const bool, DynamicList<label>&);
-
-
-    // Write header
-
-        static void writeHeader
-        (
-            std::ostream&,
-            const bool isBinary,
-            const std::string& title
-        );
-        static void writeCellDataHeader
-        (
-            std::ostream&,
-            const label nCells,
-            const label nFields
-        );
-        static void writePointDataHeader
-        (
-            std::ostream&,
-            const label nPoints,
-            const label nFields
-        );
-
-
-    // Convert to VTK and store
-
-        static void insert(const scalar, DynamicList<floatScalar>&);
-        static void insert(const point&, DynamicList<floatScalar>&);
-        static void insert(const sphericalTensor&, DynamicList<floatScalar>&);
-        static void insert(const symmTensor&, DynamicList<floatScalar>&);
-        static void insert(const tensor&, DynamicList<floatScalar>&);
-
-
-    //- Append elements to DynamicList
-    static void insert(const labelList&, DynamicList<label>&);
-
-    template<class Type>
-    static void insert(const List<Type>&, DynamicList<floatScalar>&);
-
-    //- Write volField with cell values (including decomposed cells)
-    template<class Type>
-    static void write
-    (
-        std::ostream&,
-        const bool binary,
-        const DimensionedField<Type, volMesh>&,
-        const vtkMesh&
-    );
-
-    //- Write pointField on all mesh points. Interpolate to cell centre
-    //  for decomposed cell centres.
-    template<class Type>
-    static void write
-    (
-        std::ostream&,
-        const bool binary,
-        const GeometricField<Type, pointPatchField, pointMesh>&,
-        const vtkMesh&
-    );
-
-    //- Write interpolated field on points and original cell values on
-    //  decomposed cell centres.
-    template<class Type>
-    static void write
-    (
-        std::ostream&,
-        const bool binary,
-        const DimensionedField<Type, volMesh>&,
-        const DimensionedField<Type, pointMesh>&,
-        const vtkMesh&
-    );
-
-};
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#ifdef NoRepository
-    #include "writeFunsTemplates.C"
-#endif
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/writeFunsTemplates.C b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/writeFunsTemplates.C
deleted file mode 100644
index 8929a1ad80..0000000000
--- a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/writeFunsTemplates.C
+++ /dev/null
@@ -1,146 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
-     \\/     M anipulation  | Copyright (C) 2016 OpenCFD Ltd.
--------------------------------------------------------------------------------
-License
-    This file is part of OpenFOAM.
-
-    OpenFOAM is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "writeFuns.H"
-#include "interpolatePointToCell.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-// Store List in dest
-template<class Type>
-void Foam::writeFuns::insert
-(
-    const List<Type>& source,
-    DynamicList<floatScalar>& dest
-)
-{
-    forAll(source, i)
-    {
-        insert(source[i], dest);
-    }
-}
-
-
-template<class Type>
-void Foam::writeFuns::write
-(
-    std::ostream& os,
-    const bool binary,
-    const DimensionedField<Type, volMesh>& df,
-    const vtkMesh& vMesh
-)
-{
-    const fvMesh& mesh = vMesh.mesh();
-
-    const labelList& superCells = vMesh.topo().superCells();
-
-    label nValues = mesh.nCells() + superCells.size();
-
-    os  << df.name() << ' '
-        << int(pTraits<Type>::nComponents) << ' '
-        << nValues << " float" << std::endl;
-
-    DynamicList<floatScalar> fField(pTraits<Type>::nComponents*nValues);
-
-    insert(df.field(), fField);
-
-    forAll(superCells, superCelli)
-    {
-        label origCelli = superCells[superCelli];
-
-        insert(df[origCelli], fField);
-    }
-    write(os, binary, fField);
-}
-
-
-template<class Type>
-void Foam::writeFuns::write
-(
-    std::ostream& os,
-    const bool binary,
-    const GeometricField<Type, pointPatchField, pointMesh>& pvf,
-    const vtkMesh& vMesh
-)
-{
-    const fvMesh& mesh = vMesh.mesh();
-    const vtkTopo& topo = vMesh.topo();
-
-    const labelList& addPointCellLabels = topo.addPointCellLabels();
-    const label nTotPoints = mesh.nPoints() + addPointCellLabels.size();
-
-    os  << pvf.name() << ' '
-        << int(pTraits<Type>::nComponents) << ' '
-        << nTotPoints << " float" << std::endl;
-
-    DynamicList<floatScalar> fField(pTraits<Type>::nComponents*nTotPoints);
-
-    insert(pvf, fField);
-
-    forAll(addPointCellLabels, api)
-    {
-        label origCelli = addPointCellLabels[api];
-
-        insert(interpolatePointToCell(pvf, origCelli), fField);
-    }
-    write(os, binary, fField);
-}
-
-
-template<class Type>
-void Foam::writeFuns::write
-(
-    std::ostream& os,
-    const bool binary,
-    const DimensionedField<Type, volMesh>& vvf,
-    const DimensionedField<Type, pointMesh>& pvf,
-    const vtkMesh& vMesh
-)
-{
-    const fvMesh& mesh = vMesh.mesh();
-    const vtkTopo& topo = vMesh.topo();
-
-    const labelList& addPointCellLabels = topo.addPointCellLabels();
-    const label nTotPoints = mesh.nPoints() + addPointCellLabels.size();
-
-    os  << vvf.name() << ' '
-        << int(pTraits<Type>::nComponents) << ' '
-        << nTotPoints << " float" << std::endl;
-
-    DynamicList<floatScalar> fField(pTraits<Type>::nComponents*nTotPoints);
-
-    insert(pvf, fField);
-
-    forAll(addPointCellLabels, api)
-    {
-        label origCelli = addPointCellLabels[api];
-
-        insert(vvf[origCelli], fField);
-    }
-    write(os, binary, fField);
-}
-
-
-// ************************************************************************* //
diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/writePointSet.C b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/writePointSet.C
deleted file mode 100644
index e5fffb5366..0000000000
--- a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/writePointSet.C
+++ /dev/null
@@ -1,103 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-License
-    This file is part of OpenFOAM.
-
-    OpenFOAM is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "writePointSet.H"
-#include "OFstream.H"
-#include "writeFuns.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-// * * * * * * * * * * * * * * * Global Functions  * * * * * * * * * * * * * //
-
-void writePointSet
-(
-    const bool binary,
-    const fvMesh& mesh,
-    const pointSet& set,
-    const fileName& fileName
-)
-{
-    std::ofstream ostr(fileName.c_str());
-
-    writeFuns::writeHeader
-    (
-        ostr,
-        binary,
-        set.name()
-    );
-
-    ostr<< "DATASET POLYDATA" << std::endl;
-
-    //------------------------------------------------------------------
-    //
-    // Write topology
-    //
-    //------------------------------------------------------------------
-
-
-    // Write points
-
-    ostr<< "POINTS " << set.size() << " float" << std::endl;
-
-    DynamicList<floatScalar> ptField(3*set.size());
-
-    writeFuns::insert
-    (
-        UIndirectList<point>(mesh.points(), set.toc())(),
-        ptField
-    );
-
-    writeFuns::write(ostr, binary, ptField);
-
-
-    //-----------------------------------------------------------------
-    //
-    // Write data
-    //
-    //-----------------------------------------------------------------
-
-    // Write faceID
-
-    ostr
-        << "POINT_DATA " << set.size() << std::endl
-        << "FIELD attributes 1" << std::endl;
-
-    // Cell ids first
-    ostr<< "pointID 1 " << set.size() << " int" << std::endl;
-
-    labelList pointIDs(set.toc());
-
-    writeFuns::write(ostr, binary, pointIDs);
-}
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// ************************************************************************* //
diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/writePointSet.H b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/writePointSet.H
deleted file mode 100644
index d1ad15efe6..0000000000
--- a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/writePointSet.H
+++ /dev/null
@@ -1,63 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
-     \\/     M anipulation  | Copyright (C) 2016 OpenCFD Ltd.
--------------------------------------------------------------------------------
-License
-    This file is part of OpenFOAM.
-
-    OpenFOAM is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
-
-InClass
-    Foam::writePointSet
-
-Description
-    Write pointSet to vtk polydata file. Only one data which is original
-    pointID.
-
-SourceFiles
-    writePointSet.C
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef writePointSet_H
-#define writePointSet_H
-
-#include "fvMesh.H"
-#include "pointSet.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-// Write lagrangian fields.
-void writePointSet
-(
-    const bool binary,
-    const fvMesh& mesh,
-    const pointSet& set,
-    const fileName& fileName
-);
-
-} // End namespace Foam
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/writeVTK/controlDict b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/writeVTK/controlDict
deleted file mode 100644
index 2888266a2f..0000000000
--- a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/writeVTK/controlDict
+++ /dev/null
@@ -1,81 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  plus                                  |
-|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    object      controlDict;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-// So we get a decent warning if we have multiple functionObject entries
-// with the same name.
-#inputMode error;
-
-application     icoFoam;
-
-startFrom       startTime;
-
-startTime       0;
-
-stopAt          endTime;
-
-endTime         0.5;
-
-deltaT          0.005;
-
-writeControl    timeStep;
-
-writeInterval   20;
-
-purgeWrite      0;
-
-writeFormat     ascii;
-
-writePrecision  6;
-
-writeCompression off;
-
-timeFormat      general;
-
-timePrecision   6;
-
-runTimeModifiable yes;
-
-functions
-{
-    writeVTK
-    {
-        type            writeVTK;
-
-        // Where to load it from
-        libs ("libfoamToVTK.so");
-
-        // When to write:
-        //  timeStep            (with optional writeInterval)
-        //  writeTime          (with optional writeInterval)
-        //  adjustableTime
-        //  runTime
-        //  clockTime
-        //  cpuTime
-        writeControl   writeTime;
-
-        // Write every writeInterval (only valid for timeStemp, writeTime)
-        writeInterval  1;
-
-        // Interval of time (valid for adjustableTime, runTime, clockTime,
-        //  cpuTime)
-        writeInterval   1;
-
-        // Objects to write
-        objectNames    ();
-    }
-}
-
-// ************************************************************************* //
diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/lagrangianWriter.C b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamVtkLagrangianWriter.C
similarity index 66%
rename from applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/lagrangianWriter.C
rename to applications/utilities/postProcessing/dataConversion/foamToVTK/foamVtkLagrangianWriter.C
index 6eab8f1646..123357e18d 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/lagrangianWriter.C
+++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamVtkLagrangianWriter.C
@@ -23,14 +23,13 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "lagrangianWriter.H"
-#include "writeFuns.H"
+#include "foamVtkLagrangianWriter.H"
 #include "Cloud.H"
 #include "passiveParticle.H"
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-Foam::lagrangianWriter::lagrangianWriter
+Foam::foamVtkOutput::lagrangianWriter::lagrangianWriter
 (
     const fvMesh& mesh,
     const bool binary,
@@ -40,20 +39,27 @@ Foam::lagrangianWriter::lagrangianWriter
 )
 :
     mesh_(mesh),
-    binary_(binary),
-    fName_(fName),
+    format_(),
     cloudName_(cloudName),
-    os_(fName.c_str())
+    os_(fName.c_str()),
+    nParcels_(0)
 {
-    // Write header
-    writeFuns::writeHeader(os_, binary_, mesh_.time().caseName());
-    os_ << "DATASET POLYDATA" << std::endl;
+    format_ = foamVtkOutput::newFormatter
+    (
+        os_,
+        (
+            binary
+          ? foamVtkOutput::LEGACY_BINARY
+          : foamVtkOutput::LEGACY_ASCII
+        )
+    );
+
+    foamVtkOutput::legacy::fileHeader(format(), mesh_.time().caseName())
+        << "DATASET POLYDATA" << nl;
 
     if (dummyCloud)
     {
-        nParcels_ = 0;
-
-        os_ << "POINTS " << nParcels_ << " float" << std::endl;
+        os_ << "POINTS " << nParcels_ << " float" << nl;
     }
     else
     {
@@ -61,27 +67,32 @@ Foam::lagrangianWriter::lagrangianWriter
 
         nParcels_ = parcels.size();
 
-        os_ << "POINTS " << nParcels_ << " float" << std::endl;
+        os_ << "POINTS " << nParcels_ << " float" << nl;
 
-        DynamicList<floatScalar> partField(3*parcels.size());
-
-        forAllConstIter(Cloud<passiveParticle>, parcels, elmnt)
+        forAllConstIters(parcels, iter)
         {
-            writeFuns::insert(elmnt().position(), partField);
+            const point& pt = iter().position();
+
+            foamVtkOutput::write(format(), pt);
         }
-        writeFuns::write(os_, binary_, partField);
+        format().flush();
     }
 }
 
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-void Foam::lagrangianWriter::writeParcelHeader(const label nFields)
+void Foam::foamVtkOutput::lagrangianWriter::beginParcelData
+(
+    const label nFields
+)
 {
-    os_ << "POINT_DATA " << nParcels_ << std::endl
-        << "FIELD attributes " << nFields
-        << std::endl;
+    foamVtkOutput::legacy::pointDataHeader(os_, nParcels_, nFields);
 }
 
 
+void Foam::foamVtkOutput::lagrangianWriter::endParcelData()
+{}
+
+
 // ************************************************************************* //
diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/lagrangianWriter.H b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamVtkLagrangianWriter.H
similarity index 82%
rename from applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/lagrangianWriter.H
rename to applications/utilities/postProcessing/dataConversion/foamToVTK/foamVtkLagrangianWriter.H
index 24dd4a3228..8d4103c53d 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/lagrangianWriter.H
+++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamVtkLagrangianWriter.H
@@ -33,21 +33,24 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef lagrangianWriter_H
-#define lagrangianWriter_H
+#ifndef foamVtkLagrangianWriter_H
+#define foamVtkLagrangianWriter_H
 
 #include "OFstream.H"
 #include "Cloud.H"
 #include "volFields.H"
 #include "pointFields.H"
+#include "foamVtkOutput.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
 {
-
 class volPointInterpolation;
 
+namespace foamVtkOutput
+{
+
 /*---------------------------------------------------------------------------*\
                            Class lagrangianWriter Declaration
 \*---------------------------------------------------------------------------*/
@@ -56,9 +59,7 @@ class lagrangianWriter
 {
     const fvMesh& mesh_;
 
-    const bool binary_;
-
-    const fileName fName_;
+    autoPtr<foamVtkOutput::formatter> format_;
 
     const word cloudName_;
 
@@ -74,7 +75,7 @@ public:
         //- Construct from components
         lagrangianWriter
         (
-            const fvMesh&,
+            const fvMesh& mesh,
             const bool binary,
             const fileName&,
             const word&,
@@ -84,12 +85,24 @@ public:
 
     // Member Functions
 
-        std::ofstream& os()
+        inline std::ofstream& os()
         {
             return os_;
         }
 
-        void writeParcelHeader(const label nFields);
+        inline foamVtkOutput::formatter& format()
+        {
+            return format_();
+        }
+
+        inline label nParcels() const
+        {
+            return nParcels_;
+        }
+
+        void beginParcelData(const label nFields);
+        void endParcelData();
+
 
         //- Write IOField
         template<class Type>
@@ -99,12 +112,13 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+} // End namespace foamVtkOutput
 } // End namespace Foam
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-    #include "lagrangianWriterTemplates.C"
+    #include "foamVtkLagrangianWriterTemplates.C"
 #endif
 
 
diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/lagrangianWriterTemplates.C b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamVtkLagrangianWriterTemplates.C
similarity index 80%
rename from applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/lagrangianWriterTemplates.C
rename to applications/utilities/postProcessing/dataConversion/foamToVTK/foamVtkLagrangianWriterTemplates.C
index 86cec10dc3..7810657902 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/lagrangianWriterTemplates.C
+++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamVtkLagrangianWriterTemplates.C
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
-     \\/     M anipulation  | Copyright (C) 2016 OpenCFD Ltd.
+     \\/     M anipulation  | Copyright (C) 2016-2017 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -23,14 +23,16 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "lagrangianWriter.H"
-#include "writeFuns.H"
+#include "foamVtkLagrangianWriter.H"
 #include "IOField.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 template<class Type>
-void Foam::lagrangianWriter::writeIOField(const wordList& objects)
+void Foam::foamVtkOutput::lagrangianWriter::writeIOField
+(
+    const wordList& objects
+)
 {
     forAll(objects, i)
     {
@@ -49,15 +51,13 @@ void Foam::lagrangianWriter::writeIOField(const wordList& objects)
 
         IOField<Type> fld(header);
 
-        os_ << object << ' '
+        // Legacy
+        os()<< object << ' '
             << int(pTraits<Type>::nComponents) << ' '
-            << fld.size() << " float" << std::endl;
+            << fld.size() << " float" << nl;
 
-        DynamicList<floatScalar> fField(pTraits<Type>::nComponents*fld.size());
-
-        writeFuns::insert(fld, fField);
-
-        writeFuns::write(os_, binary_, fField);
+        foamVtkOutput::writeList(format(), fld);
+        format().flush();
     }
 }
 
diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/readFields.C b/applications/utilities/postProcessing/dataConversion/foamToVTK/readFields.C
similarity index 100%
rename from applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/readFields.C
rename to applications/utilities/postProcessing/dataConversion/foamToVTK/readFields.C
diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/readFields.H b/applications/utilities/postProcessing/dataConversion/foamToVTK/readFields.H
similarity index 98%
rename from applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/readFields.H
rename to applications/utilities/postProcessing/dataConversion/foamToVTK/readFields.H
index 510bd11d25..085570d685 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/readFields.H
+++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/readFields.H
@@ -48,7 +48,7 @@ namespace Foam
 template<class GeoField>
 void readFields
 (
-    const meshSubsetHelper&,
+    const meshSubsetHelper& helper,
     const typename GeoField::Mesh& mesh,
     const IOobjectList& objects,
     const HashSet<word>& selectedFields,
diff --git a/src/conversion/Make/files b/src/conversion/Make/files
index 7e3d56e5df..30c2812624 100644
--- a/src/conversion/Make/files
+++ b/src/conversion/Make/files
@@ -24,6 +24,11 @@ starcd/STARCDMeshWriter.C
 
 polyDualMesh/polyDualMesh.C
 
+vtk/output/foamVtkInternalWriter.H
+vtk/output/foamVtkPatchWriter.H
+vtk/output/foamVtkSurfaceMeshWriter.C
+vtk/output/foamVtkWriteSurfFields.C
+
 vtk/part/foamVtkCells.C
 vtk/part/foamVtkMeshMaps.C
 vtk/part/foamVtuSizing.C
diff --git a/src/conversion/vtk/output/foamVtkInternalWriter.C b/src/conversion/vtk/output/foamVtkInternalWriter.C
new file mode 100644
index 0000000000..7466de29e0
--- /dev/null
+++ b/src/conversion/vtk/output/foamVtkInternalWriter.C
@@ -0,0 +1,132 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2017 OpenCFD Ltd.
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "foamVtkInternalWriter.H"
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::foamVtkOutput::internalWriter::internalWriter
+(
+    const fvMesh& mesh,
+    enum foamVtkOutput::formatType fmtType,
+    const foamVtkCells& cells,
+    const fileName& outputName
+)
+:
+    mesh_(mesh),
+    format_(),
+    vtkCells_(cells),
+    os_(outputName.c_str())
+{
+    format_ = foamVtkOutput::newFormatter(os_, fmtType);
+
+    // Write header
+    foamVtkOutput::legacy::fileHeader(format(), mesh.time().caseName())
+        << "DATASET UNSTRUCTURED_GRID" << nl;
+
+    //------------------------------------------------------------------
+    //
+    // Write topology
+    //
+    //------------------------------------------------------------------
+
+    os_ << "POINTS " << vtkCells_.nFieldPoints() << " float" << nl;
+    foamVtkOutput::writeList(format(), mesh.points());
+
+    const pointField& ctrs = mesh.cellCentres();
+    foamVtkOutput::writeList(format(), ctrs, vtkCells_.addPointCellLabels());
+
+    format().flush();
+
+    //
+    // Write cells
+    //
+
+    const List<uint8_t>& cellTypes = vtkCells_.cellTypes();
+    const labelList& vertLabels = vtkCells_.vertLabels();
+
+    os_ << "CELLS " << vtkCells_.nFieldCells() << ' '
+        << vertLabels.size() << nl;
+
+    foamVtkOutput::writeList(format(), vertLabels);
+    format().flush();
+
+    os_ << "CELL_TYPES " << cellTypes.size() << nl;
+
+    // No nComponents for char, so cannot use foamVtkOutput::writeList
+    forAll(cellTypes, i)
+    {
+        format().write(cellTypes[i]);
+    }
+    format().flush();
+}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+
+void Foam::foamVtkOutput::internalWriter::beginCellData(label nFields)
+{
+    foamVtkOutput::legacy::cellDataHeader
+    (
+        os(),
+        vtkCells_.nFieldCells(),
+        nFields
+    );
+}
+
+
+void Foam::foamVtkOutput::internalWriter::endCellData()
+{}
+
+
+void Foam::foamVtkOutput::internalWriter::beginPointData(label nFields)
+{
+    foamVtkOutput::legacy::pointDataHeader
+    (
+        os(),
+        vtkCells_.nFieldPoints(),
+        nFields
+    );
+}
+
+
+void Foam::foamVtkOutput::internalWriter::endPointData()
+{}
+
+
+void Foam::foamVtkOutput::internalWriter::writeCellIDs()
+{
+    const labelList& cellMap = vtkCells_.cellMap();
+
+    // Cell ids first
+    os_ << "cellID 1 " << vtkCells_.nFieldCells() << " int" << nl;
+
+    foamVtkOutput::writeList(format(), cellMap);
+    format().flush();
+}
+
+
+// ************************************************************************* //
diff --git a/src/conversion/vtk/output/foamVtkInternalWriter.H b/src/conversion/vtk/output/foamVtkInternalWriter.H
new file mode 100644
index 0000000000..6a6423b4ff
--- /dev/null
+++ b/src/conversion/vtk/output/foamVtkInternalWriter.H
@@ -0,0 +1,191 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2016-2017 OpenCFD Ltd.
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::foamVtkOutput::internalWriter
+
+Description
+    Write fields (internal).
+
+SourceFiles
+    foamVtkInternalWriter.C
+    foamVtkInternalWriterTemplates.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef foamVtkInternalWriter_H
+#define foamVtkInternalWriter_H
+
+#include "OFstream.H"
+#include "volFields.H"
+#include "pointFields.H"
+
+#include "foamVtkCells.H"
+#include "foamVtkOutputFields.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+class volPointInterpolation;
+
+namespace foamVtkOutput
+{
+
+/*---------------------------------------------------------------------------*\
+                       Class internalWriter Declaration
+\*---------------------------------------------------------------------------*/
+
+class internalWriter
+{
+    // Private Member Data
+
+        //- Reference to the OpenFOAM mesh (or subset)
+        const fvMesh& mesh_;
+
+        autoPtr<foamVtkOutput::formatter> format_;
+
+        //- The volume cells (internalMesh)
+        const foamVtkCells& vtkCells_;
+
+        std::ofstream os_;
+
+public:
+
+    // Constructors
+
+        //- Construct from components
+        internalWriter
+        (
+            const fvMesh& mesh,
+            enum foamVtkOutput::formatType fmtType,
+            const foamVtkCells& cells,
+            const fileName& outputName
+        );
+
+
+    // Member Functions
+
+        inline std::ofstream& os()
+        {
+            return os_;
+        }
+
+        inline foamVtkOutput::formatter& format()
+        {
+            return format_();
+        }
+
+
+        //- Open write for CellData of count fields.
+        //  The parameters are only used for the legacy format.
+        void beginCellData(label nFields);
+
+        //- Close write for CellData
+        void endCellData();
+
+        //- Open write for PointData of count fields
+        //  The parameters are only used for the legacy format.
+        void beginPointData(label nFields);
+
+        //- Close write for PointData
+        void endPointData();
+
+
+        //- Write cellIDs
+        void writeCellIDs();
+
+        //- Write internal fields
+        template<class Type>
+        void write
+        (
+            const UPtrList
+            <
+                const DimensionedField<Type, volMesh>
+            >& flds
+        );
+
+        //- Write volFields
+        template<class Type, template<class> class PatchField>
+        void write
+        (
+            const UPtrList
+            <
+                const GeometricField<Type, PatchField, volMesh>
+            >& flds
+        );
+
+        //- Write pointFields on all mesh points.
+        //  Interpolate to cell centre for decomposed cell centres.
+        template<class Type, template<class> class PatchField>
+        void write
+        (
+            const UPtrList
+            <
+                const GeometricField<Type, PatchField, pointMesh>
+            >& flds
+        );
+
+
+        //- Interpolated internal fields
+        template<class Type>
+        void write
+        (
+            const volPointInterpolation& pInterp,
+            const UPtrList
+            <
+                const DimensionedField<Type, volMesh>
+            >& flds
+        );
+
+        //- Interpolated volFields
+        template<class Type, template<class> class PatchField>
+        void write
+        (
+            const volPointInterpolation& pInterp,
+            const UPtrList
+            <
+                const GeometricField<Type, PatchField, volMesh>
+            >& flds
+        );
+
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace foamVtkOutput
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#ifdef NoRepository
+    #include "foamVtkInternalWriterTemplates.C"
+#endif
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/conversion/vtk/output/foamVtkInternalWriterTemplates.C b/src/conversion/vtk/output/foamVtkInternalWriterTemplates.C
new file mode 100644
index 0000000000..c3eaaf5e67
--- /dev/null
+++ b/src/conversion/vtk/output/foamVtkInternalWriterTemplates.C
@@ -0,0 +1,195 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2017 OpenCFD Ltd.
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "foamVtkInternalWriter.H"
+#include "foamVtkOutput.H"
+#include "volPointInterpolation.H"
+#include "interpolatePointToCell.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+template<class Type>
+void Foam::foamVtkOutput::internalWriter::write
+(
+    const UPtrList<const DimensionedField<Type, volMesh>>& flds
+)
+{
+    const int nCmpt(pTraits<Type>::nComponents);
+    const labelList& cellMap = vtkCells_.cellMap();
+
+    forAll(flds, i)
+    {
+        const auto& fld = flds[i];
+
+        // Legacy
+        os()<< fld.name() << ' '
+            << nCmpt << ' '
+            << cellMap.size() << " float"
+            << nl;
+
+        // writeField includes payload size
+        foamVtkOutput::writeField(format(), fld, cellMap);
+    }
+}
+
+
+template<class Type, template<class> class PatchField>
+void Foam::foamVtkOutput::internalWriter::write
+(
+    const UPtrList<const GeometricField<Type, PatchField, volMesh>>& flds
+)
+{
+    const int nCmpt(pTraits<Type>::nComponents);
+    const labelList& cellMap = vtkCells_.cellMap();
+
+    forAll(flds, i)
+    {
+        const auto& fld = flds[i];
+
+        // Legacy
+        os()<< fld.name() << ' '
+            << nCmpt << ' '
+            << cellMap.size() << " float"
+            << nl;
+
+        // writeField includes payload size
+        foamVtkOutput::writeField(format(), fld, cellMap);
+    }
+}
+
+
+template<class Type, template<class> class PatchField>
+void Foam::foamVtkOutput::internalWriter::write
+(
+    const UPtrList<const GeometricField<Type, PatchField, pointMesh>>& flds
+)
+{
+    const int nCmpt(pTraits<Type>::nComponents);
+    const int nVals(vtkCells_.nFieldPoints());
+    const labelList& addPointCellLabels = vtkCells_.addPointCellLabels();
+
+    // Only needed for non-legacy
+    const uint64_t payLoad
+    (
+        nVals * nCmpt * sizeof(float)
+    );
+
+    forAll(flds, i)
+    {
+        const auto& fld = flds[i];
+
+        // Legacy
+        os()<< fld.name() << ' '
+            << nCmpt << ' '
+            << nVals << " float"
+            << nl;
+
+        format().writeSize(payLoad);
+        foamVtkOutput::writeList(format(), fld);
+
+        forAll(addPointCellLabels, i)
+        {
+            const Type val = interpolatePointToCell(fld, addPointCellLabels[i]);
+            foamVtkOutput::write(format(), val);
+        }
+
+        format().flush();
+    }
+}
+
+
+template<class Type>
+void Foam::foamVtkOutput::internalWriter::write
+(
+    const volPointInterpolation& pInterp,
+    const UPtrList<const DimensionedField<Type, volMesh>>& flds
+)
+{
+    const int nCmpt(pTraits<Type>::nComponents);
+    const int nVals(vtkCells_.nFieldPoints());
+    const labelList& addPointCellLabels = vtkCells_.addPointCellLabels();
+
+    // Only needed for non-legacy
+    const uint64_t payLoad
+    (
+        nVals * nCmpt * sizeof(float)
+    );
+
+    forAll(flds, i)
+    {
+        const auto& vfield = flds[i];
+        const auto& pfield = pInterp.interpolate(vfield)();
+
+        // Legacy
+        os()<< vfield.name() << ' '
+            << nCmpt << ' '
+            << nVals << " float"
+            << nl;
+
+        format().writeSize(payLoad);
+        foamVtkOutput::writeList(format(), pfield);
+        foamVtkOutput::writeList(format(), vfield, addPointCellLabels);
+        format().flush();
+    }
+}
+
+
+template<class Type, template<class> class PatchField>
+void Foam::foamVtkOutput::internalWriter::write
+(
+    const volPointInterpolation& pInterp,
+    const UPtrList<const GeometricField<Type, PatchField, volMesh>>& flds
+)
+{
+    const int nCmpt(pTraits<Type>::nComponents);
+    const int nVals(vtkCells_.nFieldPoints());
+    const labelList& addPointCellLabels = vtkCells_.addPointCellLabels();
+
+    // Only needed for non-legacy
+    const uint64_t payLoad
+    (
+        nVals * nCmpt * sizeof(float)
+    );
+
+    forAll(flds, i)
+    {
+        const auto& vfield = flds[i];
+        const auto& pfield = pInterp.interpolate(vfield)();
+
+        // Legacy
+        os()<< vfield.name() << ' '
+            << nCmpt << ' '
+            << nVals << " float"
+            << nl;
+
+        format().writeSize(payLoad);
+        foamVtkOutput::writeList(format(), pfield);
+        foamVtkOutput::writeList(format(), vfield, addPointCellLabels);
+        format().flush();
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/src/conversion/vtk/output/foamVtkOutputFieldsTemplates.C b/src/conversion/vtk/output/foamVtkOutputFieldsTemplates.C
index 43f784ae61..74ea384864 100644
--- a/src/conversion/vtk/output/foamVtkOutputFieldsTemplates.C
+++ b/src/conversion/vtk/output/foamVtkOutputFieldsTemplates.C
@@ -25,7 +25,6 @@ License
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-
 template<class Type>
 void Foam::foamVtkOutput::writeField
 (
diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/patchWriter.C b/src/conversion/vtk/output/foamVtkPatchWriter.C
similarity index 55%
rename from applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/patchWriter.C
rename to src/conversion/vtk/output/foamVtkPatchWriter.C
index d099745aa2..b56d58e3c5 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/patchWriter.C
+++ b/src/conversion/vtk/output/foamVtkPatchWriter.C
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
-     \\/     M anipulation  | Copyright (C) 2016 OpenCFD Ltd.
+     \\/     M anipulation  | Copyright (C) 2016-2017 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -23,12 +23,12 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "patchWriter.H"
-#include "writeFuns.H"
+#include "foamVtkPatchWriter.H"
+#include "foamVtkOutput.H"
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-Foam::patchWriter::patchWriter
+Foam::foamVtkOutput::patchWriter::patchWriter
 (
     const fvMesh& mesh,
     const bool binary,
@@ -38,24 +38,34 @@ Foam::patchWriter::patchWriter
 )
 :
     mesh_(mesh),
-    binary_(binary),
+    format_(),
     nearCellValue_(nearCellValue),
-    fName_(fName),
     patchIDs_(patchIDs),
     os_(fName.c_str())
 {
     const polyBoundaryMesh& patches = mesh.boundaryMesh();
 
-    // Write header
-    if (patchIDs_.size() == 1)
-    {
-        writeFuns::writeHeader(os_, binary_, patches[patchIDs_[0]].name());
-    }
-    else
-    {
-        writeFuns::writeHeader(os_, binary_, "patches");
-    }
-    os_ << "DATASET POLYDATA" << std::endl;
+    format_ = foamVtkOutput::newFormatter
+    (
+        os_,
+        (
+            binary
+          ? foamVtkOutput::LEGACY_BINARY
+          : foamVtkOutput::LEGACY_ASCII
+        )
+    );
+
+    foamVtkOutput::legacy::fileHeader
+    (
+        format(),
+        (
+            patchIDs_.size() == 1
+          ? patches[patchIDs_.first()].name()
+          : "patches"
+        )
+    ) << "DATASET POLYDATA" << nl;
+
+    //------------------------------------------------------------------
 
     // Write topology
     nPoints_ = 0;
@@ -69,30 +79,26 @@ Foam::patchWriter::patchWriter
         nPoints_ += pp.nPoints();
         nFaces_ += pp.size();
 
+        nFaceVerts += pp.size();
         forAll(pp, facei)
         {
-            nFaceVerts += pp[facei].size() + 1;
+            nFaceVerts += pp[facei].size();
         }
     }
 
-    os_ << "POINTS " << nPoints_ << " float" << std::endl;
-
-    DynamicList<floatScalar> ptField(3*nPoints_);
+    os_ << "POINTS " << nPoints_ << " float" << nl;
 
     forAll(patchIDs_, i)
     {
         const polyPatch& pp = patches[patchIDs_[i]];
 
-        writeFuns::insert(pp.localPoints(), ptField);
+        foamVtkOutput::writeList(format(), pp.localPoints());
     }
-    writeFuns::write(os_, binary_, ptField);
+    format().flush();
 
-    os_ << "POLYGONS " << nFaces_ << ' ' << nFaceVerts << std::endl;
-
-    DynamicList<label> vertLabels(nFaceVerts);
-
-    label offset = 0;
+    os_ << "POLYGONS " << nFaces_ << ' ' << nFaceVerts << nl;
 
+    label off = 0;
     forAll(patchIDs_, i)
     {
         const polyPatch& pp = patches[patchIDs_[i]];
@@ -101,35 +107,57 @@ Foam::patchWriter::patchWriter
         {
             const face& f = pp.localFaces()[facei];
 
-            vertLabels.append(f.size());
-            writeFuns::insert(f + offset, vertLabels);
+            format().write(f.size());
+            forAll(f, fi)
+            {
+                format().write(off + f[fi]);
+            }
         }
-        offset += pp.nPoints();
+
+        off += pp.nPoints();
     }
-    writeFuns::write(os_, binary_, vertLabels);
+    format().flush();
 }
 
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-void Foam::patchWriter::writePatchIDs()
+void Foam::foamVtkOutput::patchWriter::beginCellData(label nFields)
 {
-    DynamicList<floatScalar> fField(nFaces_);
+    foamVtkOutput::legacy::cellDataHeader(os(), nFaces_, nFields);
+}
 
-    os_ << "patchID 1 " << nFaces_ << " float" << std::endl;
+
+void Foam::foamVtkOutput::patchWriter::endCellData()
+{}
+
+
+void Foam::foamVtkOutput::patchWriter::beginPointData(label nFields)
+{
+    foamVtkOutput::legacy::pointDataHeader(os(), nPoints_, nFields);
+}
+
+
+void Foam::foamVtkOutput::patchWriter::endPointData()
+{}
+
+
+void Foam::foamVtkOutput::patchWriter::writePatchIDs()
+{
+    os_ << "patchID 1 " << nFaces_ << " float" << nl;
 
     forAll(patchIDs_, i)
     {
-        label patchi = patchIDs_[i];
+        const label patchId = patchIDs_[i];
 
-        const polyPatch& pp = mesh_.boundaryMesh()[patchi];
+        const polyPatch& pp = mesh_.boundaryMesh()[patchId];
 
-        if (!isA<emptyPolyPatch>(pp))
+        forAll(pp, facei)
         {
-            writeFuns::insert(scalarField(pp.size(), patchi), fField);
+            format().write(patchId);
         }
     }
-    writeFuns::write(os_, binary_, fField);
+    format().flush();
 }
 
 
diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/patchWriter.H b/src/conversion/vtk/output/foamVtkPatchWriter.H
similarity index 64%
rename from applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/patchWriter.H
rename to src/conversion/vtk/output/foamVtkPatchWriter.H
index aab8075da8..a43dc54910 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/patchWriter.H
+++ b/src/conversion/vtk/output/foamVtkPatchWriter.H
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
-     \\/     M anipulation  | Copyright (C) 2016 OpenCFD Ltd.
+     \\/     M anipulation  | Copyright (C) 2016-2017 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -22,19 +22,19 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
-    Foam::patchWriter
+    Foam::foamVtkOutput::patchWriter
 
 Description
     Write patch fields
 
 SourceFiles
-    patchWriter.C
-    patchWriterTemplates.C
+    foamVtkPatchWriter.C
+    foamVtkPatchWriterTemplates.C
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef patchWriter_H
-#define patchWriter_H
+#ifndef foamVtkPatchWriter_H
+#define foamVtkPatchWriter_H
 
 #include "pointMesh.H"
 #include "OFstream.H"
@@ -42,14 +42,17 @@ SourceFiles
 #include "pointFields.H"
 #include "indirectPrimitivePatch.H"
 #include "PrimitivePatchInterpolation.H"
+#include "foamVtkOutput.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
 {
-
 class volPointInterpolation;
 
+namespace foamVtkOutput
+{
+
 /*---------------------------------------------------------------------------*\
                            Class patchWriter Declaration
 \*---------------------------------------------------------------------------*/
@@ -59,12 +62,10 @@ class patchWriter
     //- Reference to the OpenFOAM mesh (or subset)
     const fvMesh& mesh_;
 
-    const bool binary_;
+    autoPtr<foamVtkOutput::formatter> format_;
 
     const bool nearCellValue_;
 
-    const fileName fName_;
-
     const labelList patchIDs_;
 
     std::ofstream os_;
@@ -80,69 +81,95 @@ public:
         //- Construct from components
         patchWriter
         (
-            const fvMesh&,
+            const fvMesh& mesh,
             const bool binary,
             const bool nearCellValue,
-            const fileName&,
+            const fileName& fName,
             const labelList& patchIDs
         );
 
 
     // Member Functions
 
-        std::ofstream& os()
+        inline std::ofstream& os()
         {
             return os_;
         }
 
-        label nPoints() const
+        inline foamVtkOutput::formatter& format()
+        {
+            return format_();
+        }
+
+        inline label nPoints() const
         {
             return nPoints_;
         }
 
-        label nFaces() const
+        inline label nFaces() const
         {
             return nFaces_;
         }
 
+        //- Open write for CellData of count fields.
+        //  The parameters are only used for the legacy format.
+        void beginCellData(label nFields);
+
+        //- Close write for CellData
+        void endCellData();
+
+        //- Open write for PointData of count fields
+        //  The parameters are only used for the legacy format.
+        void beginPointData(label nFields);
+
+        //- Close write for PointData
+        void endPointData();
+
         //- Write cellIDs
         void writePatchIDs();
 
         //- Write volFields
-        template<class Type>
-        void write
-        (
-            const UPtrList<const GeometricField<Type, fvPatchField, volMesh>>&
-        );
-
-        //- Write pointFields
-        template<class Type>
+        template<class Type, template<class> class PatchField>
         void write
         (
             const UPtrList
             <
-                const GeometricField<Type, pointPatchField, pointMesh>
+                const GeometricField<Type, PatchField, volMesh>
+            >& flds
+        );
+
+        //- Write pointFields
+        template<class Type, template<class> class PatchField>
+        void write
+        (
+            const UPtrList
+            <
+                const GeometricField<Type, PatchField, pointMesh>
             >&
         );
 
-        //- Interpolate and write volFields
+        //- Interpolated volFields
         template<class Type>
         void write
         (
-            const PrimitivePatchInterpolation<primitivePatch>&,
-            const UPtrList<const GeometricField<Type, fvPatchField, volMesh>>&
+            const PrimitivePatchInterpolation<primitivePatch>& pInterp,
+            const UPtrList
+            <
+                const GeometricField<Type, fvPatchField, volMesh>
+            >& flds
         );
 };
 
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+} // End namespace foamVtkOutput
 } // End namespace Foam
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-    #include "patchWriterTemplates.C"
+    #include "foamVtkPatchWriterTemplates.C"
 #endif
 
 
diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/patchWriterTemplates.C b/src/conversion/vtk/output/foamVtkPatchWriterTemplates.C
similarity index 51%
rename from applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/patchWriterTemplates.C
rename to src/conversion/vtk/output/foamVtkPatchWriterTemplates.C
index 567b1db68c..d9d733efbc 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/patchWriterTemplates.C
+++ b/src/conversion/vtk/output/foamVtkPatchWriterTemplates.C
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
-     \\/     M anipulation  | Copyright (C) 2016 OpenCFD Ltd.
+     \\/     M anipulation  | Copyright (C) 2016-2017 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -23,79 +23,71 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "patchWriter.H"
-#include "writeFuns.H"
+#include "foamVtkPatchWriter.H"
+#include "foamVtkOutput.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-template<class Type>
-void Foam::patchWriter::write
+template<class Type, template<class> class PatchField>
+void Foam::foamVtkOutput::patchWriter::write
 (
-    const UPtrList<const GeometricField<Type, fvPatchField, volMesh>>& flds
+    const UPtrList<const GeometricField<Type, PatchField, volMesh>>& flds
 )
 {
     forAll(flds, fieldi)
     {
-        const GeometricField<Type, fvPatchField, volMesh>& fld = flds[fieldi];
+        const auto& fld = flds[fieldi];
 
         os_ << fld.name() << ' '
             << int(pTraits<Type>::nComponents) << ' '
-            << nFaces_ << " float" << std::endl;
+            << nFaces_ << " float" << nl;
 
-        DynamicList<floatScalar> fField(pTraits<Type>::nComponents*nFaces_);
-
-        forAll(patchIDs_, j)
+        forAll(patchIDs_, i)
         {
-            label patchi = patchIDs_[j];
-
-            const fvPatchField<Type>& pfld = fld.boundaryField()[patchi];
+            const auto& pfld = fld.boundaryField()[patchIDs_[i]];
 
             if (nearCellValue_)
             {
-                writeFuns::insert(pfld.patchInternalField()(), fField);
+                foamVtkOutput::writeList(format(), pfld.patchInternalField()());
             }
             else
             {
-                writeFuns::insert(pfld, fField);
+                foamVtkOutput::writeList(format(), pfld);
             }
         }
-        writeFuns::write(os_, binary_, fField);
+
+        format().flush();
     }
 }
 
 
-template<class Type>
-void Foam::patchWriter::write
+template<class Type, template<class> class PatchField>
+void Foam::foamVtkOutput::patchWriter::write
 (
-    const UPtrList<const GeometricField<Type, pointPatchField, pointMesh>>& flds
+    const UPtrList<const GeometricField<Type, PatchField, pointMesh>>& flds
 )
 {
     forAll(flds, fieldi)
     {
-        const GeometricField<Type, pointPatchField, pointMesh>& fld =
-            flds[fieldi];
+        const auto& fld = flds[fieldi];
 
         os_ << fld.name() << ' '
             << int(pTraits<Type>::nComponents) << ' '
-            << nPoints_ << " float" << std::endl;
+            << nPoints_ << " float" << nl;
 
-        DynamicList<floatScalar> fField(pTraits<Type>::nComponents*nPoints_);
-
-        forAll(patchIDs_, j)
+        forAll(patchIDs_, i)
         {
-            label patchi = patchIDs_[j];
+            const auto& pfld = fld.boundaryField()[patchIDs_[i]];
 
-            const pointPatchField<Type>& pfld = fld.boundaryField()[patchi];
-
-            writeFuns::insert(pfld.patchInternalField()(), fField);
+            foamVtkOutput::writeList(format(), pfld.patchInternalField()());
         }
-        writeFuns::write(os_, binary_, fField);
+        format().flush();
     }
 }
 
 
 template<class Type>
-void Foam::patchWriter::write
+void Foam::foamVtkOutput::patchWriter::write
 (
     const PrimitivePatchInterpolation<primitivePatch>& pInter,
     const UPtrList<const GeometricField<Type, fvPatchField, volMesh>>& flds
@@ -103,41 +95,33 @@ void Foam::patchWriter::write
 {
     forAll(flds, fieldi)
     {
-        const GeometricField<Type, fvPatchField, volMesh>& fld = flds[fieldi];
+        const auto& fld = flds[fieldi];
 
         os_ << fld.name() << ' '
             << int(pTraits<Type>::nComponents) << ' '
-            << nPoints_ << " float" << std::endl;
+            << nPoints_ << " float" << nl;
 
         DynamicList<floatScalar> fField(pTraits<Type>::nComponents*nPoints_);
 
-        forAll(patchIDs_, j)
+        forAll(patchIDs_, i)
         {
-            label patchi = patchIDs_[j];
-
-            const fvPatchField<Type>& pfld = fld.boundaryField()[patchi];
+            const auto& pfld = fld.boundaryField()[patchIDs_[i]];
 
             if (nearCellValue_)
             {
-                writeFuns::insert
-                (
-                    pInter.faceToPointInterpolate
-                    (
-                        pfld.patchInternalField()()
-                    )(),
-                    fField
-                );
+                auto tfield =
+                    pInter.faceToPointInterpolate(pfld.patchInternalField()());
+
+                foamVtkOutput::writeList(format(), tfield());
             }
             else
             {
-                writeFuns::insert
-                (
-                    pInter.faceToPointInterpolate(pfld)(),
-                    fField
-                );
+                auto tfield = pInter.faceToPointInterpolate(pfld);
+
+                foamVtkOutput::writeList(format(), tfield());
             }
         }
-        writeFuns::write(os_, binary_, fField);
+        format().flush();
     }
 }
 
diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/surfaceMeshWriter.C b/src/conversion/vtk/output/foamVtkSurfaceMeshWriter.C
similarity index 56%
rename from applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/surfaceMeshWriter.C
rename to src/conversion/vtk/output/foamVtkSurfaceMeshWriter.C
index 367dd92e7a..810620bf11 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/surfaceMeshWriter.C
+++ b/src/conversion/vtk/output/foamVtkSurfaceMeshWriter.C
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2017 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -23,12 +23,12 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "surfaceMeshWriter.H"
-#include "writeFuns.H"
+#include "foamVtkSurfaceMeshWriter.H"
+#include "foamVtkOutput.H"
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-Foam::surfaceMeshWriter::surfaceMeshWriter
+Foam::foamVtkOutput::surfaceMeshWriter::surfaceMeshWriter
 (
     const bool binary,
     const indirectPrimitivePatch& pp,
@@ -36,44 +36,61 @@ Foam::surfaceMeshWriter::surfaceMeshWriter
     const fileName& fName
 )
 :
-    binary_(binary),
     pp_(pp),
-    fName_(fName),
+    format_(),
     os_(fName.c_str())
 {
-    // Write header
-    writeFuns::writeHeader(os_, binary_, name);
+    format_ = foamVtkOutput::newFormatter
+    (
+        os_,
+        (
+            binary
+          ? foamVtkOutput::LEGACY_BINARY
+          : foamVtkOutput::LEGACY_ASCII
+        )
+    );
 
-    os_ << "DATASET POLYDATA" << std::endl;
+    foamVtkOutput::legacy::fileHeader(format(), name)
+        << "DATASET POLYDATA" << nl;
+
+    //------------------------------------------------------------------
 
     // Write topology
-    label nFaceVerts = 0;
+    label nFaceVerts = pp.size();
 
     forAll(pp, facei)
     {
-        nFaceVerts += pp[facei].size() + 1;
+        nFaceVerts += pp[facei].size();
     }
 
-    os_ << "POINTS " << pp.nPoints() << " float" << std::endl;
+    os_ << "POINTS " << pp.nPoints() << " float" << nl;
 
-    DynamicList<floatScalar> ptField(3*pp.nPoints());
-    writeFuns::insert(pp.localPoints(), ptField);
-    writeFuns::write(os_, binary, ptField);
+    foamVtkOutput::writeList(format(), pp.localPoints());
+    format().flush();
 
-
-    os_ << "POLYGONS " << pp.size() << ' ' << nFaceVerts << std::endl;
-
-    DynamicList<label> vertLabels(nFaceVerts);
+    os_ << "POLYGONS " << pp.size() << ' ' << nFaceVerts << nl;
 
     forAll(pp, facei)
     {
         const face& f = pp.localFaces()[facei];
 
-        vertLabels.append(f.size());
-        writeFuns::insert(f, vertLabels);
+        format().write(f.size());
+        foamVtkOutput::writeList(format(), f);
     }
-    writeFuns::write(os_, binary_, vertLabels);
+    format().flush();
 }
 
 
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+void Foam::foamVtkOutput::surfaceMeshWriter::beginCellData(label nFields)
+{
+    foamVtkOutput::legacy::cellDataHeader(os(), pp_.size(), nFields);
+}
+
+
+void Foam::foamVtkOutput::surfaceMeshWriter::endCellData()
+{}
+
+
 // ************************************************************************* //
diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/surfaceMeshWriter.H b/src/conversion/vtk/output/foamVtkSurfaceMeshWriter.H
similarity index 81%
rename from applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/surfaceMeshWriter.H
rename to src/conversion/vtk/output/foamVtkSurfaceMeshWriter.H
index 0a5589c26e..7173f53e86 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/surfaceMeshWriter.H
+++ b/src/conversion/vtk/output/foamVtkSurfaceMeshWriter.H
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2017 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -22,44 +22,45 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
-    Foam::surfaceMeshWriter
+    Foam::foamVtkOutput::surfaceMeshWriter
 
 Description
     Write faces with fields
 
 SourceFiles
-    surfaceMeshWriter.C
-    surfaceMeshWriterTemplates.C
+    foamVtkSurfaceMeshWriter.C
+    foamVtkSurfaceMeshWriterTemplates.C
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef surfaceMeshWriter_H
-#define surfaceMeshWriter_H
+#ifndef foamVtkSurfaceMeshWriter_H
+#define foamVtkSurfaceMeshWriter_H
 
 #include "pointMesh.H"
 #include "OFstream.H"
 #include "volFields.H"
 #include "surfaceFields.H"
 #include "indirectPrimitivePatch.H"
+#include "foamVtkOutput.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
 {
-
 class volPointInterpolation;
 
+namespace foamVtkOutput
+{
+
 /*---------------------------------------------------------------------------*\
                       Class surfaceMeshWriter Declaration
 \*---------------------------------------------------------------------------*/
 
 class surfaceMeshWriter
 {
-    const bool binary_;
-
     const indirectPrimitivePatch& pp_;
 
-    const fileName fName_;
+    autoPtr<foamVtkOutput::formatter> format_;
 
     std::ofstream os_;
 
@@ -80,16 +81,26 @@ public:
 
     // Member Functions
 
-        std::ofstream& os()
+        inline std::ofstream& os()
         {
             return os_;
         }
 
+        inline foamVtkOutput::formatter& format()
+        {
+            return format_();
+        }
+
+        void beginCellData(label nFields);
+
+        void endCellData();
+
+
         //- Extract face data
         template<class Type>
         tmp<Field<Type>> getFaceField
         (
-            const GeometricField<Type, fvsPatchField, surfaceMesh>&
+            const GeometricField<Type, fvsPatchField, surfaceMesh>& sfld
         ) const;
 
         //- Write surfaceFields
@@ -99,19 +110,20 @@ public:
             const UPtrList
             <
                 const GeometricField<Type, fvsPatchField, surfaceMesh>
-            >&
+            >& sflds
         );
 };
 
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+} // End namespace foamVtkOutput
 } // End namespace Foam
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-    #include "surfaceMeshWriterTemplates.C"
+    #include "foamVtkSurfaceMeshWriterTemplates.C"
 #endif
 
 
diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/surfaceMeshWriterTemplates.C b/src/conversion/vtk/output/foamVtkSurfaceMeshWriterTemplates.C
similarity index 83%
rename from applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/surfaceMeshWriterTemplates.C
rename to src/conversion/vtk/output/foamVtkSurfaceMeshWriterTemplates.C
index 92d878f229..b39ea2bf53 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/surfaceMeshWriterTemplates.C
+++ b/src/conversion/vtk/output/foamVtkSurfaceMeshWriterTemplates.C
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
-     \\/     M anipulation  | Copyright (C) 2016 OpenCFD Ltd.
+     \\/     M anipulation  | Copyright (C) 2016-2017 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -23,14 +23,13 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "surfaceMeshWriter.H"
-#include "writeFuns.H"
+#include "foamVtkSurfaceMeshWriter.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 template<class Type>
 Foam::tmp<Foam::Field<Type>>
-Foam::surfaceMeshWriter::getFaceField
+Foam::foamVtkOutput::surfaceMeshWriter::getFaceField
 (
     const GeometricField<Type, fvsPatchField, surfaceMesh>& sfld
 ) const
@@ -42,9 +41,8 @@ Foam::surfaceMeshWriter::getFaceField
 
     forAll(pp_.addressing(), i)
     {
-        label facei = pp_.addressing()[i];
-
-        label patchi = patches.whichPatch(facei);
+        const label facei = pp_.addressing()[i];
+        const label patchi = patches.whichPatch(facei);
 
         if (patchi == -1)
         {
@@ -62,7 +60,7 @@ Foam::surfaceMeshWriter::getFaceField
 
 
 template<class Type>
-void Foam::surfaceMeshWriter::write
+void Foam::foamVtkOutput::surfaceMeshWriter::write
 (
     const UPtrList
     <
@@ -79,9 +77,9 @@ void Foam::surfaceMeshWriter::write
             << int(pTraits<Type>::nComponents) << ' '
             << pp_.size() << " float" << std::endl;
 
-        DynamicList<floatScalar> fField(pTraits<Type>::nComponents*pp_.size());
-        writeFuns::insert(getFaceField(fld)(), fField);
-        writeFuns::write(os_, binary_, fField);
+        foamVtkOutput::writeList(format(), getFaceField(fld)());
+
+        format().flush();
     }
 }
 
diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/writeSurfFields.C b/src/conversion/vtk/output/foamVtkWriteSurfFields.C
similarity index 64%
rename from applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/writeSurfFields.C
rename to src/conversion/vtk/output/foamVtkWriteSurfFields.C
index 9dc889adf4..99a006a150 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/writeSurfFields.C
+++ b/src/conversion/vtk/output/foamVtkWriteSurfFields.C
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
-     \\/     M anipulation  | Copyright (C) 2016 OpenCFD Ltd.
+     \\/     M anipulation  | Copyright (C) 2016-2017 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -23,16 +23,16 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "writeSurfFields.H"
+#include "foamVtkWriteSurfFields.H"
 #include "OFstream.H"
-#include "floatScalar.H"
-#include "writeFuns.H"
 #include "emptyFvsPatchFields.H"
 #include "fvsPatchFields.H"
+#include "surfaceFields.H"
+#include "foamVtkOutput.H"
 
 // * * * * * * * * * * * * * * * Global Functions  * * * * * * * * * * * * * //
 
-void Foam::writeSurfFields
+void Foam::foamVtkOutput::writeSurfFields
 (
     const bool binary,
     const fvMesh& mesh,
@@ -40,72 +40,67 @@ void Foam::writeSurfFields
     const UPtrList<const surfaceVectorField>& surfVectorFields
 )
 {
-    std::ofstream str(fileName.c_str());
+    std::ofstream os(fileName.c_str());
 
-    writeFuns::writeHeader
+    autoPtr<foamVtkOutput::formatter> format = foamVtkOutput::newFormatter
     (
-        str,
-        binary,
-        "surfaceFields"
+        os,
+        (
+            binary
+          ? foamVtkOutput::LEGACY_BINARY
+          : foamVtkOutput::LEGACY_ASCII
+        )
     );
 
-    str << "DATASET POLYDATA" << std::endl;
+    foamVtkOutput::legacy::fileHeader(format(), "surfaceFields")
+        << "DATASET POLYDATA" << nl;
 
     const pointField& fc = mesh.faceCentres();
 
-    str << "POINTS " << mesh.nFaces() << " float" << std::endl;
+    os << "POINTS " << mesh.nFaces() << " float" << nl;
 
-    DynamicList<floatScalar> pField(3*mesh.nFaces());
+    foamVtkOutput::writeList(format(), fc);
+    format().flush();
 
-    for (label facei = 0; facei < mesh.nFaces(); facei++)
-    {
-        writeFuns::insert(fc[facei], pField);
-    }
+    foamVtkOutput::legacy::pointDataHeader
+    (
+        os,
+        mesh.nFaces(),
+        surfVectorFields.size()
+    );
 
-    writeFuns::write(str, binary, pField);
-
-    str << "POINT_DATA " << mesh.nFaces() << std::endl
-        << "FIELD attributes " << surfVectorFields.size() << std::endl;
 
     // surfVectorFields
     forAll(surfVectorFields, fieldi)
     {
         const surfaceVectorField& svf = surfVectorFields[fieldi];
 
-        str << svf.name() << " 3 "
-            << mesh.nFaces() << " float" << std::endl;
-
-        DynamicList<floatScalar> fField(3*mesh.nFaces());
-
-        for (label facei = 0; facei < mesh.nInternalFaces(); facei++)
+        os  << svf.name() << " 3 " << mesh.nFaces() << " float" << nl;
+        for (label facei=0; facei < mesh.nInternalFaces(); ++facei)
         {
-            writeFuns::insert(svf[facei], fField);
+            foamVtkOutput::write(format(), svf[facei]);
         }
 
         forAll(svf.boundaryField(), patchi)
         {
-            const fvsPatchVectorField& pf = svf.boundaryField()[patchi];
-
             const fvPatch& pp = mesh.boundary()[patchi];
+            const fvsPatchVectorField& pf = svf.boundaryField()[patchi];
 
             if (isA<emptyFvsPatchVectorField>(pf))
             {
                 // Note: loop over polypatch size, not fvpatch size.
                 forAll(pp.patch(), i)
                 {
-                    writeFuns::insert(vector::zero, fField);
+                    foamVtkOutput::write(format(), vector::zero);
                 }
             }
             else
             {
-                forAll(pf, i)
-                {
-                    writeFuns::insert(pf[i], fField);
-                }
+                foamVtkOutput::writeList(format(), pf);
             }
         }
 
-        writeFuns::write(str, binary, fField);
+        format().flush();
     }
 }
 
diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/writeSurfFields.H b/src/conversion/vtk/output/foamVtkWriteSurfFields.H
similarity index 87%
rename from applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/writeSurfFields.H
rename to src/conversion/vtk/output/foamVtkWriteSurfFields.H
index 7740e15f78..9ce9f4096c 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/writeSurfFields.H
+++ b/src/conversion/vtk/output/foamVtkWriteSurfFields.H
@@ -21,19 +21,19 @@ License
     You should have received a copy of the GNU General Public License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
-InClass
-    Foam::writeSurfFields
+InNamespace
+    Foam::foamVtkOutput
 
 Description
     Write a patch with its data.
 
 SourceFiles
-    writeSurfFields.C
+    foamVtkWriteSurfFields.C
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef writeSurfFields_H
-#define writeSurfFields_H
+#ifndef foamVtkWriteSurfFields_H
+#define foamVtkWriteSurfFields_H
 
 #include "fvMesh.H"
 #include "surfaceMesh.H"
@@ -43,16 +43,19 @@ SourceFiles
 
 namespace Foam
 {
+namespace foamVtkOutput
+{
 
-// Write surface vector fields
+//- Write surface vector fields
 void writeSurfFields
 (
     const bool binary,
-    const fvMesh&,
+    const fvMesh& mesh,
     const fileName& fileName,
     const UPtrList<const surfaceVectorField>& surfVectorFields
 );
 
+} // End namespace foamVtkOutput
 } // End namespace Foam
 
 
diff --git a/src/functionObjects/utilities/Make/files b/src/functionObjects/utilities/Make/files
index e2f72c06cf..ea37b71c95 100644
--- a/src/functionObjects/utilities/Make/files
+++ b/src/functionObjects/utilities/Make/files
@@ -2,6 +2,7 @@ abort/abort.C
 
 codedFunctionObject/codedFunctionObject.C
 ensightWrite/ensightWrite.C
+writeVTK/writeVTK.C
 
 removeRegisteredObject/removeRegisteredObject.C
 
diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/writeVTK/writeVTK.C b/src/functionObjects/utilities/writeVTK/writeVTK.C
similarity index 81%
rename from applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/writeVTK/writeVTK.C
rename to src/functionObjects/utilities/writeVTK/writeVTK.C
index 2e7fa177c3..2b7c58dca8 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/writeVTK/writeVTK.C
+++ b/src/functionObjects/utilities/writeVTK/writeVTK.C
@@ -26,8 +26,7 @@ License
 #include "writeVTK.H"
 #include "dictionary.H"
 #include "Time.H"
-#include "vtkMesh.H"
-#include "internalWriter.H"
+#include "foamVtkInternalWriter.H"
 #include "addToRunTimeSelectionTable.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
@@ -107,7 +106,7 @@ bool Foam::functionObjects::writeVTK::write()
     }
 
     // Create file and write header
-    fileName vtkFileName
+    fileName outputName
     (
         fvPath/vtkName
       + "_"
@@ -115,12 +114,24 @@ bool Foam::functionObjects::writeVTK::write()
       + ".vtk"
     );
 
-    Info<< "    Internal  : " << vtkFileName << endl;
+    Info<< "    Internal  : " << outputName << endl;
 
-    vtkMesh vMesh(const_cast<fvMesh&>(mesh_));
+    foamVtkCells foamVtkMeshCells
+    (
+        mesh_,
+        foamVtkCells::contentType::LEGACY,
+        true  // decompose
+    );
 
     // Write mesh
-    internalWriter writer(vMesh, false, vtkFileName);
+    foamVtkOutput::internalWriter writer
+    (
+        mesh_,
+        foamVtkOutput::LEGACY_ASCII,
+        foamVtkMeshCells,
+        outputName
+    );
+
 
     UPtrList<const volScalarField> vsf(lookupFields<volScalarField>());
     UPtrList<const volVectorField> vvf(lookupFields<volVectorField>());
@@ -131,23 +142,23 @@ bool Foam::functionObjects::writeVTK::write()
     UPtrList<const volSymmTensorField> vstf(lookupFields<volSymmTensorField>());
     UPtrList<const volTensorField> vtf(lookupFields<volTensorField>());
 
-    // Write header for cellID and volFields
-    writeFuns::writeCellDataHeader
-    (
-        writer.os(),
-        vMesh.nFieldCells(),
-        1 + vsf.size() + vvf.size() + vsptf.size() + vstf.size() + vtf.size()
-    );
+    const label nVolFields =
+        vsf.size() + vvf.size() + vsptf.size() + vstf.size() + vtf.size();
 
-    // Write cellID field
-    writer.writeCellIDs();
+    // CellData
+    {
+        writer.beginCellData(1 + nVolFields);
 
-    // Write volFields
-    writer.write(vsf);
-    writer.write(vvf);
-    writer.write(vsptf);
-    writer.write(vstf);
-    writer.write(vtf);
+        // Write cellID field
+        writer.writeCellIDs();
+
+        // Write volFields
+        writer.write(vsf);
+        writer.write(vvf);
+        writer.write(vsptf);
+        writer.write(vstf);
+        writer.write(vtf);
+    }
 
     return true;
 }
diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/writeVTK/writeVTK.H b/src/functionObjects/utilities/writeVTK/writeVTK.H
similarity index 92%
rename from applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/writeVTK/writeVTK.H
rename to src/functionObjects/utilities/writeVTK/writeVTK.H
index c15dd17f48..33c62057f3 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/writeVTK/writeVTK.H
+++ b/src/functionObjects/utilities/writeVTK/writeVTK.H
@@ -28,10 +28,9 @@ Group
     grpUtilitiesFunctionObjects
 
 Description
-    This functionObject writes objects registered to the database in VTK format
-    using the foamToVTK library.
+    This functionObject writes objects registered to the database in VTK format.
 
-    Currently only the writing of the cell-values of volFields is supported but
+    Currently only supports writing of the cell-values of volFields but
     support for other field types, patch fields, Lagrangian data etc. will be
     added.
 
@@ -49,7 +48,7 @@ Description
 Usage
     \table
         Property     | Description             | Required    | Default value
-        type         | type name: writeVTK     | yes         |
+        type         | Type name: writeVTK     | yes         |
         objectNames  | objects to write        | yes         |
     \endtable
 
@@ -108,7 +107,6 @@ class writeVTK
         //- Names of objects
         wordReList objectNames_;
 
-
         //- Result name
         word resultName_;
 
@@ -121,10 +119,10 @@ class writeVTK
         UPtrList<const GeoField> lookupFields() const;
 
         //- Disallow default bitwise copy construct
-        writeVTK(const writeVTK&);
+        writeVTK(const writeVTK&) = delete;
 
         //- Disallow default bitwise assignment
-        void operator=(const writeVTK&);
+        void operator=(const writeVTK&) = delete;
 
 
 public:
@@ -140,7 +138,7 @@ public:
         (
             const word& name,
             const Time& t,
-            const dictionary&
+            const dictionary& dict
         );
 
 
@@ -151,7 +149,7 @@ public:
     // Member Functions
 
         //- Read the writeVTK data
-        virtual bool read(const dictionary&);
+        virtual bool read(const dictionary& dict);
 
         //- Execute, currently does nothing
         virtual bool execute();
diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/writeVTK/writeVTKTemplates.C b/src/functionObjects/utilities/writeVTK/writeVTKTemplates.C
similarity index 100%
rename from applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/writeVTK/writeVTKTemplates.C
rename to src/functionObjects/utilities/writeVTK/writeVTKTemplates.C

From 96d98cd2de39617f3fc352934733c17f788fb7b9 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Tue, 23 May 2017 08:02:25 +0200
Subject: [PATCH 14/27] ENH: paraFoam --help => immediate pass-through to
 paraview --help

ENH: Paraview modules.

- Update props with int, not bool (for more versatility)
- Set properties and tool-tips directly on widgets instead of buttons
---
 .../PVFoamReader/PVFoamReader_SM.xml          |   2 +-
 .../PVFoamReader/pqFoamReaderControls.cxx     | 108 +++++++++++++-----
 .../PVFoamReader/pqFoamReaderControls.h       |   4 +-
 .../pqFoamBlockMeshControls.cxx               |  51 ++++++---
 .../pqFoamBlockMeshControls.h                 |   4 +-
 bin/paraFoam                                  |  29 +++--
 6 files changed, 137 insertions(+), 61 deletions(-)

diff --git a/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/PVFoamReader/PVFoamReader_SM.xml b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/PVFoamReader/PVFoamReader_SM.xml
index a82c81850f..e88e13b61d 100644
--- a/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/PVFoamReader/PVFoamReader_SM.xml
+++ b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/PVFoamReader/PVFoamReader_SM.xml
@@ -148,7 +148,7 @@
     <!-- Use VTK Polyhedron (check-box) -->
     <IntVectorProperty animateable="0"
       name="UseVTKPolyhedron"
-      label="Use VTK Polyhedron"
+      label="VTK Polyhedra"
       command="SetUseVTKPolyhedron"
       default_values="0"
       number_of_elements="1"
diff --git a/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/PVFoamReader/pqFoamReaderControls.cxx b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/PVFoamReader/pqFoamReaderControls.cxx
index 3b6fe3da97..f501599397 100644
--- a/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/PVFoamReader/pqFoamReaderControls.cxx
+++ b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/PVFoamReader/pqFoamReaderControls.cxx
@@ -37,18 +37,20 @@ License
 #include "vtkSMIntVectorProperty.h"
 #include "vtkSMPropertyGroup.h"
 #include "vtkSMSourceProxy.h"
+#include "vtkSMEnumerationDomain.h"
 
 
 // * * * * * * * * * * * * * Static Member Functions * * * * * * * * * * * * //
 
 // file-scope
-static QAbstractButton* setButtonProperties
+// Widget properties
+static QWidget* setWidgetProperties
 (
-    QAbstractButton* b,
+    QWidget* widget,
     vtkSMProperty* prop
 )
 {
-    QString tip;
+    widget->setFocusPolicy(Qt::NoFocus); // avoid dotted border
 
     vtkSMDocumentation* doc = prop->GetDocumentation();
     if (doc)
@@ -56,21 +58,33 @@ static QAbstractButton* setButtonProperties
         const char* txt = doc->GetDescription();
         if (txt)
         {
-            tip = QString(txt).simplified();
+            QString tip = QString(txt).simplified();
+            if (tip.size())
+            {
+               widget->setToolTip(tip);
+            }
         }
     }
 
+    return widget;
+}
+
+
+// file-scope
+// Button properties
+static QAbstractButton* setButtonProperties
+(
+    QAbstractButton* b,
+    vtkSMProperty* prop
+)
+{
+    setWidgetProperties(b, prop);
     b->setText(prop->GetXMLLabel());
-    if (tip.size())
-    {
-        b->setToolTip(tip);
-    }
-    b->setFocusPolicy(Qt::NoFocus); // avoid dotted border
 
     vtkSMIntVectorProperty* intProp =
        vtkSMIntVectorProperty::SafeDownCast(prop);
 
-    // initial checked state for integer (bool) properties
+    // Initial checked state for integer (bool) properties
     if (intProp)
     {
         b->setChecked(intProp->GetElement(0));
@@ -102,12 +116,12 @@ static vtkSMIntVectorProperty* lookupIntProp
 void pqFoamReaderControls::fireCommand
 (
     vtkSMIntVectorProperty* prop,
-    bool checked
+    int val
 )
 {
     vtkSMProxy* pxy = this->proxy();
 
-    prop->SetElement(0, checked); // Toogle bool
+    prop->SetElement(0, val); // Set int value, toogle bool, etc
 
     // Fire off command
     prop->Modified();
@@ -140,9 +154,9 @@ void pqFoamReaderControls::refreshPressed()
 }
 
 
-void pqFoamReaderControls::cacheMesh(bool checked)
+void pqFoamReaderControls::cacheMesh(int val)
 {
-    fireCommand(cacheMesh_, checked);
+    fireCommand(cacheMesh_, val);
 }
 
 
@@ -222,7 +236,10 @@ pqFoamReaderControls::pqFoamReaderControls
         setButtonProperties(b, zeroTime);
         form->addWidget(b, row, 1, Qt::AlignLeft);
 
-        addPropertyLink(b, "checked", SIGNAL(toggled(bool)), zeroTime);
+        addPropertyLink
+        (
+            b, "checked", SIGNAL(toggled(bool)), zeroTime
+        );
     }
 
     // LINE
@@ -244,8 +261,14 @@ pqFoamReaderControls::pqFoamReaderControls
         setButtonProperties(b, includeSets_);
         form->addWidget(b, row, 0, Qt::AlignLeft);
 
-        addPropertyLink(b, "checked", SIGNAL(toggled(bool)), includeSets_);
-        connect(b, SIGNAL(toggled(bool)), this, SLOT(includeSets(bool)));
+        addPropertyLink
+        (
+            b, "checked", SIGNAL(toggled(bool)), includeSets_
+        );
+        connect
+        (
+            b, SIGNAL(toggled(bool)), this, SLOT(includeSets(bool))
+        );
     }
 
     if (showGroupsOnly_)
@@ -254,8 +277,14 @@ pqFoamReaderControls::pqFoamReaderControls
         setButtonProperties(b, showGroupsOnly_);
         form->addWidget(b, row, 1, Qt::AlignLeft);
 
-        addPropertyLink(b, "checked", SIGNAL(toggled(bool)), showGroupsOnly_);
-        connect(b, SIGNAL(toggled(bool)), this, SLOT(showGroupsOnly(bool)));
+        addPropertyLink
+        (
+            b, "checked", SIGNAL(toggled(bool)), showGroupsOnly_
+        );
+        connect
+        (
+            b, SIGNAL(toggled(bool)), this, SLOT(showGroupsOnly(bool))
+        );
     }
 
 
@@ -269,8 +298,14 @@ pqFoamReaderControls::pqFoamReaderControls
         setButtonProperties(b, includeZones_);
         form->addWidget(b, row, 0, Qt::AlignLeft);
 
-        addPropertyLink(b, "checked", SIGNAL(toggled(bool)), includeZones_);
-        connect(b, SIGNAL(toggled(bool)), this, SLOT(includeZones(bool)));
+        addPropertyLink
+        (
+            b, "checked", SIGNAL(toggled(bool)), includeZones_
+        );
+        connect
+        (
+            b, SIGNAL(toggled(bool)), this, SLOT(includeZones(bool))
+        );
     }
 
     if (showPatchNames_)
@@ -279,7 +314,10 @@ pqFoamReaderControls::pqFoamReaderControls
         setButtonProperties(b, showPatchNames_);
         form->addWidget(b, row, 1, Qt::AlignLeft);
 
-        connect(b, SIGNAL(toggled(bool)), this, SLOT(showPatchNames(bool)));
+        connect
+        (
+            b, SIGNAL(toggled(bool)), this, SLOT(showPatchNames(bool))
+        );
     }
 
     // LINE
@@ -302,7 +340,10 @@ pqFoamReaderControls::pqFoamReaderControls
         setButtonProperties(b, interpolate);
         form->addWidget(b, row, 0, Qt::AlignLeft);
 
-        addPropertyLink(b, "checked", SIGNAL(toggled(bool)), interpolate);
+        addPropertyLink
+        (
+            b, "checked", SIGNAL(toggled(bool)), interpolate
+        );
     }
 
     intProp* extrapolate = lookupIntProp(group, "ExtrapolatePatches");
@@ -312,7 +353,10 @@ pqFoamReaderControls::pqFoamReaderControls
         setButtonProperties(b, extrapolate);
         form->addWidget(b, row, 1, Qt::AlignLeft);
 
-        addPropertyLink(b, "checked", SIGNAL(toggled(bool)), extrapolate);
+        addPropertyLink
+        (
+            b, "checked", SIGNAL(toggled(bool)), extrapolate
+        );
     }
 
     // LINE
@@ -335,7 +379,10 @@ pqFoamReaderControls::pqFoamReaderControls
         setButtonProperties(b, updateGui);
         form->addWidget(b, row, 0, Qt::AlignLeft);
 
-        addPropertyLink(b, "checked", SIGNAL(clicked()), updateGui);
+        addPropertyLink
+        (
+            b, "checked", SIGNAL(clicked()), updateGui
+        );
     }
 
     intProp* usePolyhedron = lookupIntProp(group, "UseVTKPolyhedron");
@@ -345,7 +392,10 @@ pqFoamReaderControls::pqFoamReaderControls
         setButtonProperties(b, usePolyhedron);
         form->addWidget(b, row, 1, Qt::AlignLeft);
 
-        addPropertyLink(b, "checked", SIGNAL(toggled(bool)), usePolyhedron);
+        addPropertyLink
+        (
+            b, "checked", SIGNAL(toggled(bool)), usePolyhedron
+        );
     }
 
     if (cacheMesh_)
@@ -353,8 +403,10 @@ pqFoamReaderControls::pqFoamReaderControls
         QCheckBox* b = new QCheckBox(this);
         setButtonProperties(b, cacheMesh_);
         form->addWidget(b, row, 2, Qt::AlignLeft);
-
-        connect(b, SIGNAL(toggled(bool)), this, SLOT(cacheMesh(bool)));
+        connect
+        (
+            b, SIGNAL(toggled(bool)), this, SLOT(cacheMesh(bool))
+        );
     }
 }
 
diff --git a/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/PVFoamReader/pqFoamReaderControls.h b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/PVFoamReader/pqFoamReaderControls.h
index fc3c8d4044..d8656d894b 100644
--- a/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/PVFoamReader/pqFoamReaderControls.h
+++ b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/PVFoamReader/pqFoamReaderControls.h
@@ -78,8 +78,8 @@ class pqFoamReaderControls
     //- Update property
     void fireCommand(vtkSMProperty* prop);
 
-    //- Toggle and update bool property
-    void fireCommand(vtkSMIntVectorProperty* prop, bool checked);
+    //- Update int property or toggle bool property
+    void fireCommand(vtkSMIntVectorProperty* prop, int val);
 
 
     //- Disallow default bitwise copy construct
diff --git a/applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/PVblockMeshReader/pqFoamBlockMeshControls.cxx b/applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/PVblockMeshReader/pqFoamBlockMeshControls.cxx
index ab4a651706..abb2c75486 100644
--- a/applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/PVblockMeshReader/pqFoamBlockMeshControls.cxx
+++ b/applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/PVblockMeshReader/pqFoamBlockMeshControls.cxx
@@ -40,13 +40,13 @@ License
 // * * * * * * * * * * * * * Static Member Functions * * * * * * * * * * * * //
 
 // file-scope
-static QAbstractButton* setButtonProperties
+static QWidget* setWidgetProperties
 (
-    QAbstractButton* b,
+    QWidget* widget,
     vtkSMProperty* prop
 )
 {
-    QString tip;
+    widget->setFocusPolicy(Qt::NoFocus); // avoid dotted border
 
     vtkSMDocumentation* doc = prop->GetDocumentation();
     if (doc)
@@ -54,22 +54,32 @@ static QAbstractButton* setButtonProperties
         const char* txt = doc->GetDescription();
         if (txt)
         {
-            tip = QString(txt).simplified();
+            QString tip = QString(txt).simplified();
+            if (tip.size())
+            {
+               widget->setToolTip(tip);
+            }
         }
     }
 
-    b->setText(prop->GetXMLLabel());
-    if (tip.size())
-    {
-        b->setToolTip(tip);
-    }
-    b->setFocusPolicy(Qt::NoFocus); // avoid dotted border
+    return widget;
+}
 
 
+// file-scope
+static QAbstractButton* setButtonProperties
+(
+    QAbstractButton* b,
+    vtkSMProperty* prop
+)
+{
+    setWidgetProperties(b, prop);
+    b->setText(prop->GetXMLLabel());
+
     vtkSMIntVectorProperty* intProp =
         vtkSMIntVectorProperty::SafeDownCast(prop);
 
-    // initial checked state for integer (bool) properties
+    // Initial checked state for integer (bool) properties
     if (intProp)
     {
         b->setChecked(intProp->GetElement(0));
@@ -111,12 +121,12 @@ void pqFoamBlockMeshControls::fireCommand(vtkSMProperty* prop)
 void pqFoamBlockMeshControls::fireCommand
 (
     vtkSMIntVectorProperty* prop,
-    bool checked
+    int val
 )
 {
     vtkSMProxy* pxy = this->proxy();
 
-    prop->SetElement(0, checked); // Toogle bool
+    prop->SetElement(0, val); // Set int value, toogle bool, etc
 
     // Fire off command
     prop->Modified();
@@ -200,7 +210,10 @@ pqFoamBlockMeshControls::pqFoamBlockMeshControls
         setButtonProperties(b, refresh_);
         form->addWidget(b, 0, 0, Qt::AlignLeft);
 
-        connect(b, SIGNAL(clicked()), this, SLOT(refreshPressed()));
+        connect
+        (
+            b, SIGNAL(clicked()), this, SLOT(refreshPressed())
+        );
     }
 
     if (showPatchNames_)
@@ -209,7 +222,10 @@ pqFoamBlockMeshControls::pqFoamBlockMeshControls
         setButtonProperties(b, showPatchNames_);
         form->addWidget(b, 0, 1, Qt::AlignLeft);
 
-        connect(b, SIGNAL(toggled(bool)), this, SLOT(showPatchNames(bool)));
+        connect
+        (
+            b, SIGNAL(toggled(bool)), this, SLOT(showPatchNames(bool))
+        );
     }
 
     if (showPointNumbers_)
@@ -218,7 +234,10 @@ pqFoamBlockMeshControls::pqFoamBlockMeshControls
         setButtonProperties(b, showPointNumbers_);
         form->addWidget(b, 0, 2, Qt::AlignLeft);
 
-        connect(b, SIGNAL(toggled(bool)), this, SLOT(showPointNumbers(bool)));
+        connect
+        (
+            b, SIGNAL(toggled(bool)), this, SLOT(showPointNumbers(bool))
+        );
     }
 }
 
diff --git a/applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/PVblockMeshReader/pqFoamBlockMeshControls.h b/applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/PVblockMeshReader/pqFoamBlockMeshControls.h
index a46cdc3052..89d7e945db 100644
--- a/applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/PVblockMeshReader/pqFoamBlockMeshControls.h
+++ b/applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/PVblockMeshReader/pqFoamBlockMeshControls.h
@@ -71,8 +71,8 @@ class pqFoamBlockMeshControls
     //- Update property
     void fireCommand(vtkSMProperty* prop);
 
-    //- Toggle and update bool property
-    void fireCommand(vtkSMIntVectorProperty* prop, bool checked);
+    //- Update int property or toggle bool property
+    void fireCommand(vtkSMIntVectorProperty* prop, int val);
 
     //- Update "BlockArrayStatus", "CurvedEdgesArrayStatus" information
     void updateParts();
diff --git a/bin/paraFoam b/bin/paraFoam
index dcfe4cf1d9..0015e73952 100755
--- a/bin/paraFoam
+++ b/bin/paraFoam
@@ -26,10 +26,10 @@
 #     paraFoam
 #
 # Description
-#     start paraview with the OpenFOAM libraries
+#     Start paraview with the OpenFOAM libraries and reader modules.
 #
 # Note
-#     combining -block or -builtin options with the -region option yields
+#     Combining -block or -builtin options with -region option yields
 #     undefined behaviour
 #------------------------------------------------------------------------------
 usage() {
@@ -37,7 +37,7 @@ usage() {
     while [ "$#" -ge 1 ]; do echo "$1"; shift; done
     cat<<USAGE
 
-Usage: ${0##*/} [OPTION] [PARAVIEW_OPTION]
+Usage: ${0##*/} [OPTION] [--] [PARAVIEW_OPTION]
 options:
   -block            use blockMesh reader  (uses .blockMesh extension)
   -case <dir>       specify alternative case directory, default is the cwd
@@ -46,10 +46,10 @@ options:
   -touchAll         create .blockMesh, .OpenFOAM files (and for all regions)
   -vtk | -builtin   use VTK builtin OpenFOAM reader  (uses .foam extension)
   -help             print the usage
+  --help            paraview help
 
-Paraview options start with a double dashes.
-
-* start paraview with the OpenFOAM libraries
+Start paraview with the OpenFOAM libraries and reader modules.
+Note that paraview options begin with double dashes.
 
   paraview=$(command -v paraview)
 
@@ -57,12 +57,9 @@ USAGE
     exit 1
 }
 
-# We want to do nice exit when running paraview to give paraview opportunity
-# to clean up
+# Do a nice exit to give paraview an opportunity to clean up
 unset FOAM_ABORT
 
-unset regionName optTouch
-
 # Hack: change all locale to 'C' i.e. using '.' for decimal point. This is
 # only needed temporarily until paraview is locale aware. (git version is
 # already 2010-07)
@@ -73,18 +70,19 @@ extension=OpenFOAM
 plugin=PVFoamReader
 
 # Parse options
+unset regionName optTouch
 while [ "$#" -gt 0 ]
 do
     case "$1" in
     -h | -help)
         usage
         ;;
-    -block | -blockMesh)
+    -block*)
         extension=blockMesh
         plugin=PVblockMeshReader
         shift
         ;;
-    -builtin | -vtk)
+    -vtk | -built*)
         extension=foam
         unset plugin
         shift
@@ -113,6 +111,11 @@ do
         shift
         break    # Stop here, treat balance as paraview options
         ;;
+    --help)      # Emit paraview help directly
+        exec paraview "$@"
+        echo "Error: could not exec paraview" 1>&2
+        exit 1   # This should not have happened
+        ;;
     --*)
         break    # Stop here, treat this and balance as paraview options
         ;;
@@ -253,6 +256,8 @@ then
 
     # Has --data=.., send directly to paraview
     exec paraview "$@"
+    echo "Error: could not exec paraview" 1>&2
+    exit 1   # This should not have happened
 
 else
 

From a42c35f64b5d8fa11efe3cb622d4486f895dd16b Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Wed, 24 May 2017 17:12:49 +0200
Subject: [PATCH 15/27] ENH: paraview reader module with internal caching of
 the vtk geometries

- The reader module allows two levels of caching.
  The OpenFOAM fvMesh can be cached in memory, for faster loading of
  fields. Additionally, the translated VTK geometries are held in a
  local cache. The cached VTK geometries should incur no additional
  overhead since they use the VTK reference counting for their storage
  management.
---
 .../PVFoamReader/PVFoamReader_SM.xml          |  38 +-
 .../PVFoamReader/pqFoamReaderControls.cxx     | 120 +++-
 .../PVFoamReader/pqFoamReaderControls.h       |   6 +-
 .../PVFoamReader/vtkPVFoamReader.cxx          |   5 +-
 .../PVFoamReader/vtkPVFoamReader.h            |   8 +-
 .../PVFoamReader/vtkPVFoam/vtkPVFoam.C        | 141 +++--
 .../PVFoamReader/vtkPVFoam/vtkPVFoam.H        | 261 ++++++--
 .../vtkPVFoam/vtkPVFoamFieldTemplates.C       | 564 ++++++++++--------
 .../PVFoamReader/vtkPVFoam/vtkPVFoamFields.C  |  60 +-
 .../PVFoamReader/vtkPVFoam/vtkPVFoamMesh.C    | 469 ++++++++++-----
 .../vtkPVFoam/vtkPVFoamMeshLagrangian.C       |  20 +-
 .../vtkPVFoam/vtkPVFoamMeshVolume.C           | 166 ++++--
 .../vtkPVFoam/vtkPVFoamTemplates.C            |  74 ++-
 .../vtkPVFoam/vtkPVFoamUpdateInfo.C           |  30 +-
 .../vtkPVFoam/vtkPVFoamUpdateTemplates.C      |  12 +-
 .../pqFoamBlockMeshControls.cxx               |   2 +
 .../vtkPVblockMesh/vtkPVblockMesh.C           |  16 +-
 .../vtkPVblockMesh/vtkPVblockMesh.H           |  17 +-
 .../vtkPVblockMesh/vtkPVblockMeshConvert.C    | 104 ++--
 .../graphics/PVReaders/foamPv/foamPvCore.C    | 120 ++--
 .../graphics/PVReaders/foamPv/foamPvCore.H    |  37 +-
 .../PVReaders/foamPv/foamPvCoreTemplates.C    |  23 +
 .../vtkPVFoam => foamPv}/foamVtkAdaptors.H    |   0
 23 files changed, 1391 insertions(+), 902 deletions(-)
 rename applications/utilities/postProcessing/graphics/PVReaders/{PVFoamReader/vtkPVFoam => foamPv}/foamVtkAdaptors.H (100%)

diff --git a/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/PVFoamReader/PVFoamReader_SM.xml b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/PVFoamReader/PVFoamReader_SM.xml
index e88e13b61d..7daa151df4 100644
--- a/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/PVFoamReader/PVFoamReader_SM.xml
+++ b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/PVFoamReader/PVFoamReader_SM.xml
@@ -27,6 +27,8 @@
       </Documentation>
     </DoubleVectorProperty>
 
+<!-- General Controls -->
+
     <!-- Refresh (push button) -->
     <Property
       name="Refresh"
@@ -35,12 +37,10 @@
       <Documentation>Rescan for updated times/fields.</Documentation>
     </Property>
 
-<!-- General Controls -->
-
     <!-- Skip Zero Time (check-box) -->
     <IntVectorProperty animateable="0"
       name="ZeroTime"
-      label="Skip Zero Time"
+      label="Skip 0/ time"
       command="SetSkipZeroTime"
       default_values="1"
       number_of_elements="1"
@@ -54,26 +54,28 @@
     <!-- Include Sets (check-box) -->
     <IntVectorProperty animateable="0"
       name="IncludeSets"
+      label="With Sets"
       command="SetIncludeSets"
       default_values="0"
       number_of_elements="1"
       panel_visibility="default">
       <BooleanDomain name="bool"/>
       <Documentation>
-        Search the polyMesh/sets/ directory
+        Search the polyMesh/sets/ directory for {cell,face,point} sets
       </Documentation>
     </IntVectorProperty>
 
     <!-- Include Zones (check-box) -->
     <IntVectorProperty animateable="0"
       name="IncludeZones"
+      label="With Zones"
       command="SetIncludeZones"
       default_values="0"
       number_of_elements="1"
       panel_visibility="default">
       <BooleanDomain name="bool"/>
       <Documentation>
-        ZoneMesh information is used to find {cell,face,point}Zones.
+        ZoneMesh information is used to find {cell,face,point} zones.
         The polyMesh/ directory is only checked on startup.
       </Documentation>
     </IntVectorProperty>
@@ -88,7 +90,7 @@
       panel_visibility="default">
       <BooleanDomain name="bool"/>
       <Documentation>
-        Show patchGroups only.
+        Display patchGroups only instead of individual patches.
       </Documentation>
     </IntVectorProperty>
 
@@ -109,6 +111,7 @@
     <!-- Interpolate Fields (check-box) -->
     <IntVectorProperty animateable="0"
       name="InterpolateFields"
+      label="cell-to-point"
       command="SetInterpolateVolFields"
       default_values="1"
       number_of_elements="1"
@@ -122,6 +125,7 @@
     <!-- Extrapolate Patches (check-box) -->
     <IntVectorProperty animateable="0"
       name="ExtrapolatePatches"
+      label="field-to-patch"
       command="SetExtrapolatePatches"
       default_values="0"
       number_of_elements="1"
@@ -132,7 +136,7 @@
       </Documentation>
     </IntVectorProperty>
 
-    <!-- Force GUI update (check-box) -->
+    <!-- Force GUI update (push button) -->
     <IntVectorProperty animateable="0"
       name="UpdateGUI"
       command="SetUpdateGUI"
@@ -159,16 +163,22 @@
       </Documentation>
     </IntVectorProperty>
 
-    <!-- Cache Mesh (check-box) -->
+    <!-- Mesh Caching (combo-box) -->
     <IntVectorProperty animateable="0"
-      name="CacheMesh"
-      command="SetCacheMesh"
-      default_values="1"
+      name="MeshCaching"
+      command="SetMeshCaching"
+      default_values="3"
       number_of_elements="1"
       panel_visibility="default">
-      <BooleanDomain name="bool"/>
+      <EnumerationDomain name="enum">
+        <Entry text="No caching" value="0" />
+        <Entry text="Cache fvMesh" value="1" />
+        <Entry text="Cache vtk,fvMesh" value="3" />
+      </EnumerationDomain>
       <Documentation>
-        Cache the fvMesh in memory.
+        Mesh caching styles.
+        Caching the OpenFOAM fvMesh reduces disk access.
+        Caching the VTK mesh reduces transcription overhead.
       </Documentation>
     </IntVectorProperty>
 
@@ -185,7 +195,7 @@
     <Property name="ShowPatchNames"/>
     <Property name="UpdateGUI"/>
     <Property name="UseVTKPolyhedron"/>
-    <Property name="CacheMesh"/>
+    <Property name="MeshCaching"/>
   </PropertyGroup>
 
 <!-- Parts Selections -->
diff --git a/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/PVFoamReader/pqFoamReaderControls.cxx b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/PVFoamReader/pqFoamReaderControls.cxx
index f501599397..3cc3b19577 100644
--- a/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/PVFoamReader/pqFoamReaderControls.cxx
+++ b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/PVFoamReader/pqFoamReaderControls.cxx
@@ -26,6 +26,7 @@ License
 #include "pqFoamReaderControls.h"
 
 #include <QCheckBox>
+#include <QComboBox>
 #include <QFrame>
 #include <QGridLayout>
 #include <QPushButton>
@@ -42,6 +43,17 @@ License
 
 // * * * * * * * * * * * * * Static Member Functions * * * * * * * * * * * * //
 
+// file-scope
+// Add horizontal divider to layout
+static void addHline(QGridLayout* layout, int row, int nCols)
+{
+    QFrame* hline = new QFrame(layout->parentWidget());
+    hline->setFrameStyle(QFrame::HLine | QFrame::Sunken);
+
+    layout->addWidget(hline, row, 0, 1, nCols);
+}
+
+
 // file-scope
 // Widget properties
 static QWidget* setWidgetProperties
@@ -94,6 +106,66 @@ static QAbstractButton* setButtonProperties
 }
 
 
+// file-scope
+// Fill combo-box from XML enumeration
+static QComboBox* setComboBoxContent
+(
+    QComboBox* b,
+    vtkSMIntVectorProperty* prop
+)
+{
+    vtkSMEnumerationDomain* propEnum =
+        vtkSMEnumerationDomain::SafeDownCast
+        (
+            prop->FindDomain("vtkSMEnumerationDomain")
+        );
+
+    if (propEnum)
+    {
+        unsigned int n = propEnum->GetNumberOfEntries();
+        for (unsigned int idx=0; idx < n; ++idx)
+        {
+            const int val   = propEnum->GetEntryValue(idx);
+            const char* txt = propEnum->GetEntryText(idx);
+
+            b->insertItem(val, txt);
+        }
+
+        // Set default
+        const int val = prop->GetElement(0);
+        unsigned int idx = 0;
+        if (!propEnum->IsInDomain(val, idx))
+        {
+            idx = 0;
+        }
+        b->setCurrentIndex(idx);
+    }
+
+    return b;
+}
+
+
+// file-scope
+// Translate a combo-box index to a lookup value
+static int comboBoxValue(vtkSMIntVectorProperty* prop, int idx)
+{
+    vtkSMEnumerationDomain* propEnum =
+        vtkSMEnumerationDomain::SafeDownCast
+        (
+            prop->FindDomain("vtkSMEnumerationDomain")
+        );
+
+    if (propEnum)
+    {
+        return propEnum->GetEntryValue(idx);
+    }
+    else
+    {
+        return idx;
+    }
+}
+
+
 static vtkSMIntVectorProperty* lookupIntProp
 (
     vtkSMPropertyGroup* group,
@@ -154,9 +226,9 @@ void pqFoamReaderControls::refreshPressed()
 }
 
 
-void pqFoamReaderControls::cacheMesh(int val)
+void pqFoamReaderControls::cacheMesh(int idx)
 {
-    fireCommand(cacheMesh_, val);
+    fireCommand(meshCaching_, comboBoxValue(meshCaching_, idx));
 }
 
 
@@ -210,12 +282,14 @@ pqFoamReaderControls::pqFoamReaderControls
     showGroupsOnly_(lookupIntProp(group, "ShowGroupsOnly")),
     includeSets_(lookupIntProp(group, "IncludeSets")),
     includeZones_(lookupIntProp(group, "IncludeZones")),
-    cacheMesh_(lookupIntProp(group, "CacheMesh"))
+    meshCaching_(lookupIntProp(group, "MeshCaching"))
 {
     typedef vtkSMIntVectorProperty intProp;
 
     QGridLayout* form = new QGridLayout(this);
 
+    const int nCols = 3;
+
     // ROW
     // ~~~
     int row = 0;
@@ -243,13 +317,7 @@ pqFoamReaderControls::pqFoamReaderControls
     }
 
     // LINE
-    // ~~~~
-    ++row;
-    {
-        QFrame* hline = new QFrame(this);
-        hline->setFrameStyle(QFrame::HLine | QFrame::Sunken);
-        form->addWidget(hline, row, 0, 1, 4);
-    }
+    addHline(form, ++row, nCols);
 
     // ROW
     // ~~~
@@ -321,13 +389,7 @@ pqFoamReaderControls::pqFoamReaderControls
     }
 
     // LINE
-    // ~~~~
-    ++row;
-    {
-        QFrame* hline = new QFrame(this);
-        hline->setFrameStyle(QFrame::HLine | QFrame::Sunken);
-        form->addWidget(hline, row, 0, 1, 4);
-    }
+    addHline(form, ++row, nCols);
 
     // ROW
     // ~~~
@@ -360,13 +422,7 @@ pqFoamReaderControls::pqFoamReaderControls
     }
 
     // LINE
-    // ~~~~
-    ++row;
-    {
-        QFrame* hline = new QFrame(this);
-        hline->setFrameStyle(QFrame::HLine | QFrame::Sunken);
-        form->addWidget(hline, row, 0, 1, 4);
-    }
+    addHline(form, ++row, nCols);
 
     // ROW
     // ~~~
@@ -398,14 +454,22 @@ pqFoamReaderControls::pqFoamReaderControls
         );
     }
 
-    if (cacheMesh_)
+    if (meshCaching_)
     {
-        QCheckBox* b = new QCheckBox(this);
-        setButtonProperties(b, cacheMesh_);
+        QComboBox* b = new QComboBox(this);
         form->addWidget(b, row, 2, Qt::AlignLeft);
+
+        setWidgetProperties(b, meshCaching_);
+        setComboBoxContent(b, meshCaching_);
+
+        addPropertyLink
+        (
+            b, "indexChanged", SIGNAL(currentIndexChanged(int)), meshCaching_
+        );
+
         connect
         (
-            b, SIGNAL(toggled(bool)), this, SLOT(cacheMesh(bool))
+            b, SIGNAL(currentIndexChanged(int)), this, SLOT(cacheMesh(int))
         );
     }
 }
diff --git a/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/PVFoamReader/pqFoamReaderControls.h b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/PVFoamReader/pqFoamReaderControls.h
index d8656d894b..ba0a7a9f67 100644
--- a/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/PVFoamReader/pqFoamReaderControls.h
+++ b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/PVFoamReader/pqFoamReaderControls.h
@@ -69,8 +69,8 @@ class pqFoamReaderControls
         //- IncludeZones (bool property)
         vtkSMIntVectorProperty* includeZones_;
 
-        //- CacheMesh (bool property)
-        vtkSMIntVectorProperty* cacheMesh_;
+        //- MeshCaching (enum property)
+        vtkSMIntVectorProperty* meshCaching_;
 
 
     // Private Member Functions
@@ -102,7 +102,7 @@ protected slots:
     // Protected Member Functions
 
     void refreshPressed();
-    void cacheMesh(bool checked);
+    void cacheMesh(int idx);
     void showPatchNames(bool checked);
     void showGroupsOnly(bool checked);
     void includeSets(bool checked);
diff --git a/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/PVFoamReader/vtkPVFoamReader.cxx b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/PVFoamReader/vtkPVFoamReader.cxx
index 7da8452e31..c6ec1e676c 100644
--- a/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/PVFoamReader/vtkPVFoamReader.cxx
+++ b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/PVFoamReader/vtkPVFoamReader.cxx
@@ -69,8 +69,7 @@ vtkPVFoamReader::vtkPVFoamReader()
     // Add second output for the Lagrangian
     this->SetNumberOfOutputPorts(2);
 
-    vtkSmartPointer<vtkMultiBlockDataSet> lagrangian =
-        vtkSmartPointer<vtkMultiBlockDataSet>::New();
+    auto lagrangian = vtkSmartPointer<vtkMultiBlockDataSet>::New();
 
     lagrangian->ReleaseData();
 
@@ -80,7 +79,7 @@ vtkPVFoamReader::vtkPVFoamReader()
     TimeStepRange[0] = 0;
     TimeStepRange[1] = 0;
 
-    CacheMesh = true;
+    MeshCaching = 3;  // fvMesh+vtk
 
     SkipZeroTime = true;
     ExtrapolatePatches = false;
diff --git a/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/PVFoamReader/vtkPVFoamReader.h b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/PVFoamReader/vtkPVFoamReader.h
index be9d1db3f7..550c1167bb 100644
--- a/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/PVFoamReader/vtkPVFoamReader.h
+++ b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/PVFoamReader/vtkPVFoamReader.h
@@ -83,9 +83,9 @@ public:
     virtual void PrintInfo();
 
     // Description:
-    // OpenFOAM mesh caching control
-    vtkSetMacro(CacheMesh, bool);
-    vtkGetMacro(CacheMesh, bool);
+    // Mesh caching control (0:none,1:fvMesh,3:fvMesh+vtk)
+    vtkSetMacro(MeshCaching, int);
+    vtkGetMacro(MeshCaching, int);
 
     // Description:
     // OpenFOAM refresh times/fields
@@ -232,7 +232,7 @@ private:
     void updatePatchNamesView(const bool show);
 
     int TimeStepRange[2];
-    bool CacheMesh;
+    int MeshCaching;
     bool SkipZeroTime;
 
     bool ExtrapolatePatches;
diff --git a/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoam.C b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoam.C
index c2b9793dc1..67857bc0bf 100644
--- a/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoam.C
+++ b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoam.C
@@ -136,12 +136,12 @@ bool Foam::vtkPVFoam::addOutputBlock
         if (selectedPartIds_.found(partId))
         {
             const auto& longName = selectedPartIds_[partId];
-            const word shortName = getPartName(partId);
+            const word shortName = getFoamName(longName);
 
             auto iter = cache.find(longName);
-            if (iter.found() && (*iter).vtkmesh)
+            if (iter.found() && iter.object().dataset)
             {
-                auto dataset = (*iter).vtkmesh;
+                auto dataset = iter.object().dataset;
 
                 if (singleDataset)
                 {
@@ -224,7 +224,6 @@ int Foam::vtkPVFoam::setTime(int nRequest, const double requestTimes[])
         runTime.setTime(Times[nearestIndex], nearestIndex);
 
         // When the changes, so do the fields
-        fieldsChanged_ = true;
         meshState_ = meshPtr_ ? meshPtr_->readUpdate() : polyMesh::TOPO_CHANGE;
 
         reader_->UpdateProgress(0.05);
@@ -238,27 +237,13 @@ int Foam::vtkPVFoam::setTime(int nRequest, const double requestTimes[])
         Info<< "<end> setTime() - selectedTime="
             << Times[nearestIndex].name() << " index=" << timeIndex_
             << "/" << Times.size()
-            << " meshUpdateState=" << updateStateName(meshState_)
-            << " fieldsChanged=" << Switch(fieldsChanged_) << endl;
+            << " meshUpdateState=" << updateStateName(meshState_) << endl;
     }
 
     return nearestIndex;
 }
 
 
-Foam::word Foam::vtkPVFoam::getPartName(const int partId) const
-{
-    if (selectedPartIds_.found(partId))
-    {
-        return getFoamName(selectedPartIds_[partId]);
-    }
-    else
-    {
-        return word::null;
-    }
-}
-
-
 Foam::word Foam::vtkPVFoam::getReaderPartName(const int partId) const
 {
     return getFoamName(reader_->GetPartArrayName(partId));
@@ -279,8 +264,8 @@ Foam::vtkPVFoam::vtkPVFoam
     meshRegion_(polyMesh::defaultRegion),
     meshDir_(polyMesh::meshSubDir),
     timeIndex_(-1),
+    decomposePoly_(false),
     meshState_(polyMesh::TOPO_CHANGE),
-    fieldsChanged_(true),
     rangeVolume_("unzoned"),
     rangePatches_("patch"),
     rangeLagrangian_("lagrangian"),
@@ -414,16 +399,16 @@ void Foam::vtkPVFoam::updateInfo()
     // time of the vtkDataArraySelection, but the qt/paraview proxy
     // layer doesn't care about that anyhow.
 
-    HashSet<string> enabledEntries;
+    HashSet<string> enabled;
     if (!partSelection->GetNumberOfArrays() && !meshPtr_)
     {
-        // enable 'internalMesh' on the first call
-        enabledEntries = { "internalMesh" };
+        // Fake enable 'internalMesh' on the first call
+        enabled = { "internalMesh" };
     }
     else
     {
         // preserve the enabled selections
-        enabledEntries = getSelectedArrayEntries(partSelection);
+        enabled = getSelectedArraySet(partSelection);
     }
 
     // Clear current mesh parts list
@@ -431,18 +416,13 @@ void Foam::vtkPVFoam::updateInfo()
 
     // Update mesh parts list - add Lagrangian at the bottom
     updateInfoInternalMesh(partSelection);
-    updateInfoPatches(partSelection, enabledEntries);
+    updateInfoPatches(partSelection, enabled);
     updateInfoSets(partSelection);
     updateInfoZones(partSelection);
     updateInfoLagrangian(partSelection);
 
     // Adjust/restore the enabled selections
-    setSelectedArrayEntries(partSelection, enabledEntries);
-
-    if (meshState_ != polyMesh::UNCHANGED)
-    {
-        fieldsChanged_ = true;
-    }
+    setSelectedArrayEntries(partSelection, enabled);
 
     // Update volume, point and lagrangian fields
     updateInfoFields<fvPatchField, volMesh>
@@ -480,42 +460,28 @@ void Foam::vtkPVFoam::Update
     }
     reader_->UpdateProgress(0.1);
 
+    const int caching = reader_->GetMeshCaching();
+    const bool oldDecomp = decomposePoly_;
+    decomposePoly_ = !reader_->GetUseVTKPolyhedron();
+
     // Set up mesh parts selection(s)
+    // Update cached, saved, unneed values.
     {
         vtkDataArraySelection* selection = reader_->GetPartSelection();
         const int n = selection->GetNumberOfArrays();
 
-        // All previously selected (enabled) names
-        HashSet<string> original;
-        forAllConstIters(selectedPartIds_, iter)
-        {
-            original.insert(iter.object());
-        }
-
         selectedPartIds_.clear();
+        HashSet<string> nowActive;
 
         for (int id=0; id < n; ++id)
         {
-            string str(selection->GetArrayName(id));
-            bool status = selection->GetArraySetting(id);
+            const string str(selection->GetArrayName(id));
+            const bool status = selection->GetArraySetting(id);
 
             if (status)
             {
                 selectedPartIds_.set(id, str); // id -> name
-
-                if (!original.erase(str))
-                {
-                    // New part, or newly enabled
-                    //? meshChanged_ = true;
-                }
-            }
-            else
-            {
-                if (original.erase(str))
-                {
-                    // Part disappeared, or newly disabled
-                    //? meshChanged_ = true;
-                }
+                nowActive.set(str);
             }
 
             if (debug > 1)
@@ -524,6 +490,39 @@ void Foam::vtkPVFoam::Update
                     << " : " << str << nl;
             }
         }
+
+        // Dispose of unneeded components
+        cachedVtp_.retain(nowActive);
+        cachedVtu_.retain(nowActive);
+
+        if
+        (
+            !caching
+         || meshState_ == polyMesh::TOPO_CHANGE
+         || meshState_ == polyMesh::TOPO_PATCH_CHANGE
+        )
+        {
+            // Eliminate cached values that would be unreliable
+            forAllIters(cachedVtp_, iter)
+            {
+                iter.object().clearGeom();
+                iter.object().clear();
+            }
+            forAllIters(cachedVtu_, iter)
+            {
+                iter.object().clearGeom();
+                iter.object().clear();
+            }
+        }
+        else if (oldDecomp != decomposePoly_)
+        {
+            // poly-decompose changed - dispose of cached values
+            forAllIters(cachedVtu_, iter)
+            {
+                iter.object().clearGeom();
+                iter.object().clear();
+            }
+        }
     }
 
     reader_->UpdateProgress(0.15);
@@ -536,7 +535,7 @@ void Foam::vtkPVFoam::Update
             printMemory();
         }
 
-        if (!reader_->GetCacheMesh())
+        if (!caching)
         {
             delete meshPtr_;
             meshPtr_ = nullptr;
@@ -549,7 +548,6 @@ void Foam::vtkPVFoam::Update
             {
                 Info<< "Creating OpenFOAM mesh for region " << meshRegion_
                     << " at time=" << dbPtr_().timeName() << endl;
-
             }
 
             meshPtr_ = new fvMesh
@@ -582,17 +580,6 @@ void Foam::vtkPVFoam::Update
 
     reader_->UpdateProgress(0.4);
 
-    // Update cached, saved, unneed values:
-    HashSet<string> nowActive;
-    forAllConstIters(selectedPartIds_, iter)
-    {
-        nowActive.insert(iter.object());
-    }
-
-    // Dispose of unneeded components
-    cachedVtp_.retain(nowActive);
-    cachedVtu_.retain(nowActive);
-
     convertMeshVolume();
     convertMeshPatches();
     reader_->UpdateProgress(0.6);
@@ -645,18 +632,28 @@ void Foam::vtkPVFoam::Update
     }
     reader_->UpdateProgress(0.95);
 
-    fieldsChanged_ = false;
     meshState_ = polyMesh::UNCHANGED;
 
-    // Standard memory cleanup
-    cachedVtp_.clear();
-    cachedVtu_.clear();
+    if (caching & 2)
+    {
+        // Suppress caching of Lagrangian since it normally always changes.
+        cachedVtp_.filterKeys
+        (
+            [](const word& k){ return k.startsWith("lagrangian/"); },
+            true // prune
+        );
+    }
+    else
+    {
+        cachedVtp_.clear();
+        cachedVtu_.clear();
+    }
 }
 
 
 void Foam::vtkPVFoam::UpdateFinalize()
 {
-    if (!reader_->GetCacheMesh())
+    if (!reader_->GetMeshCaching())
     {
         delete meshPtr_;
         meshPtr_ = nullptr;
diff --git a/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoam.H b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoam.H
index 680fcb139d..55ec9d73e1 100644
--- a/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoam.H
+++ b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoam.H
@@ -25,7 +25,25 @@ Class
     Foam::vtkPVFoam
 
 Description
-    Provides a reader interface for OpenFOAM to VTK interaction.
+    The backend for the vtkPVFoamReader reader module -
+    providing a paraview reader interface for OpenFOAM meshes and fields.
+
+    Similar, and sometimes better, functionality may be provided by the
+    native VTK OpenFOAM reader. OpenCFD has recently (2017) been working
+    on improving the native VTK OpenFOAM reader for the benefit of everyone.
+
+    In some areas the reader module lacks compared to the native reader
+    (notably the ability to work on decomosed datasets), but provides
+    additional handling of sets,zones,groups. Some features have also since
+    been adapted to the native reader. Additionally, the reader module
+    provides a useful platform for testing new ideas.
+
+Note
+    The reader module allows two levels of caching. The OpenFOAM fvMesh
+    can be cached in memory, for faster loading of fields. Additionally,
+    the translated VTK geometries are held in a local cache. The cached
+    VTK geometries should incur no additional overhead since they use
+    the VTK reference counting for their storage management.
 
 SourceFiles
     vtkPVFoam.C
@@ -56,22 +74,22 @@ SourceFiles
 #include "foamPvCore.H"
 #include "foamVtkMeshMaps.H"
 
-#include "vtkSmartPointer.h"
+#include "vtkPoints.h"
 #include "vtkPolyData.h"
+#include "vtkSmartPointer.h"
 #include "vtkUnstructuredGrid.h"
 
 // * * * * * * * * * * * * * Forward Declarations  * * * * * * * * * * * * * //
 
+class vtkCellArray;
 class vtkDataArraySelection;
 class vtkDataSet;
 class vtkFloatArray;
-class vtkPoints;
+class vtkIndent;
+class vtkMultiBlockDataSet;
 class vtkPVFoamReader;
 class vtkRenderer;
 class vtkTextActor;
-class vtkMultiBlockDataSet;
-class vtkIndent;
-
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -104,20 +122,99 @@ class vtkPVFoam
 
     // Private classes
 
-        //- Bookkeeping for vtkPolyData
-        class foamVtpData
+        //- Bookkeeping for internal caching.
+        //  Retain an original copy of the geometry as well as a shallow copy
+        //  with the output fields.
+        //  The original copy is reused for different timestep
+        template<class DataType>
+        class foamVtkCaching
         {
         public:
-            vtkSmartPointer<vtkPolyData> vtkmesh;
+            typedef DataType dataType;
+
+            //- The geometry, without any cell/point data
+            vtkSmartPointer<dataType> vtkgeom;
+
+            //- The shallow-copy of geometry, plus additional data
+            vtkSmartPointer<dataType> dataset;
+
+            //- Number of points associated with geometry
+            inline uint64_t nPoints() const
+            {
+                return vtkgeom ? vtkgeom->GetNumberOfPoints() : 0;
+            }
+
+            //- Clear geometry and dataset
+            void clearGeom()
+            {
+                vtkgeom = nullptr;
+                dataset = nullptr;
+            }
+
+            //- Return a shallow copy of vtkgeom for manipulation
+            vtkSmartPointer<dataType> getCopy() const
+            {
+                auto copy = vtkSmartPointer<dataType>::New();
+                copy->ShallowCopy(vtkgeom);
+                return copy;
+            }
+
+            //- Make a shallow copy of vtkgeom into dataset
+            void reuse()
+            {
+                dataset = vtkSmartPointer<dataType>::New();
+                dataset->ShallowCopy(vtkgeom);
+            }
+
+            //- Set the geometry and make a shallow copy to dataset
+            void set(vtkSmartPointer<dataType> geom)
+            {
+                vtkgeom = geom;
+                reuse();
+            }
+
+            //- Report basic information to output
+            void PrintSelf(std::ostream& os) const
+            {
+                os << "geom" << nl;
+                if (vtkgeom)
+                {
+                    vtkgeom->PrintSelf(std::cout, vtkIndent(2));
+                }
+                else
+                {
+                    os << "nullptr";
+                }
+                os << nl;
+
+                os << "copy" << nl;
+                if (dataset)
+                {
+                    dataset->PrintSelf(std::cout, vtkIndent(2));
+                }
+                else
+                {
+                    os << "nullptr";
+                }
+                os << nl;
+            }
         };
 
 
+        //- Bookkeeping for vtkPolyData
+        class foamVtpData
+        :
+            public foamVtkCaching<vtkPolyData>,
+            public foamVtkMeshMaps
+        {};
+
+
         //- Bookkeeping for vtkUnstructuredGrid
-        class foamVtuData : public foamVtkMeshMaps
-        {
-        public:
-            vtkSmartPointer<vtkUnstructuredGrid> vtkmesh;
-        };
+        class foamVtuData
+        :
+            public foamVtkCaching<vtkUnstructuredGrid>,
+            public foamVtkMeshMaps
+        {};
 
 
     // Private Data
@@ -140,12 +237,12 @@ class vtkPVFoam
         //- The time index
         int timeIndex_;
 
+        //- Previous/current decomposition request
+        bool decomposePoly_;
+
         //- Track changes in mesh geometry
         enum polyMesh::readUpdateState meshState_;
 
-        //- Track changes in fields
-        bool fieldsChanged_;
-
         //- The index of selected parts mapped to their names
         Map<string> selectedPartIds_;
 
@@ -232,75 +329,143 @@ class vtkPVFoam
 
       // Mesh conversion functions
 
-        //- Convert volume mesh
+        //- Convert InternalMesh
         void convertMeshVolume();
 
         //- Convert Lagrangian points
         void convertMeshLagrangian();
 
-        //- Convert mesh patches
+        //- Convert mesh patches.
+        //  The additionalIds (cached data) contain the patch Ids.
+        //  There will be several for groups, but only one for regular patches.
         void convertMeshPatches();
 
-        //- Convert subsetted mesh
-        void convertMeshSubset
-        (
-            const fvMeshSubset& subsetter,
-            const string& longName
-        );
-
         //- Convert cell zones
         void convertMeshCellZones();
 
-        //- Convert face zones
-        void convertMeshFaceZones();
-
-        //- Convert point zones
-        void convertMeshPointZones();
-
         //- Convert cell sets
         void convertMeshCellSets();
 
+        //- Convert face zones
+        void convertMeshFaceZones();
+
         //- Convert face sets
+        //  The cellMap (cached data) contains the face-labels.
         void convertMeshFaceSets();
 
+        //- Convert point zones
+        //  The pointMap (cached data) contains the point-labels.
+        void convertMeshPointZones();
+
         //- Convert point sets
+        //  The pointMap (cached data) contains the point-labels.
         void convertMeshPointSets();
 
 
       // Add mesh functions
 
-        //- Volume meshes as vtkUnstructuredGrid
+        //- Generate vtk points for the current mesh points/decomposition
+        static vtkSmartPointer<vtkPoints> movePoints
+        (
+            const fvMesh& mesh,
+            const foamVtuData& vtuData
+        );
+
+        //- Generate vtk points for the current mesh points/decomposition,
+        //  using the provided pointMap
+        static vtkSmartPointer<vtkPoints> movePoints
+        (
+            const fvMesh& mesh,
+            const foamVtuData& vtuData,
+            const labelUList& pointMap
+        );
+
+        //- Volume mesh as vtkUnstructuredGrid
+        static vtkSmartPointer<vtkUnstructuredGrid> volumeVTKMesh
+        (
+            const fvMesh& mesh,
+            foamVtuData& vtuData,
+            const bool decompPoly
+        );
+
+        //- Subsetted mesh as vtkUnstructuredGrid
+        static vtkSmartPointer<vtkUnstructuredGrid> volumeVTKSubsetMesh
+        (
+            const fvMeshSubset& subsetter,
+            foamVtuData& vtuData,
+            const bool decompPoly
+        );
+
+        //- Volume mesh as vtkUnstructuredGrid
         vtkSmartPointer<vtkUnstructuredGrid> volumeVTKMesh
         (
             const fvMesh& mesh,
             foamVtuData& vtuData
-        );
+        ) const;
+
+        //- Subsetted mesh as vtkUnstructuredGrid
+        vtkSmartPointer<vtkUnstructuredGrid> volumeVTKSubsetMesh
+        (
+            const fvMeshSubset& subsetter,
+            foamVtuData& vtuData
+        ) const;
 
         //- Lagrangian positions as vtkPolyData
         vtkSmartPointer<vtkPolyData> lagrangianVTKMesh
         (
             const polyMesh& mesh,
             const word& cloudName
+        ) const;
+
+        //- Patch points
+        template<class PatchType>
+        static vtkSmartPointer<vtkPoints> movePatchPoints
+        (
+            const PatchType& p
+        );
+
+        //- Patch faces as vtk-cells
+        template<class PatchType>
+        static vtkSmartPointer<vtkCellArray> patchFacesVTKCells
+        (
+            const PatchType& p
         );
 
         //- Patches (mesh or primitive) as vtkPolyData
         template<class PatchType>
-        vtkSmartPointer<vtkPolyData> patchVTKMesh
+        static vtkSmartPointer<vtkPolyData> patchVTKMesh
         (
-            const string& name,
             const PatchType& p
         );
 
 
       // Field conversion functions
 
-        //- Convert Field to VTK field
+        //- Copy list to pre-allocated vtk array.
+        //  \return number of input items copied
+        template<class Type>
+        static label transcribeFloatData
+        (
+            vtkFloatArray* array,
+            const UList<Type>& input,
+            const label start = 0
+        );
+
+        //- Create named field initialized to zero
+        template<class Type>
+        static vtkSmartPointer<vtkFloatArray> zeroVTKField
+        (
+            const word& name,
+            const label size
+        );
+
+        //- Convert float data to VTK field
         template<class Type>
         vtkSmartPointer<vtkFloatArray> convertFieldToVTK
         (
             const word& name,
-            const Field<Type>& fld
-        );
+            const UList<Type>& fld
+        ) const;
 
         //- Face set/zone field
         template<class Type>
@@ -308,7 +473,7 @@ class vtkPVFoam
         (
             const GeometricField<Type, fvPatchField, volMesh>& fld,
             const labelUList& faceLabels
-        );
+        ) const;
 
         //- Volume field
         template<class Type>
@@ -316,7 +481,7 @@ class vtkPVFoam
         (
             const GeometricField<Type, fvPatchField, volMesh>& fld,
             const foamVtuData& vtuData
-        );
+        ) const;
 
 
         //- Convert volume fields
@@ -392,9 +557,8 @@ class vtkPVFoam
 
         //- Point field
         template<class Type>
-        void convertPointField
+        vtkSmartPointer<vtkFloatArray> convertPointField
         (
-            vtkUnstructuredGrid* vtkmesh,
             const GeometricField<Type, pointPatchField, pointMesh>& pfld,
             const GeometricField<Type, fvPatchField, volMesh>& vfld,
             const foamVtuData& vtuData
@@ -403,17 +567,6 @@ class vtkPVFoam
 
       // GUI selection helper functions
 
-        //- Only retain specified fields
-        static void pruneObjectList
-        (
-            IOobjectList& objects,
-            const hashedWordList& retain
-        );
-
-
-        //- Get the first word from selectedPartIds_
-        word getPartName(const int partId) const;
-
         //- Get the first word from the reader 'parts' selection
         word getReaderPartName(const int partId) const;
 
diff --git a/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamFieldTemplates.C b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamFieldTemplates.C
index 3df2eb9925..fdab4abe23 100644
--- a/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamFieldTemplates.C
+++ b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamFieldTemplates.C
@@ -30,6 +30,7 @@ InClass
 #define vtkPVFoamFieldTemplates_C
 
 // OpenFOAM includes
+#include "error.H"
 #include "emptyFvPatchField.H"
 #include "wallPolyPatch.H"
 #include "faceSet.H"
@@ -81,92 +82,103 @@ void Foam::vtkPVFoam::convertVolField
     convertVolFieldBlock(fld, ptfPtr, rangeCellZones_); // cellZones
     convertVolFieldBlock(fld, ptfPtr, rangeCellSets_);  // cellSets
 
-
-    // Patches - skip field conversion for groups
+    // Patches - currently skip field conversion for groups
     for (auto partId : rangePatches_)
     {
-        if
+        if (!selectedPartIds_.found(partId))
+        {
+            continue;
+        }
+        const auto& longName = selectedPartIds_[partId];
+
+        auto iter = cachedVtp_.find(longName);
+        if (!iter.found() || !iter.object().dataset)
+        {
+            // Should not happen, but for safety require a vtk geometry
+            continue;
+        }
+        foamVtpData& vtpData = iter.object();
+        auto dataset = vtpData.dataset;
+
+        const labelList& patchIds = vtpData.additionalIds();
+        if (patchIds.empty())
+        {
+            continue;
+        }
+
+        // This is slightly roundabout, but we deal with groups and with
+        // single patches.
+        // For groups (spanning several patches) it is fairly messy to
+        // get interpolated point fields. We would need to create a indirect
+        // patch each time to obtain the mesh points. We thus skip that.
+        //
+        // To improve code reuse, we allocate the CellData as a zeroed-field
+        // ahead of time.
+
+        vtkSmartPointer<vtkFloatArray> cdata = zeroVTKField<Type>
         (
-            !selectedPartIds_.found(partId)
-         || selectedPartIds_[partId].startsWith("group/")
-        )
+            fld.name(),
+            dataset->GetNumberOfPolys()
+        );
+
+        vtkSmartPointer<vtkFloatArray> pdata;
+        const bool allowPdata = (interpField && patchIds.size() == 1);
+
+        label coffset = 0; // the write offset into cell-data
+        for (label patchId : patchIds)
         {
-            continue;
-        }
+            const fvPatchField<Type>& ptf = fld.boundaryField()[patchId];
 
-        const word patchName = getPartName(partId);
-        const label patchId = patches.findPatchID(patchName);
-
-        if (patchId < 0)
-        {
-            continue;
-        }
-
-        auto iter = cachedVtp_.find(selectedPartIds_[partId]);
-        if (!iter.found() || !(*iter).vtkmesh)
-        {
-            continue;
-        }
-        auto vtkmesh = (*iter).vtkmesh;
-
-        const fvPatchField<Type>& ptf = fld.boundaryField()[patchId];
-
-        if
-        (
-            isType<emptyFvPatchField<Type>>(ptf)
-         ||
+            if
             (
-                extrapPatch
-             && !polyPatch::constraintType(patches[patchId].type())
+                isType<emptyFvPatchField<Type>>(ptf)
+             ||
+                (
+                    extrapPatch
+                 && !polyPatch::constraintType(patches[patchId].type())
+                )
             )
-        )
-        {
-            fvPatch p(ptf.patch().patch(), mesh.boundary());
-
-            tmp<Field<Type>> tpptf
-            (
-                fvPatchField<Type>(p, fld).patchInternalField()
-            );
-
-            vtkSmartPointer<vtkFloatArray> cdata =
-                convertFieldToVTK
-                (
-                    fld.name(),
-                    tpptf()
-                );
-            vtkmesh->GetCellData()->AddArray(cdata);
-
-            if (patchId < patchInterpList.size())
             {
-                vtkSmartPointer<vtkFloatArray> pdata = convertFieldToVTK
+                fvPatch p(ptf.patch().patch(), mesh.boundary());
+
+                tmp<Field<Type>> tpptf
                 (
-                    fld.name(),
-                    patchInterpList[patchId].faceToPointInterpolate(tpptf)()
+                    fvPatchField<Type>(p, fld).patchInternalField()
                 );
 
-                vtkmesh->GetPointData()->AddArray(pdata);
+                coffset += transcribeFloatData(cdata, tpptf(), coffset);
+
+                if (allowPdata && patchId < patchInterpList.size())
+                {
+                    pdata = convertFieldToVTK
+                    (
+                        fld.name(),
+                        patchInterpList[patchId].faceToPointInterpolate(tpptf)()
+                    );
+                }
+            }
+            else
+            {
+                coffset += transcribeFloatData(cdata, ptf, coffset);
+
+                if (allowPdata && patchId < patchInterpList.size())
+                {
+                    pdata = convertFieldToVTK
+                    (
+                        fld.name(),
+                        patchInterpList[patchId].faceToPointInterpolate(ptf)()
+                    );
+                }
             }
         }
-        else
+
+        if (cdata)
         {
-            vtkSmartPointer<vtkFloatArray> cdata =
-                convertFieldToVTK
-                (
-                    fld.name(),
-                    ptf
-                );
-            vtkmesh->GetCellData()->AddArray(cdata);
-
-            if (patchId < patchInterpList.size())
-            {
-                vtkSmartPointer<vtkFloatArray> pdata = convertFieldToVTK
-                (
-                    fld.name(),
-                    patchInterpList[patchId].faceToPointInterpolate(ptf)()
-                );
-
-                vtkmesh->GetPointData()->AddArray(pdata);
-            }
+            dataset->GetCellData()->AddArray(cdata);
+        }
+        if (pdata)
+        {
+            dataset->GetPointData()->AddArray(pdata);
         }
     }
 
@@ -178,15 +190,18 @@ void Foam::vtkPVFoam::convertVolField
         {
             continue;
         }
+        const auto& longName = selectedPartIds_[partId];
+        const word zoneName = getFoamName(longName);
 
-        auto iter = cachedVtu_.find(selectedPartIds_[partId]);
-        if (!iter.found() || !(*iter).vtkmesh)
+        auto iter = cachedVtp_.find(longName);
+        if (!iter.found() || !iter.object().dataset)
         {
+            // Should not happen, but for safety require a vtk geometry
             continue;
         }
-        auto vtkmesh = (*iter).vtkmesh;
+        foamVtpData& vtpData = iter.object();
+        auto dataset = vtpData.dataset;
 
-        const word zoneName = getPartName(partId);
         const faceZoneMesh& zMesh = mesh.faceZones();
         const label zoneId = zMesh.findZoneID(zoneName);
 
@@ -195,15 +210,16 @@ void Foam::vtkPVFoam::convertVolField
             continue;
         }
 
-        vtkSmartPointer<vtkFloatArray> cdata = convertFaceFieldToVTK
-        (
-            fld,
-            zMesh[zoneId]
-        );
+        vtkSmartPointer<vtkFloatArray> cdata =
+            convertFaceFieldToVTK
+            (
+                fld,
+                zMesh[zoneId]
+            );
 
-        vtkmesh->GetCellData()->AddArray(cdata);
+        dataset->GetCellData()->AddArray(cdata);
 
-        // TODO: points
+        // TODO: point data
     }
 
 
@@ -214,26 +230,27 @@ void Foam::vtkPVFoam::convertVolField
         {
             continue;
         }
+        const auto& longName = selectedPartIds_[partId];
+        const word selectName = getFoamName(longName);
 
-        auto iter = cachedVtu_.find(selectedPartIds_[partId]);
-        if (!iter.found() || !(*iter).vtkmesh)
+        auto iter = cachedVtp_.find(longName);
+        if (!iter.found() || !iter.object().dataset)
         {
+            // Should not happen, but for safety require a vtk geometry
             continue;
         }
-        auto vtkmesh = (*iter).vtkmesh;
-
-        const word selectName = getPartName(partId);
-        const faceSet fSet(mesh, selectName);
+        foamVtpData& vtpData = iter.object();
+        auto dataset = vtpData.dataset;
 
         vtkSmartPointer<vtkFloatArray> cdata = convertFaceFieldToVTK
         (
             fld,
-            fSet.sortedToc()
+            vtpData.cellMap()
         );
 
-        vtkmesh->GetCellData()->AddArray(cdata);
+        dataset->GetCellData()->AddArray(cdata);
 
-        // TODO: points
+        // TODO: point data
     }
 }
 
@@ -246,27 +263,21 @@ void Foam::vtkPVFoam::convertVolFields
     const IOobjectList& objects
 )
 {
+    typedef GeometricField<Type, fvPatchField, volMesh> FieldType;
+
     forAllConstIters(objects, iter)
     {
         // Restrict to GeometricField<Type, ...>
-        if
-        (
-            iter()->headerClassName()
-         != GeometricField<Type, fvPatchField, volMesh>::typeName
-        )
+        const auto& ioobj = *(iter.object());
+
+        if (ioobj.headerClassName() == FieldType::typeName)
         {
-            continue;
+            // Load field
+            FieldType fld(ioobj, mesh);
+
+            // Convert
+            convertVolField(patchInterpList, fld);
         }
-
-        // Load field
-        GeometricField<Type, fvPatchField, volMesh> fld
-        (
-            *iter(),
-            mesh
-        );
-
-        // Convert
-        convertVolField(patchInterpList, fld);
     }
 }
 
@@ -279,22 +290,21 @@ void Foam::vtkPVFoam::convertDimFields
     const IOobjectList& objects
 )
 {
+    typedef DimensionedField<Type, volMesh> FieldType;
     typedef GeometricField<Type, fvPatchField, volMesh> VolFieldType;
 
     forAllConstIters(objects, iter)
     {
         // Restrict to DimensionedField<Type, ...>
-        if
-        (
-            iter()->headerClassName()
-         != DimensionedField<Type, volMesh>::typeName
-        )
+        const auto& ioobj = *(iter.object());
+
+        if (ioobj.headerClassName() != FieldType::typeName)
         {
             continue;
         }
 
         // Load field
-        DimensionedField<Type, volMesh> dimFld(*iter(), mesh);
+        FieldType dimFld(ioobj, mesh);
 
         // Construct volField with zero-gradient patch fields
 
@@ -345,25 +355,33 @@ void Foam::vtkPVFoam::convertVolFieldBlock
         {
             continue;
         }
+        const auto& longName = selectedPartIds_[partId];
 
-        auto iter = cachedVtu_.find(selectedPartIds_[partId]);
-        if (!iter.found() || !(*iter).vtkmesh)
+        auto iter = cachedVtu_.find(longName);
+        if (!iter.found() || !iter.object().dataset)
         {
+            // Should not happen, but for safety require a vtk geometry
             continue;
         }
-        auto vtuData = (*iter);
-        auto vtkmesh = (*iter).vtkmesh;
+        foamVtuData& vtuData = iter.object();
+        auto dataset = vtuData.dataset;
 
         vtkSmartPointer<vtkFloatArray> cdata = convertVolFieldToVTK
         (
             fld,
             vtuData
         );
-        vtkmesh->GetCellData()->AddArray(cdata);
+        dataset->GetCellData()->AddArray(cdata);
 
         if (ptfPtr.valid())
         {
-            convertPointField(vtkmesh, ptfPtr(), fld, vtuData);
+            vtkSmartPointer<vtkFloatArray> pdata = convertPointField
+            (
+                ptfPtr(),
+                fld,
+                vtuData
+            );
+            dataset->GetPointData()->AddArray(pdata);
         }
     }
 }
@@ -382,17 +400,16 @@ void Foam::vtkPVFoam::convertPointFields
 )
 {
     const polyMesh& mesh = pMesh.mesh();
-    const polyBoundaryMesh& patches = mesh.boundaryMesh();
+
+    typedef GeometricField<Type, pointPatchField, pointMesh> FieldType;
 
     forAllConstIters(objects, iter)
     {
-        const word& fieldName = iter()->name();
         // Restrict to this GeometricField<Type, ...>
-        if
-        (
-            iter()->headerClassName()
-         != GeometricField<Type, pointPatchField, pointMesh>::typeName
-        )
+        const auto& ioobj = *(iter.object());
+
+        const word& fieldName = ioobj.name();
+        if (ioobj.headerClassName() != FieldType::typeName)
         {
             continue;
         }
@@ -402,15 +419,13 @@ void Foam::vtkPVFoam::convertPointFields
             Info<< "convertPointFields : " << fieldName << endl;
         }
 
-        GeometricField<Type, pointPatchField, pointMesh> pfld(*iter(), pMesh);
-
+        FieldType pfld(ioobj, pMesh);
 
         convertPointFieldBlock(pfld, rangeVolume_);     // internalMesh
         convertPointFieldBlock(pfld, rangeCellZones_);  // cellZones
         convertPointFieldBlock(pfld, rangeCellSets_);   // cellSets
 
-
-        // Patches)
+        // Patches - currently skip field conversion for groups
         for (auto partId : rangePatches_)
         {
             if (!selectedPartIds_.found(partId))
@@ -419,26 +434,22 @@ void Foam::vtkPVFoam::convertPointFields
             }
             const auto& longName = selectedPartIds_[partId];
 
-            if (longName.startsWith("group/"))
+            auto iter = cachedVtp_.find(longName);
+            if (!iter.found() || !iter.object().dataset)
             {
-                // Skip patch-groups
+                // Should not happen, but for safety require a vtk geometry
                 continue;
             }
+            foamVtpData& vtpData = iter.object();
+            auto dataset = vtpData.dataset;
 
-            const word patchName = getPartName(partId);
-            const label patchId = patches.findPatchID(patchName);
-
-            if (patchId < 0)
+            const labelList& patchIds = vtpData.additionalIds();
+            if (patchIds.size() != 1)
             {
                 continue;
             }
 
-            auto iter = cachedVtp_.find(selectedPartIds_[partId]);
-            if (!iter.found() || !(*iter).vtkmesh)
-            {
-                continue;
-            }
-            auto vtkmesh = (*iter).vtkmesh;
+            const label patchId = patchIds[0];
 
             vtkSmartPointer<vtkFloatArray> pdata = convertFieldToVTK
             (
@@ -446,27 +457,28 @@ void Foam::vtkPVFoam::convertPointFields
                 pfld.boundaryField()[patchId].patchInternalField()()
             );
 
-            vtkmesh->GetPointData()->AddArray(pdata);
+            dataset->GetPointData()->AddArray(pdata);
         }
 
-        //
-        // Convert (selected) faceZones
-        //
+        // Face Zones
         for (auto partId : rangeFaceZones_)
         {
             if (!selectedPartIds_.found(partId))
             {
                 continue;
             }
+            const auto& longName = selectedPartIds_[partId];
+            const word zoneName = getFoamName(longName);
 
-            auto iter = cachedVtp_.find(selectedPartIds_[partId]);
-            if (!iter.found() || !(*iter).vtkmesh)
+            auto iter = cachedVtp_.find(longName);
+            if (!iter.found() || !iter.object().dataset)
             {
+                // Should not happen, but for safety require a vtk geometry
                 continue;
             }
-            auto vtkmesh = (*iter).vtkmesh;
+            foamVtpData& vtpData = iter.object();
+            auto dataset = vtpData.dataset;
 
-            const word zoneName = getPartName(partId);
             const label zoneId = mesh.faceZones().findZoneID(zoneName);
 
             if (zoneId < 0)
@@ -488,7 +500,7 @@ void Foam::vtkPVFoam::convertPointFields
                     znfld
                 );
 
-            vtkmesh->GetPointData()->AddArray(pdata);
+            dataset->GetPointData()->AddArray(pdata);
         }
     }
 }
@@ -507,63 +519,58 @@ void Foam::vtkPVFoam::convertPointFieldBlock
         {
             continue;
         }
+        const auto& longName = selectedPartIds_[partId];
 
-        auto iter = cachedVtu_.find(selectedPartIds_[partId]);
-        if (!iter.found() || ! (*iter).vtkmesh)
+        auto iter = cachedVtu_.find(longName);
+        if (!iter.found() || !iter.object().dataset)
         {
+            // Should not happen, but for safety require a vtk geometry
             continue;
         }
-        auto vtuData = (*iter);
-        auto vtkmesh = (*iter).vtkmesh;
+        foamVtuData& vtuData = iter.object();
+        auto dataset = vtuData.dataset;
 
-        convertPointField
+        vtkSmartPointer<vtkFloatArray> pdata = convertPointField
         (
-            vtkmesh,
             pfld,
             GeometricField<Type, fvPatchField, volMesh>::null(),
             vtuData
         );
+
+        dataset->GetPointData()->AddArray(pdata);
     }
 }
 
 
 template<class Type>
-void Foam::vtkPVFoam::convertPointField
+vtkSmartPointer<vtkFloatArray> Foam::vtkPVFoam::convertPointField
 (
-    vtkUnstructuredGrid* vtkmesh,
     const GeometricField<Type, pointPatchField, pointMesh>& pfld,
     const GeometricField<Type, fvPatchField, volMesh>& vfld,
     const foamVtuData& vtuData
 )
 {
-    if (!vtkmesh)
-    {
-        return;
-    }
-
-    const label nComp = pTraits<Type>::nComponents;
+    const int nComp(pTraits<Type>::nComponents);
     const labelUList& addPointCellLabels = vtuData.additionalIds();
     const labelUList& pointMap = vtuData.pointMap();
 
     // Use a pointMap or address directly into mesh
     const label nPoints = (pointMap.size() ? pointMap.size() : pfld.size());
 
-    vtkSmartPointer<vtkFloatArray> fldData =
-        vtkSmartPointer<vtkFloatArray>::New();
-
-    fldData->SetNumberOfComponents(nComp);
-    fldData->SetNumberOfTuples(nPoints + addPointCellLabels.size());
+    auto data = vtkSmartPointer<vtkFloatArray>::New();
+    data->SetNumberOfComponents(nComp);
+    data->SetNumberOfTuples(nPoints + addPointCellLabels.size());
 
     // Note: using the name of the original volField
     // not the name generated by the interpolation "volPointInterpolate(<name>)"
 
-    if (&vfld != &GeometricField<Type, fvPatchField, volMesh>::null())
+    if (notNull(vfld))
     {
-        fldData->SetName(vfld.name().c_str());
+        data->SetName(vfld.name().c_str());
     }
     else
     {
-        fldData->SetName(pfld.name().c_str());
+        data->SetName(pfld.name().c_str());
     }
 
     if (debug)
@@ -589,7 +596,7 @@ void Foam::vtkPVFoam::convertPointField
             }
             foamPvFields::remapTuple<Type>(vec);
 
-            fldData->SetTuple(pointi++, vec);
+            data->SetTuple(pointi++, vec);
         }
     }
     else
@@ -603,13 +610,13 @@ void Foam::vtkPVFoam::convertPointField
             }
             foamPvFields::remapTuple<Type>(vec);
 
-            fldData->SetTuple(pointi++, vec);
+            data->SetTuple(pointi++, vec);
         }
     }
 
-    // Continue additional points
+    // Continue with additional points
 
-    if (&vfld != &GeometricField<Type, fvPatchField, volMesh>::null())
+    if (notNull(vfld))
     {
         forAll(addPointCellLabels, apI)
         {
@@ -620,7 +627,7 @@ void Foam::vtkPVFoam::convertPointField
             }
             foamPvFields::remapTuple<Type>(vec);
 
-            fldData->SetTuple(pointi++, vec);
+            data->SetTuple(pointi++, vec);
         }
     }
     else
@@ -634,11 +641,11 @@ void Foam::vtkPVFoam::convertPointField
             }
             foamPvFields::remapTuple<Type>(vec);
 
-            fldData->SetTuple(pointi++, vec);
+            data->SetTuple(pointi++, vec);
         }
     }
 
-    vtkmesh->GetPointData()->AddArray(fldData);
+    return data;
 }
 
 
@@ -656,19 +663,23 @@ void Foam::vtkPVFoam::convertLagrangianFields
 {
     forAllConstIters(objects, iter)
     {
-        // restrict to this IOField<Type>
-        if (iter()->headerClassName() == IOField<Type>::typeName)
-        {
-            IOField<Type> fld(*iter());
+        // Restrict to IOField<Type>
+        const auto& ioobj = *(iter.object());
 
-            vtkSmartPointer<vtkFloatArray> fldData =
+        if (ioobj.headerClassName() == IOField<Type>::typeName)
+        {
+            IOField<Type> fld(ioobj);
+
+            vtkSmartPointer<vtkFloatArray> data =
                 convertFieldToVTK
                 (
-                    fld.name(),
+                    ioobj.name(),
                     fld
                 );
 
-            vtkmesh->GetPointData()->AddArray(fldData);
+            // Provide identical data as cell and as point data
+            vtkmesh->GetCellData()->AddArray(data);
+            vtkmesh->GetPointData()->AddArray(data);
         }
     }
 }
@@ -679,45 +690,116 @@ void Foam::vtkPVFoam::convertLagrangianFields
 // low-level conversions
 //
 
+template<class Type>
+vtkSmartPointer<vtkFloatArray>
+Foam::vtkPVFoam::zeroVTKField
+(
+    const word& name,
+    const label size
+)
+{
+    auto data = vtkSmartPointer<vtkFloatArray>::New();
+
+    data->SetName(name.c_str());
+    data->SetNumberOfComponents(int(pTraits<Type>::nComponents));
+    data->SetNumberOfTuples(size);
+
+    data->Fill(0);
+
+    return data;
+}
+
+
+template<class Type>
+Foam::label Foam::vtkPVFoam::transcribeFloatData
+(
+    vtkFloatArray* array,
+    const UList<Type>& input,
+    const label start
+)
+{
+    const int nComp(pTraits<Type>::nComponents);
+
+    if (array->GetNumberOfComponents() != nComp)
+    {
+        FatalErrorInFunction
+            << "vtk array '" << array->GetName()
+            << "' has mismatch in number of components for type '"
+            << pTraits<Type>::typeName
+            << "' : target array has " << array->GetNumberOfComponents()
+            << " components instead of " << nComp
+            << endl;
+    }
+
+    const vtkIdType maxSize = array->GetNumberOfTuples();
+    const vtkIdType endPos = vtkIdType(start) + vtkIdType(input.size());
+
+    if (start < 0 || vtkIdType(start) >= maxSize)
+    {
+        WarningInFunction
+            << "vtk array '" << array->GetName()
+            << "' copy with out-of-range (0-" << long(maxSize-1) << ")"
+            << " starting location"
+            << endl;
+
+        return 0;
+    }
+    else if (endPos > maxSize)
+    {
+        WarningInFunction
+            << "vtk array '" << array->GetName()
+            << "' copy ends out-of-range (" << long(maxSize) << ")"
+            << " using sizing (start,size) = ("
+            << start << "," << input.size() << ")"
+            << endl;
+
+        return 0;
+    }
+
+    float scratch[nComp];
+    forAll(input, idx)
+    {
+        const Type& t = input[idx];
+        for (direction d=0; d<nComp; ++d)
+        {
+            scratch[d] = component(t, d);
+        }
+        foamPvFields::remapTuple<Type>(scratch);
+
+        array->SetTuple(start+idx, scratch);
+    }
+
+    return input.size();
+}
+
+
 template<class Type>
 vtkSmartPointer<vtkFloatArray>
 Foam::vtkPVFoam::convertFieldToVTK
 (
     const word& name,
-    const Field<Type>& fld
-)
+    const UList<Type>& fld
+) const
 {
+    const int nComp(pTraits<Type>::nComponents);
+
     if (debug)
     {
-        Info<< "convert Field<" << pTraits<Type>::typeName << "> "
+        Info<< "convert UList<" << pTraits<Type>::typeName << "> "
             << name
             << " size="  << fld.size()
-            << " nComp=" << label(pTraits<Type>::nComponents) << endl;
+            << " nComp=" << nComp << endl;
     }
 
-    const label nComp = pTraits<Type>::nComponents;
+    auto data = vtkSmartPointer<vtkFloatArray>::New();
 
-    vtkSmartPointer<vtkFloatArray> fldData =
-        vtkSmartPointer<vtkFloatArray>::New();
+    data->SetName(name.c_str());
+    data->SetNumberOfComponents(nComp);
+    data->SetNumberOfTuples(fld.size());
 
-    fldData->SetNumberOfComponents(nComp);
-    fldData->SetNumberOfTuples(fld.size());
-    fldData->SetName(name.c_str());
+    transcribeFloatData(data, fld);
 
-    float vec[nComp];
-    forAll(fld, idx)
-    {
-        const Type& t = fld[idx];
-        for (direction d=0; d<nComp; ++d)
-        {
-            vec[d] = component(t, d);
-        }
-        foamPvFields::remapTuple<Type>(vec);
-
-        fldData->SetTuple(idx, vec);
-    }
-
-    return fldData;
+    return data;
 }
 
 
@@ -727,34 +809,32 @@ Foam::vtkPVFoam::convertFaceFieldToVTK
 (
     const GeometricField<Type, fvPatchField, volMesh>& fld,
     const labelUList& faceLabels
-)
+) const
 {
     if (debug)
     {
         Info<< "convert face field: "
             << fld.name()
             << " size="  << faceLabels.size()
-            << " nComp=" << label(pTraits<Type>::nComponents) << endl;
+            << " nComp=" << int(pTraits<Type>::nComponents) << endl;
     }
 
     const fvMesh& mesh = fld.mesh();
 
-    const label nComp = pTraits<Type>::nComponents;
+    const int nComp(pTraits<Type>::nComponents);
     const label nInternalFaces = mesh.nInternalFaces();
     const labelList& faceOwner = mesh.faceOwner();
     const labelList& faceNeigh = mesh.faceNeighbour();
 
-    vtkSmartPointer<vtkFloatArray> fldData =
-        vtkSmartPointer<vtkFloatArray>::New();
+    auto data = vtkSmartPointer<vtkFloatArray>::New();
+    data->SetName(fld.name().c_str());
+    data->SetNumberOfComponents(nComp);
+    data->SetNumberOfTuples(faceLabels.size());
 
-    fldData->SetNumberOfComponents(nComp);
-    fldData->SetNumberOfTuples(faceLabels.size());
-    fldData->SetName(fld.name().c_str());
+    float scratch[nComp];
 
-    float vec[nComp];
-
-    // for interior faces: average owner/neighbour
-    // for boundary faces: owner
+    // Interior faces: average owner/neighbour
+    // Boundary faces: the owner value
     forAll(faceLabels, idx)
     {
         const label faceNo = faceLabels[idx];
@@ -764,7 +844,7 @@ Foam::vtkPVFoam::convertFaceFieldToVTK
 
             for (direction d=0; d<nComp; ++d)
             {
-                vec[d] = component(t, d);
+                scratch[d] = component(t, d);
             }
         }
         else
@@ -772,15 +852,15 @@ Foam::vtkPVFoam::convertFaceFieldToVTK
             const Type& t = fld[faceOwner[faceNo]];
             for (direction d=0; d<nComp; ++d)
             {
-                vec[d] = component(t, d);
+                scratch[d] = component(t, d);
             }
         }
-        foamPvFields::remapTuple<Type>(vec);
+        foamPvFields::remapTuple<Type>(scratch);
 
-        fldData->SetTuple(idx, vec);
+        data->SetTuple(idx, scratch);
     }
 
-    return fldData;
+    return data;
 }
 
 
@@ -790,17 +870,15 @@ Foam::vtkPVFoam::convertVolFieldToVTK
 (
     const GeometricField<Type, fvPatchField, volMesh>& fld,
     const foamVtuData& vtuData
-)
+) const
 {
-    const label nComp = pTraits<Type>::nComponents;
-    const labelList& cellMap = vtuData.cellMap();
+    const int nComp(pTraits<Type>::nComponents);
+    const labelUList& cellMap = vtuData.cellMap();
 
-    vtkSmartPointer<vtkFloatArray> fldData =
-        vtkSmartPointer<vtkFloatArray>::New();
-
-    fldData->SetNumberOfComponents(nComp);
-    fldData->SetNumberOfTuples(cellMap.size());
-    fldData->SetName(fld.name().c_str());
+    auto data = vtkSmartPointer<vtkFloatArray>::New();
+    data->SetName(fld.name().c_str());
+    data->SetNumberOfComponents(nComp);
+    data->SetNumberOfTuples(cellMap.size());
 
     if (debug)
     {
@@ -812,20 +890,20 @@ Foam::vtkPVFoam::convertVolFieldToVTK
             << ") nComp=" << nComp << endl;
     }
 
-    float vec[nComp];
+    float scratch[nComp];
     forAll(cellMap, idx)
     {
         const Type& t = fld[cellMap[idx]];
         for (direction d=0; d<nComp; ++d)
         {
-            vec[d] = component(t, d);
+            scratch[d] = component(t, d);
         }
-        foamPvFields::remapTuple<Type>(vec);
+        foamPvFields::remapTuple<Type>(scratch);
 
-        fldData->SetTuple(idx, vec);
+        data->SetTuple(idx, scratch);
     }
 
-    return fldData;
+    return data;
 }
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamFields.C b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamFields.C
index 8f1ca82460..9da212916f 100644
--- a/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamFields.C
+++ b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamFields.C
@@ -40,28 +40,6 @@ License
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-void Foam::vtkPVFoam::pruneObjectList
-(
-    IOobjectList& objects,
-    const hashedWordList& retain
-)
-{
-    if (retain.empty())
-    {
-        objects.clear();
-    }
-
-    // only retain specified fields
-    forAllIters(objects, iter)
-    {
-        if (!retain.found(iter()->name()))
-        {
-            objects.erase(iter);
-        }
-    }
-}
-
-
 void Foam::vtkPVFoam::convertVolFields()
 {
     const fvMesh& mesh = *meshPtr_;
@@ -80,7 +58,7 @@ void Foam::vtkPVFoam::convertVolFields()
     // Get objects (fields) for this time - only keep selected fields
     // the region name is already in the mesh db
     IOobjectList objects(mesh, dbPtr_().timeName());
-    pruneObjectList(objects, selectedFields);
+    objects.filterKeys(selectedFields);
 
     if (objects.empty())
     {
@@ -89,7 +67,7 @@ void Foam::vtkPVFoam::convertVolFields()
 
     if (debug)
     {
-        Info<< "<beg> convert volume fields" << endl;
+        Info<< "<beg> " << FUNCTION_NAME << endl;
         forAllConstIters(objects, iter)
         {
             Info<< "  " << iter()->name()
@@ -132,7 +110,7 @@ void Foam::vtkPVFoam::convertVolFields()
 
     if (debug)
     {
-        Info<< "<end> convert volume fields" << endl;
+        Info<< "<end> " << FUNCTION_NAME << endl;
         printMemory();
     }
 }
@@ -159,7 +137,7 @@ void Foam::vtkPVFoam::convertPointFields()
     // Get objects (fields) for this time - only keep selected fields
     // the region name is already in the mesh db
     IOobjectList objects(mesh, dbPtr_().timeName());
-    pruneObjectList(objects, selectedFields);
+    objects.filterKeys(selectedFields);
 
     if (objects.empty())
     {
@@ -196,7 +174,7 @@ void Foam::vtkPVFoam::convertPointFields()
 
 void Foam::vtkPVFoam::convertLagrangianFields()
 {
-    arrayRange& range = rangeLagrangian_;
+    const arrayRange& range = rangeLagrangian_;
     const fvMesh& mesh = *meshPtr_;
 
     hashedWordList selectedFields = getSelected
@@ -211,7 +189,7 @@ void Foam::vtkPVFoam::convertLagrangianFields()
 
     if (debug)
     {
-        Info<< "<beg> convert Lagrangian fields" << endl;
+        Info<< "<beg> " << FUNCTION_NAME << endl;
         printMemory();
     }
 
@@ -222,14 +200,16 @@ void Foam::vtkPVFoam::convertLagrangianFields()
             continue;
         }
 
-        const word cloudName = getPartName(partId);
-        auto iter = cachedVtp_.find(selectedPartIds_[partId]);
+        const auto& longName = selectedPartIds_[partId];
+        const word cloudName = getFoamName(longName);
 
-        if (!iter.found() || !(*iter).vtkmesh)
+        auto iter = cachedVtp_.find(longName);
+        if (!iter.found() || !iter.object().dataset)
         {
+            // Should not happen, but for safety require a vtk geometry
             continue;
         }
-        auto vtkmesh = (*iter).vtkmesh;
+        auto dataset = iter.object().dataset;
 
         // Get the Lagrangian fields for this time and this cloud
         // but only keep selected fields
@@ -240,7 +220,7 @@ void Foam::vtkPVFoam::convertLagrangianFields()
             dbPtr_().timeName(),
             cloud::prefix/cloudName
         );
-        pruneObjectList(objects, selectedFields);
+        objects.filterKeys(selectedFields);
 
         if (objects.empty())
         {
@@ -257,17 +237,17 @@ void Foam::vtkPVFoam::convertLagrangianFields()
             }
         }
 
-        convertLagrangianFields<label>(objects, vtkmesh);
-        convertLagrangianFields<scalar>(objects, vtkmesh);
-        convertLagrangianFields<vector>(objects, vtkmesh);
-        convertLagrangianFields<sphericalTensor>(objects, vtkmesh);
-        convertLagrangianFields<symmTensor>(objects, vtkmesh);
-        convertLagrangianFields<tensor>(objects, vtkmesh);
+        convertLagrangianFields<label>(objects, dataset);
+        convertLagrangianFields<scalar>(objects, dataset);
+        convertLagrangianFields<vector>(objects, dataset);
+        convertLagrangianFields<sphericalTensor>(objects, dataset);
+        convertLagrangianFields<symmTensor>(objects, dataset);
+        convertLagrangianFields<tensor>(objects, dataset);
     }
 
     if (debug)
     {
-        Info<< "<end> convert Lagrangian fields" << endl;
+        Info<< "<end> " << FUNCTION_NAME << endl;
         printMemory();
     }
 }
diff --git a/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamMesh.C b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamMesh.C
index e133417912..3ddd5d0956 100644
--- a/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamMesh.C
+++ b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamMesh.C
@@ -44,7 +44,7 @@ License
 
 void Foam::vtkPVFoam::convertMeshVolume()
 {
-    arrayRange& range = rangeVolume_;
+    const arrayRange& range = rangeVolume_;
     const fvMesh& mesh = *meshPtr_;
 
     if (debug)
@@ -60,15 +60,38 @@ void Foam::vtkPVFoam::convertMeshVolume()
         if (selectedPartIds_.found(partId))
         {
             const auto& longName = selectedPartIds_[partId];
+            foamVtuData& vtuData = cachedVtu_(longName);
 
-            vtkSmartPointer<vtkUnstructuredGrid> vtkmesh =
-                volumeVTKMesh
-                (
-                    mesh,
-                    cachedVtu_(longName)
-                );
+            vtkSmartPointer<vtkUnstructuredGrid> vtkgeom;
+            if (vtuData.nPoints())
+            {
+                if (meshState_ == polyMesh::UNCHANGED)
+                {
+                    if (debug)
+                    {
+                        Info<< "reuse " << longName << nl;
+                    }
+                    vtuData.reuse(); // reuse
+                    continue;
+                }
+                else if (meshState_ == polyMesh::POINTS_MOVED)
+                {
+                    if (debug)
+                    {
+                        Info<< "move points " << longName << nl;
+                    }
+                    vtkgeom = vtuData.getCopy();
+                    vtkgeom->SetPoints(movePoints(mesh, vtuData));
+                }
+            }
 
-            cachedVtu_[longName].vtkmesh = vtkmesh;
+            if (!vtkgeom)
+            {
+                // Nothing usable from cache - create new geometry
+                vtkgeom = volumeVTKMesh(mesh, vtuData);
+            }
+
+            vtuData.set(vtkgeom);
         }
     }
 
@@ -82,7 +105,7 @@ void Foam::vtkPVFoam::convertMeshVolume()
 
 void Foam::vtkPVFoam::convertMeshLagrangian()
 {
-    arrayRange& range = rangeLagrangian_;
+    const arrayRange& range = rangeLagrangian_;
     const fvMesh& mesh = *meshPtr_;
 
     if (debug)
@@ -96,16 +119,13 @@ void Foam::vtkPVFoam::convertMeshLagrangian()
         if (selectedPartIds_.found(partId))
         {
             const auto& longName = selectedPartIds_[partId];
-            const word cloudName = getPartName(partId);
+            const word cloudName = getFoamName(longName);
 
-            vtkSmartPointer<vtkPolyData> vtkmesh =
-                lagrangianVTKMesh
-                (
-                    mesh,
-                    cloudName
-                );
-
-            cachedVtp_(longName).vtkmesh = vtkmesh;
+            // Direct conversion, no caching for Lagrangian
+            cachedVtp_(longName).set
+            (
+                lagrangianVTKMesh(mesh, cloudName)
+            );
         }
     }
 
@@ -119,7 +139,7 @@ void Foam::vtkPVFoam::convertMeshLagrangian()
 
 void Foam::vtkPVFoam::convertMeshPatches()
 {
-    arrayRange& range = rangePatches_;
+    const arrayRange& range = rangePatches_;
     const fvMesh& mesh = *meshPtr_;
     const polyBoundaryMesh& patches = mesh.boundaryMesh();
 
@@ -136,14 +156,42 @@ void Foam::vtkPVFoam::convertMeshPatches()
             continue;
         }
         const auto& longName = selectedPartIds_[partId];
-        const word partName = getPartName(partId);
+        const word partName = getFoamName(longName);
+        foamVtpData& vtpData = cachedVtp_(longName);
 
-        vtkSmartPointer<vtkPolyData> vtkmesh;
+        vtkSmartPointer<vtkPolyData> vtkgeom;
+        if (vtpData.nPoints())
+        {
+            if (meshState_ == polyMesh::UNCHANGED)
+            {
+                // Without movement is easy.
+                if (debug)
+                {
+                    Info<< "reuse " << longName << nl;
+                }
+                vtpData.reuse();
+                continue;
+            }
+            else if (meshState_ == polyMesh::POINTS_MOVED)
+            {
+                // Point movement on single patch is OK
+
+                const labelList& patchIds = vtpData.additionalIds();
+                if (patchIds.size() == 1)
+                {
+                    vtkgeom = vtpData.getCopy();
+                    vtkgeom->SetPoints(movePatchPoints(patches[patchIds[0]]));
+                    continue;
+                }
+            }
+        }
 
         if (longName.startsWith("group/"))
         {
             // Patch group. Collect patch faces.
 
+            vtpData.clear(); // Remove any old mappings
+
             const labelList& patchIds =
                 patches.groupPatchIDs().lookup(partName, labelList());
 
@@ -153,19 +201,32 @@ void Foam::vtkPVFoam::convertMeshPatches()
                     << longName << endl;
             }
 
+            // Store good patch ids as additionalIds
+            vtpData.additionalIds().reserve(patchIds.size());
+
             label sz = 0;
             for (auto id : patchIds)
             {
-                sz += patches[id].size();
+                const label n = patches[id].size();
+
+                if (n)
+                {
+                    vtpData.additionalIds().append(id);
+                    sz += n;
+                }
             }
-            labelList faceLabels(sz);
-            sz = 0;
-            for (auto id : patchIds)
+            Foam::sort(vtpData.additionalIds());
+
+            // Temporarily (mis)use cellMap for face labels
+            DynamicList<label>& faceLabels = vtpData.cellMap();
+            faceLabels.reserve(sz);
+
+            for (auto id : vtpData.additionalIds())
             {
                 const auto& pp = patches[id];
                 forAll(pp, i)
                 {
-                    faceLabels[sz++] = pp.start()+i;
+                    faceLabels.append(pp.start()+i);
                 }
             }
 
@@ -177,11 +238,15 @@ void Foam::vtkPVFoam::convertMeshPatches()
                     mesh.points()
                 );
 
-                vtkmesh = patchVTKMesh(partName, pp);
+                vtkgeom = patchVTKMesh(pp);
             }
+
+            faceLabels.clear();  // Unneeded
         }
         else
         {
+            vtpData.clear(); // Remove any old mappings
+
             const label patchId = patches.findPatchID(partName);
 
             if (debug)
@@ -192,13 +257,20 @@ void Foam::vtkPVFoam::convertMeshPatches()
 
             if (patchId >= 0)
             {
-                vtkmesh = patchVTKMesh(partName, patches[patchId]);
+                // Store good patch id as additionalIds
+                vtpData.additionalIds() = {patchId};
+
+                vtkgeom = patchVTKMesh(patches[patchId]);
             }
         }
 
-        if (vtkmesh)
+        if (vtkgeom)
         {
-            cachedVtp_(longName).vtkmesh = vtkmesh;
+            vtpData.set(vtkgeom);
+        }
+        else
+        {
+            cachedVtp_.erase(longName);
         }
     }
 
@@ -210,36 +282,6 @@ void Foam::vtkPVFoam::convertMeshPatches()
 }
 
 
-void Foam::vtkPVFoam::convertMeshSubset
-(
-    const fvMeshSubset& subsetter,
-    const string& longName
-)
-{
-    vtkSmartPointer<vtkUnstructuredGrid> vtkmesh = volumeVTKMesh
-    (
-        subsetter.subMesh(),
-        cachedVtu_(longName)
-    );
-
-    // Convert cellMap, addPointCellLabels to global cell ids
-    inplaceRenumber
-    (
-        subsetter.cellMap(),
-        cachedVtu_[longName].cellMap()
-    );
-    inplaceRenumber
-    (
-        subsetter.cellMap(),
-        cachedVtu_[longName].additionalIds()
-    );
-
-    // copy pointMap as well, otherwise pointFields fail
-    cachedVtu_[longName].pointMap() = subsetter.pointMap();
-    cachedVtu_[longName].vtkmesh = vtkmesh;
-}
-
-
 void Foam::vtkPVFoam::convertMeshCellZones()
 {
     const arrayRange& range = rangeCellZones_;
@@ -265,7 +307,7 @@ void Foam::vtkPVFoam::convertMeshCellZones()
         }
 
         const auto& longName = selectedPartIds_[partId];
-        const word zoneName = getPartName(partId);
+        const word zoneName = getFoamName(longName);
         const label  zoneId = zMesh.findZoneID(zoneName);
 
         if (zoneId < 0)
@@ -279,10 +321,43 @@ void Foam::vtkPVFoam::convertMeshCellZones()
                 << zoneName << endl;
         }
 
-        fvMeshSubset subsetter(mesh);
-        subsetter.setLargeCellSubset(zMesh[zoneId]);
+        foamVtuData& vtuData = cachedVtu_(longName);
 
-        convertMeshSubset(subsetter, longName);
+        vtkSmartPointer<vtkUnstructuredGrid> vtkgeom;
+        if (vtuData.nPoints() && vtuData.pointMap().size())
+        {
+            if (meshState_ == polyMesh::UNCHANGED)
+            {
+                if (debug)
+                {
+                    Info<< "reuse " << longName << nl;
+                }
+                vtuData.reuse();
+                continue;
+            }
+            else if (meshState_ == polyMesh::POINTS_MOVED)
+            {
+                if (debug)
+                {
+                    Info<< "move points " << longName << nl;
+                }
+                vtkgeom = vtuData.getCopy();
+                vtkgeom->SetPoints
+                (
+                    movePoints(mesh, vtuData, vtuData.pointMap())
+                );
+            }
+        }
+
+        if (!vtkgeom)
+        {
+            fvMeshSubset subsetter(mesh);
+            subsetter.setLargeCellSubset(zMesh[zoneId]);
+
+            vtkgeom = volumeVTKSubsetMesh(subsetter, vtuData);
+        }
+
+        vtuData.set(vtkgeom);
     }
 
     if (debug)
@@ -312,18 +387,50 @@ void Foam::vtkPVFoam::convertMeshCellSets()
         }
 
         const auto& longName = selectedPartIds_[partId];
-        const word partName = getPartName(partId);
+        const word partName = getFoamName(longName);
 
         if (debug)
         {
             Info<< "Creating VTK mesh for cellSet=" << partName << endl;
         }
 
-        const cellSet cSet(mesh, partName);
-        fvMeshSubset subsetter(mesh);
-        subsetter.setLargeCellSubset(cSet);
+        foamVtuData& vtuData = cachedVtu_(longName);
 
-        convertMeshSubset(subsetter, longName);
+        vtkSmartPointer<vtkUnstructuredGrid> vtkgeom;
+        if (vtuData.nPoints() && vtuData.pointMap().size())
+        {
+            if (meshState_ == polyMesh::UNCHANGED)
+            {
+                if (debug)
+                {
+                    Info<< "reuse " << longName << nl;
+                }
+                vtuData.reuse();
+                continue;
+            }
+            else if (meshState_ == polyMesh::POINTS_MOVED)
+            {
+                if (debug)
+                {
+                    Info<< "move points " << longName << nl;
+                }
+                vtkgeom = vtuData.getCopy();
+                vtkgeom->SetPoints
+                (
+                    movePoints(mesh, vtuData, vtuData.pointMap())
+                );
+            }
+        }
+
+        if (!vtkgeom)
+        {
+            fvMeshSubset subsetter(mesh);
+            subsetter.setLargeCellSubset(cellSet(mesh, partName));
+
+            vtkgeom = volumeVTKSubsetMesh(subsetter, vtuData);
+        }
+
+        vtuData.set(vtkgeom);
     }
 
     if (debug)
@@ -336,7 +443,7 @@ void Foam::vtkPVFoam::convertMeshCellSets()
 
 void Foam::vtkPVFoam::convertMeshFaceZones()
 {
-    arrayRange& range = rangeFaceZones_;
+    const arrayRange& range = rangeFaceZones_;
     const fvMesh& mesh = *meshPtr_;
 
     if (range.empty())
@@ -359,28 +466,49 @@ void Foam::vtkPVFoam::convertMeshFaceZones()
         }
 
         const auto& longName = selectedPartIds_[partId];
-        const word zoneName = getPartName(partId);
+        const word zoneName = getFoamName(longName);
         const label  zoneId = zMesh.findZoneID(zoneName);
 
         if (zoneId < 0)
         {
             continue;
         }
-
         if (debug)
         {
             Info<< "Creating VTKmesh for faceZone[" << zoneId << "] "
                 << zoneName << endl;
         }
 
-        vtkSmartPointer<vtkPolyData> vtkmesh =
-            patchVTKMesh
-            (
-                zoneName,
-                zMesh[zoneId]()
-            );
+        foamVtpData& vtpData = cachedVtp_(longName);
 
-        cachedVtp_(longName).vtkmesh = vtkmesh;
+        vtkSmartPointer<vtkPolyData> vtkgeom;
+        if (vtpData.nPoints())
+        {
+            if (meshState_ == polyMesh::UNCHANGED)
+            {
+                // Without movement is easy.
+                if (debug)
+                {
+                    Info<<"reuse " << longName << nl;
+                }
+                vtpData.reuse();
+                continue;
+            }
+            else if (meshState_ == polyMesh::POINTS_MOVED)
+            {
+                // Need point maps etc - not worth it at the moment
+            }
+        }
+
+        if (!vtkgeom)
+        {
+            vtpData.clear();  // No additional ids, maps
+
+            const primitiveFacePatch& pp = zMesh[zoneId]();
+            vtkgeom = patchVTKMesh(pp);
+        }
+
+        vtpData.set(vtkgeom);
     }
 
     if (debug)
@@ -393,7 +521,7 @@ void Foam::vtkPVFoam::convertMeshFaceZones()
 
 void Foam::vtkPVFoam::convertMeshFaceSets()
 {
-    arrayRange& range = rangeFaceSets_;
+    const arrayRange& range = rangeFaceSets_;
     const fvMesh& mesh = *meshPtr_;
 
     if (debug)
@@ -410,35 +538,61 @@ void Foam::vtkPVFoam::convertMeshFaceSets()
         }
 
         const auto& longName = selectedPartIds_[partId];
-        const word partName = getPartName(partId);
+        const word partName = getFoamName(longName);
 
         if (debug)
         {
             Info<< "Creating VTK mesh for faceSet=" << partName << endl;
         }
 
-        // faces in sorted order for more reliability
-        const labelList faceLabels = faceSet(mesh, partName).sortedToc();
+        foamVtpData& vtpData = cachedVtp_(longName);
 
-        uindirectPrimitivePatch p
-        (
-            UIndirectList<face>(mesh.faces(), faceLabels),
-            mesh.points()
-        );
-
-        if (p.empty())
+        vtkSmartPointer<vtkPolyData> vtkgeom;
+        if (vtpData.nPoints())
         {
-            continue;
+            if (meshState_ == polyMesh::UNCHANGED)
+            {
+                // Without movement is easy.
+                if (debug)
+                {
+                    Info<<"reuse " << longName << nl;
+                }
+                vtpData.reuse();
+                continue;
+            }
+            else if (meshState_ == polyMesh::POINTS_MOVED)
+            {
+                // Need point maps etc - not worth it at the moment
+            }
         }
 
-        vtkSmartPointer<vtkPolyData> vtkmesh =
-            patchVTKMesh
-            (
-                "faceSet:" + partName,
-                p
-            );
+        if (!vtkgeom)
+        {
+            vtpData.clear();  // No other additional ids, maps
 
-        cachedVtp_(longName).vtkmesh = vtkmesh;
+            // Misuse cellMap for face labels - sorted order for reliability
+            vtpData.cellMap() = faceSet(mesh, partName).sortedToc();
+
+            if (vtpData.cellMap().size())
+            {
+                uindirectPrimitivePatch pp
+                (
+                    UIndirectList<face>(mesh.faces(), vtpData.cellMap()),
+                    mesh.points()
+                );
+
+                vtkgeom = patchVTKMesh(pp);
+            }
+        }
+
+        if (vtkgeom)
+        {
+            vtpData.set(vtkgeom);
+        }
+        else
+        {
+            cachedVtp_.erase(longName);
+        }
     }
 
     if (debug)
@@ -451,7 +605,7 @@ void Foam::vtkPVFoam::convertMeshFaceSets()
 
 void Foam::vtkPVFoam::convertMeshPointZones()
 {
-    arrayRange& range = rangePointZones_;
+    const arrayRange& range = rangePointZones_;
     const fvMesh& mesh = *meshPtr_;
 
     if (debug)
@@ -471,7 +625,7 @@ void Foam::vtkPVFoam::convertMeshPointZones()
             }
 
             const auto& longName = selectedPartIds_[partId];
-            const word zoneName = getPartName(partId);
+            const word zoneName = getFoamName(longName);
             const label zoneId = zMesh.findZoneID(zoneName);
 
             if (zoneId < 0)
@@ -479,29 +633,50 @@ void Foam::vtkPVFoam::convertMeshPointZones()
                 continue;
             }
 
-            const pointField& meshPoints = mesh.points();
-            const labelUList& pointLabels = zMesh[zoneId];
+            foamVtpData& vtpData = cachedVtp_(longName);
 
-            vtkSmartPointer<vtkPoints> vtkpoints =
-                vtkSmartPointer<vtkPoints>::New();
-
-            vtkpoints->SetNumberOfPoints(pointLabels.size());
-
-            forAll(pointLabels, pointi)
+            vtkSmartPointer<vtkPolyData> vtkgeom;
+            if (vtpData.nPoints() && vtpData.pointMap().size())
             {
-                vtkpoints->SetPoint
-                (
-                    pointi,
-                    meshPoints[pointLabels[pointi]].v_
-                );
+                if (meshState_ == polyMesh::UNCHANGED)
+                {
+                    if (debug)
+                    {
+                        Info<< "reusing " << longName << nl;
+                    }
+                    vtpData.reuse();
+                    continue;
+                }
+                else if (meshState_ == polyMesh::POINTS_MOVED)
+                {
+                    if (debug)
+                    {
+                        Info<< "move points " << longName << nl;
+                    }
+                    vtkgeom = vtpData.getCopy();
+                }
             }
 
-            vtkSmartPointer<vtkPolyData> vtkmesh =
-                vtkSmartPointer<vtkPolyData>::New();
+            if (!vtkgeom)
+            {
+                // First time, or topo change
+                vtkgeom = vtkSmartPointer<vtkPolyData>::New();
+                vtpData.pointMap() = zMesh[zoneId];
+            }
 
-            vtkmesh->SetPoints(vtkpoints);
+            const pointField& points = mesh.points();
+            const labelUList& pointMap = vtpData.pointMap();
 
-            cachedVtp_(longName).vtkmesh = vtkmesh;
+            auto vtkpoints = vtkSmartPointer<vtkPoints>::New();
+
+            vtkpoints->SetNumberOfPoints(pointMap.size());
+            forAll(pointMap, pointi)
+            {
+                vtkpoints->SetPoint(pointi, points[pointMap[pointi]].v_);
+            }
+
+            vtkgeom->SetPoints(vtkpoints);
+            vtpData.set(vtkgeom);
         }
     }
 
@@ -515,7 +690,7 @@ void Foam::vtkPVFoam::convertMeshPointZones()
 
 void Foam::vtkPVFoam::convertMeshPointSets()
 {
-    arrayRange& range = rangePointSets_;
+    const arrayRange& range = rangePointSets_;
     const fvMesh& mesh = *meshPtr_;
 
     if (debug)
@@ -532,36 +707,52 @@ void Foam::vtkPVFoam::convertMeshPointSets()
         }
 
         const auto& longName = selectedPartIds_[partId];
-        const word partName = getPartName(partId);
+        const word partName = getFoamName(longName);
 
-        if (debug)
+        foamVtpData& vtpData = cachedVtp_(longName);
+
+        vtkSmartPointer<vtkPolyData> vtkgeom;
+        if (vtpData.nPoints() && vtpData.pointMap().size())
         {
-            Info<< "Creating VTK mesh for pointSet=" << partName << endl;
+            if (meshState_ == polyMesh::UNCHANGED)
+            {
+                if (debug)
+                {
+                    Info<< "reusing " << longName << nl;
+                }
+                vtpData.reuse();
+                continue;
+            }
+            else if (meshState_ == polyMesh::POINTS_MOVED)
+            {
+                if (debug)
+                {
+                    Info<< "move points " << longName << nl;
+                }
+                vtkgeom = vtpData.getCopy();
+            }
         }
 
-        const pointField& meshPoints = mesh.points();
-        const labelList pointLabels = pointSet(mesh, partName).sortedToc();
-
-        vtkSmartPointer<vtkPoints> vtkpoints =
-            vtkSmartPointer<vtkPoints>::New();
-
-        vtkpoints->SetNumberOfPoints(pointLabels.size());
-
-        forAll(pointLabels, pointi)
+        if (!vtkgeom)
         {
-            vtkpoints->SetPoint
-            (
-                pointi,
-                meshPoints[pointLabels[pointi]].v_
-            );
+            // First time, or topo change
+            vtkgeom = vtkSmartPointer<vtkPolyData>::New();
+            vtpData.pointMap() = pointSet(mesh, partName).sortedToc();
         }
 
-        vtkSmartPointer<vtkPolyData> vtkmesh =
-            vtkSmartPointer<vtkPolyData>::New();
+        const pointField& points = mesh.points();
+        const labelUList& pointMap = vtpData.pointMap();
 
-        vtkmesh->SetPoints(vtkpoints);
+        auto vtkpoints = vtkSmartPointer<vtkPoints>::New();
 
-        cachedVtp_(longName).vtkmesh = vtkmesh;
+        vtkpoints->SetNumberOfPoints(pointMap.size());
+        forAll(pointMap, pointi)
+        {
+            vtkpoints->SetPoint(pointi, points[pointMap[pointi]].v_);
+        }
+
+        vtkgeom->SetPoints(vtkpoints);
+        vtpData.set(vtkgeom);
     }
 
     if (debug)
diff --git a/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamMeshLagrangian.C b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamMeshLagrangian.C
index 60d0ea109f..c08e17559c 100644
--- a/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamMeshLagrangian.C
+++ b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamMeshLagrangian.C
@@ -43,7 +43,7 @@ vtkSmartPointer<vtkPolyData> Foam::vtkPVFoam::lagrangianVTKMesh
 (
     const polyMesh& mesh,
     const word& cloudName
-)
+) const
 {
     vtkSmartPointer<vtkPolyData> vtkmesh;
 
@@ -73,29 +73,19 @@ vtkSmartPointer<vtkPolyData> Foam::vtkPVFoam::lagrangianVTKMesh
             Info<< "cloud with " << parcels.size() << " parcels" << endl;
         }
 
-        vtkmesh = vtkSmartPointer<vtkPolyData>::New();
-
-        vtkSmartPointer<vtkPoints> vtkpoints =
-            vtkSmartPointer<vtkPoints>::New();
-
-        vtkSmartPointer<vtkCellArray> vtkcells =
-            vtkSmartPointer<vtkCellArray>::New();
-
+        auto vtkpoints = vtkSmartPointer<vtkPoints>::New();
         vtkpoints->SetNumberOfPoints(parcels.size());
-        vtkcells->Allocate(2*parcels.size());
-        // If reusing memory, ensure insert always starts from 0
-        vtkcells->Reset();
 
         vtkIdType particleId = 0;
         forAllConstIters(parcels, iter)
         {
             vtkpoints->SetPoint(particleId, iter().position().v_);
-            vtkcells->InsertNextCell(1, &particleId);  // VTK_VERTEX
-            particleId++;
+            ++particleId;
         }
 
+        vtkmesh = vtkSmartPointer<vtkPolyData>::New();
         vtkmesh->SetPoints(vtkpoints);
-        vtkmesh->SetVerts(vtkcells);
+        vtkmesh->SetVerts(foamPvCore::identityVertices(parcels.size()));
     }
 
     if (debug)
diff --git a/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamMeshVolume.C b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamMeshVolume.C
index 48dc989ff3..f8613a674f 100644
--- a/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamMeshVolume.C
+++ b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamMeshVolume.C
@@ -28,18 +28,89 @@ License
 
 // OpenFOAM includes
 #include "fvMesh.H"
+#include "fvMeshSubset.H"
+#include "foamVtkAdaptors.H"
 #include "foamVtuSizing.H"
 
 // VTK includes
 #include "vtkUnstructuredGrid.h"
-#include "foamVtkAdaptors.H"
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
+vtkSmartPointer<vtkPoints> Foam::vtkPVFoam::movePoints
+(
+    const fvMesh& mesh,
+    const foamVtuData& vtuData
+)
+{
+    // Convert OpenFOAM mesh vertices to VTK
+    auto vtkpoints = vtkSmartPointer<vtkPoints>::New();
+
+    // Normal points
+    const pointField& points = mesh.points();
+
+    // Additional cell centres
+    const labelList& addPoints = vtuData.additionalIds();
+
+    vtkpoints->SetNumberOfPoints(points.size() + addPoints.size());
+
+    // Normal points
+    label pointi = 0;
+    forAll(points, i)
+    {
+        vtkpoints->SetPoint(pointi++, points[i].v_);
+    }
+
+    // Cell centres
+    forAll(addPoints, i)
+    {
+        vtkpoints->SetPoint(pointi++, mesh.C()[addPoints[i]].v_);
+    }
+
+    return vtkpoints;
+}
+
+
+vtkSmartPointer<vtkPoints> Foam::vtkPVFoam::movePoints
+(
+    const fvMesh& mesh,
+    const foamVtuData& vtuData,
+    const labelUList& pointMap
+)
+{
+    // Convert OpenFOAM mesh vertices to VTK
+    auto vtkpoints = vtkSmartPointer<vtkPoints>::New();
+
+    // Normal points
+    const pointField& points = mesh.points();
+
+    // Additional cell centres
+    const labelList& addPoints = vtuData.additionalIds();
+
+    vtkpoints->SetNumberOfPoints(pointMap.size() + addPoints.size());
+
+    // Normal points
+    label pointi = 0;
+    forAll(pointMap, i)
+    {
+        vtkpoints->SetPoint(pointi++, points[pointMap[i]].v_);
+    }
+
+    // Cell centres
+    forAll(addPoints, i)
+    {
+        vtkpoints->SetPoint(pointi++, mesh.C()[addPoints[i]].v_);
+    }
+
+    return vtkpoints;
+}
+
+
 vtkSmartPointer<vtkUnstructuredGrid> Foam::vtkPVFoam::volumeVTKMesh
 (
     const fvMesh& mesh,
-    foamVtuData& vtuData
+    foamVtuData& vtuData,
+    const bool decompPoly
 )
 {
     if (debug)
@@ -48,25 +119,15 @@ vtkSmartPointer<vtkUnstructuredGrid> Foam::vtkPVFoam::volumeVTKMesh
         printMemory();
     }
 
-    foamVtuSizing sizing(mesh, !reader_->GetUseVTKPolyhedron());
+    foamVtuSizing sizing(mesh, decompPoly);
 
-    vtkSmartPointer<vtkUnstructuredGrid> vtkmesh =
-        vtkSmartPointer<vtkUnstructuredGrid>::New();
+    auto cellTypes = vtkSmartPointer<vtkUnsignedCharArray>::New();
 
-    auto cellTypes =
-        nonNullSmartPointer<vtkUnsignedCharArray>(vtkmesh->GetCellTypesArray());
+    auto cells = vtkSmartPointer<vtkCellArray>::New();
+    auto faces = vtkSmartPointer<vtkIdTypeArray>::New();
 
-    auto cells =
-        nonNullSmartPointer<vtkCellArray>(vtkmesh->GetCells());
-
-    auto faces =
-        nonNullSmartPointer<vtkIdTypeArray>(vtkmesh->GetFaces());
-
-    auto cellLocations =
-        nonNullSmartPointer<vtkIdTypeArray>(vtkmesh->GetCellLocationsArray());
-
-    auto faceLocations =
-        nonNullSmartPointer<vtkIdTypeArray>(vtkmesh->GetFaceLocations());
+    auto cellLocations = vtkSmartPointer<vtkIdTypeArray>::New();
+    auto faceLocations = vtkSmartPointer<vtkIdTypeArray>::New();
 
     UList<uint8_t> cellTypesUL =
         vtkUList
@@ -116,33 +177,12 @@ vtkSmartPointer<vtkUnstructuredGrid> Foam::vtkPVFoam::volumeVTKMesh
         static_cast<foamVtkMeshMaps&>(vtuData)
     );
 
+    auto vtkmesh = vtkSmartPointer<vtkUnstructuredGrid>::New();
 
     // Convert OpenFOAM mesh vertices to VTK
     // - can only do this *after* populating the decompInfo with cell-ids
     //   for any additional points (ie, mesh cell-centres)
-    vtkSmartPointer<vtkPoints> vtkpoints = vtkmesh->GetPoints();
-    if (!vtkpoints)
-    {
-        // No points previously, add an entry
-        vtkpoints = vtkSmartPointer<vtkPoints>::New();
-        vtkmesh->SetPoints(vtkpoints);
-    }
-
-    vtkpoints->SetNumberOfPoints(sizing.nFieldPoints());
-
-    // Normal points
-    const pointField& points = mesh.points();
-    const labelList& addPoints = vtuData.additionalIds();
-
-    label pointi = 0;
-    forAll(points, i)
-    {
-        vtkpoints->SetPoint(pointi++, points[i].v_);
-    }
-    forAll(addPoints, i)
-    {
-        vtkpoints->SetPoint(pointi++, mesh.C()[addPoints[i]].v_);
-    }
+    vtkmesh->SetPoints(movePoints(mesh, vtuData));
 
     if (facesUL.size())
     {
@@ -177,4 +217,48 @@ vtkSmartPointer<vtkUnstructuredGrid> Foam::vtkPVFoam::volumeVTKMesh
 }
 
 
+vtkSmartPointer<vtkUnstructuredGrid> Foam::vtkPVFoam::volumeVTKSubsetMesh
+(
+    const fvMeshSubset& subsetter,
+    foamVtuData& vtuData,
+    const bool decompPoly
+)
+{
+    vtkSmartPointer<vtkUnstructuredGrid> vtkmesh = volumeVTKMesh
+    (
+        subsetter.subMesh(),
+        vtuData,
+        decompPoly
+    );
+
+    // Convert cellMap, addPointCellLabels to global cell ids
+    vtuData.renumberCells(subsetter.cellMap());
+
+    // Copy pointMap as well, otherwise pointFields fail
+    vtuData.pointMap() = subsetter.pointMap();
+
+    return vtkmesh;
+}
+
+
+vtkSmartPointer<vtkUnstructuredGrid> Foam::vtkPVFoam::volumeVTKMesh
+(
+    const fvMesh& mesh,
+    foamVtuData& vtuData
+) const
+{
+    return volumeVTKMesh(mesh, vtuData, this->decomposePoly_);
+}
+
+
+vtkSmartPointer<vtkUnstructuredGrid> Foam::vtkPVFoam::volumeVTKSubsetMesh
+(
+    const fvMeshSubset& subsetter,
+    foamVtuData& vtuData
+) const
+{
+    return volumeVTKSubsetMesh(subsetter, vtuData, this->decomposePoly_);
+}
+
+
 // ************************************************************************* //
diff --git a/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamTemplates.C b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamTemplates.C
index 118ccf6b68..ec64378d2f 100644
--- a/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamTemplates.C
+++ b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamTemplates.C
@@ -28,6 +28,7 @@ License
 // OpenFOAM includes
 #include "polyPatch.H"
 #include "primitivePatch.H"
+#include "foamVtkAdaptors.H"
 
 // VTK includes
 #include "vtkCellArray.h"
@@ -35,38 +36,36 @@ License
 #include "vtkPolyData.h"
 #include "vtkSmartPointer.h"
 
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * Static Member Functions * * * * * * * * * * * * //
 
 template<class PatchType>
-vtkSmartPointer<vtkPolyData> Foam::vtkPVFoam::patchVTKMesh
+vtkSmartPointer<vtkPoints> Foam::vtkPVFoam::movePatchPoints
 (
-    const string& name,
     const PatchType& p
 )
 {
-    vtkSmartPointer<vtkPolyData> vtkmesh =
-        vtkSmartPointer<vtkPolyData>::New();
-
-    if (debug)
-    {
-        Info<< "<beg> patchVTKMesh - " << name << endl;
-        printMemory();
-    }
-
     // Convert OpenFOAM mesh vertices to VTK
-    const Foam::pointField& points = p.localPoints();
+    const pointField& points = p.localPoints();
 
-    vtkSmartPointer<vtkPoints> vtkpoints =
-        vtkSmartPointer<vtkPoints>::New();
+    auto vtkpoints = vtkSmartPointer<vtkPoints>::New();
 
     vtkpoints->SetNumberOfPoints(points.size());
     forAll(points, i)
     {
         vtkpoints->SetPoint(i, points[i].v_);
     }
-    vtkmesh->SetPoints(vtkpoints);
 
-    // Add faces as polygons
+    return vtkpoints;
+}
+
+
+template<class PatchType>
+vtkSmartPointer<vtkCellArray> Foam::vtkPVFoam::patchFacesVTKCells
+(
+    const PatchType& p
+)
+{
+    // Faces as polygons
     const faceList& faces = p.localFaces();
 
     label nAlloc = faces.size();
@@ -75,32 +74,45 @@ vtkSmartPointer<vtkPolyData> Foam::vtkPVFoam::patchVTKMesh
         nAlloc += faces[facei].size();
     }
 
-    vtkSmartPointer<vtkCellArray> vtkcells =
-        vtkSmartPointer<vtkCellArray>::New();
+    auto cells = vtkSmartPointer<vtkCellArray>::New();
 
-    vtkcells->Allocate(nAlloc);
-    // If reusing memory, ensure insert always starts from 0
-    vtkcells->Reset();
+    UList<vtkIdType> cellsUL =
+        vtkUList
+        (
+            cells,
+            faces.size(),
+            nAlloc
+        );
 
+    // Cell connectivity for polygons
+    // [size, verts..., size, verts... ]
+    label idx = 0;
     forAll(faces, facei)
     {
         const face& f = faces[facei];
-        vtkIdType nodeIds[f.size()];
+
+        cellsUL[idx++] = f.size();
 
         forAll(f, fp)
         {
-            nodeIds[fp] = f[fp];
+            cellsUL[idx++] = f[fp];
         }
-        vtkcells->InsertNextCell(f.size(), nodeIds);
     }
 
-    vtkmesh->SetPolys(vtkcells);
+    return cells;
+}
 
-    if (debug)
-    {
-        Info<< "<end> patchVTKMesh - " << name << endl;
-        printMemory();
-    }
+
+template<class PatchType>
+vtkSmartPointer<vtkPolyData> Foam::vtkPVFoam::patchVTKMesh
+(
+    const PatchType& p
+)
+{
+    auto vtkmesh = vtkSmartPointer<vtkPolyData>::New();
+
+    vtkmesh->SetPoints(movePatchPoints(p));
+    vtkmesh->SetPolys(patchFacesVTKCells(p));
 
     return vtkmesh;
 }
diff --git a/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamUpdateInfo.C b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamUpdateInfo.C
index d344d949d4..f71354aaa1 100644
--- a/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamUpdateInfo.C
+++ b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamUpdateInfo.C
@@ -163,7 +163,7 @@ void Foam::vtkPVFoam::updateInfoLagrangian
 {
     if (debug)
     {
-        Info<< "<beg> updateInfoLagrangian" << nl
+        Info<< "<beg> " << FUNCTION_NAME << nl
             << "    " << dbPtr_->timePath()/cloud::prefix << endl;
     }
 
@@ -194,7 +194,7 @@ void Foam::vtkPVFoam::updateInfoLagrangian
 
     if (debug)
     {
-        Info<< "<end> updateInfoLagrangian" << endl;
+        Info<< "<end> " << FUNCTION_NAME << endl;
     }
 }
 
@@ -207,7 +207,7 @@ void Foam::vtkPVFoam::updateInfoPatches
 {
     if (debug)
     {
-        Info<< "<beg> updateInfoPatches"
+        Info<< "<beg> " << FUNCTION_NAME
             << " [meshPtr=" << (meshPtr_ ? "set" : "null") << "]" << endl;
     }
 
@@ -409,7 +409,7 @@ void Foam::vtkPVFoam::updateInfoPatches
 
     if (debug)
     {
-        Info<< "<end> updateInfoPatches" << endl;
+        Info<< "<end> " << FUNCTION_NAME << endl;
     }
 }
 
@@ -591,7 +591,7 @@ void Foam::vtkPVFoam::updateInfoLagrangianFields
     }
 
     // Preserve the enabled selections
-    HashSet<string> enabledEntries = getSelectedArrayEntries(select);
+    HashSet<string> enabled = getSelectedArraySet(select);
     select->RemoveAllArrays();
 
     // TODO - currently only get fields from ONE cloud
@@ -631,25 +631,7 @@ void Foam::vtkPVFoam::updateInfoLagrangianFields
     addToSelection<IOField<tensor>>(select, objects);
 
     // Restore the enabled selections
-    setSelectedArrayEntries(select, enabledEntries);
-
-    if (debug > 1)
-    {
-        boolList status;
-        const label nElem = getSelected(status, select);
-
-        forAll(status, i)
-        {
-            Info<< "  lagrangian[" << i << "] = "
-                << status[i]
-                << " : " << select->GetArrayName(i) << nl;
-        }
-
-        if (!nElem)
-        {
-            Info<< "  lagrangian[none]" << nl;
-        }
-    }
+    setSelectedArrayEntries(select, enabled);
 
     if (debug)
     {
diff --git a/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamUpdateTemplates.C b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamUpdateTemplates.C
index 5f4d78a163..4f11fdb1d6 100644
--- a/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamUpdateTemplates.C
+++ b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamUpdateTemplates.C
@@ -45,16 +45,16 @@ void Foam::vtkPVFoam::updateInfoFields
             << endl;
     }
 
-    HashSet<string> enabledEntries;
+    HashSet<string> enabled;
     if (!select->GetNumberOfArrays() && !meshPtr_)
     {
-        // enable 'p' and 'U' only on the first call
-        enabledEntries = { "p", "U" };
+        // Enable 'p' and 'U' only on the first call
+        enabled = { "p", "U" };
     }
     else
     {
-        // preserve the enabled selections
-        enabledEntries = getSelectedArrayEntries(select);
+        // Preserve the enabled selections
+        enabled = getSelectedArraySet(select);
     }
 
     select->RemoveAllArrays();
@@ -127,7 +127,7 @@ void Foam::vtkPVFoam::updateInfoFields
 
 
     // Restore the enabled selections
-    setSelectedArrayEntries(select, enabledEntries);
+    setSelectedArrayEntries(select, enabled);
 
     if (debug)
     {
diff --git a/applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/PVblockMeshReader/pqFoamBlockMeshControls.cxx b/applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/PVblockMeshReader/pqFoamBlockMeshControls.cxx
index abb2c75486..ec60272d5a 100644
--- a/applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/PVblockMeshReader/pqFoamBlockMeshControls.cxx
+++ b/applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/PVblockMeshReader/pqFoamBlockMeshControls.cxx
@@ -40,6 +40,7 @@ License
 // * * * * * * * * * * * * * Static Member Functions * * * * * * * * * * * * //
 
 // file-scope
+// Widget properties
 static QWidget* setWidgetProperties
 (
     QWidget* widget,
@@ -67,6 +68,7 @@ static QWidget* setWidgetProperties
 
 
 // file-scope
+// Button properties
 static QAbstractButton* setButtonProperties
 (
     QAbstractButton* b,
diff --git a/applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/vtkPVblockMesh/vtkPVblockMesh.C b/applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/vtkPVblockMesh/vtkPVblockMesh.C
index d5cddbae3b..70ccb1f420 100644
--- a/applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/vtkPVblockMesh/vtkPVblockMesh.C
+++ b/applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/vtkPVblockMesh/vtkPVblockMesh.C
@@ -60,8 +60,7 @@ namespace Foam
         const Foam::point& pt
     )
     {
-        vtkSmartPointer<vtkTextActor> txt =
-            vtkSmartPointer<vtkTextActor>::New();
+        auto txt = vtkSmartPointer<vtkTextActor>::New();
 
         txt->SetInput(s.c_str());
 
@@ -310,8 +309,8 @@ void Foam::vtkPVblockMesh::updateInfo()
     HashSet<string> enabledEdges;
     if (!firstTime)
     {
-        enabledParts = getSelectedArrayEntries(blockSelection);
-        enabledEdges = getSelectedArrayEntries(edgeSelection);
+        enabledParts = getSelectedArraySet(blockSelection);
+        enabledEdges = getSelectedArraySet(edgeSelection);
     }
 
     // Clear current mesh parts list
@@ -407,14 +406,6 @@ void Foam::vtkPVblockMesh::Update
 {
     reader_->UpdateProgress(0.1);
 
-    // Set up mesh parts selection(s)
-    getSelected(blockStatus_, reader_->GetBlockSelection());
-
-    // Set up curved edges selection(s)
-    getSelected(edgeStatus_,  reader_->GetCurvedEdgesSelection());
-
-    reader_->UpdateProgress(0.2);
-
     // Update the OpenFOAM mesh
     updateFoamMesh();
     reader_->UpdateProgress(0.5);
@@ -427,7 +418,6 @@ void Foam::vtkPVblockMesh::Update
     convertMeshEdges(output, blockNo);
 
     reader_->UpdateProgress(0.8);
-
 }
 
 
diff --git a/applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/vtkPVblockMesh/vtkPVblockMesh.H b/applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/vtkPVblockMesh/vtkPVblockMesh.H
index 04eaa69981..1a85c65529 100644
--- a/applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/vtkPVblockMesh/vtkPVblockMesh.H
+++ b/applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/vtkPVblockMesh/vtkPVblockMesh.H
@@ -25,13 +25,18 @@ Class
     Foam::vtkPVblockMesh
 
 Description
-    Provides a reader interface for OpenFOAM blockMesh to VTK interaction
+    The backend for the vtkPVblockMeshReader reader module -
+    providing a paraview reader interface for OpenFOAM blockMesh.
+
+    The block reader module can assist when creating a blockMeshDict
+    for use with the blockMesh utility. As well as blocks, it can be
+    used to visualize edges,corners and patch names.
+
+    There is no native VTK equivalent for this functionality.
 
 SourceFiles
     vtkPVblockMesh.C
     vtkPVblockMeshConvert.C
-    vtkPVblockMeshUpdate.C
-    vtkPVblockMeshUtils.C
 
     // Needed by VTK:
     vtkDataArrayTemplateImplicit.txx
@@ -95,12 +100,6 @@ class vtkPVblockMesh
         //- The mesh directory for the region
         fileName meshDir_;
 
-        //- Selected geometrical parts
-        boolList blockStatus_;
-
-        //- Selected curved edges
-        boolList edgeStatus_;
-
         //- First instance and size of bleckMesh blocks
         //  used to index into blockStatus_
         arrayRange rangeBlocks_;
diff --git a/applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/vtkPVblockMesh/vtkPVblockMeshConvert.C b/applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/vtkPVblockMesh/vtkPVblockMeshConvert.C
index 81cf868956..032a5b011a 100644
--- a/applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/vtkPVblockMesh/vtkPVblockMeshConvert.C
+++ b/applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/vtkPVblockMesh/vtkPVblockMeshConvert.C
@@ -53,7 +53,11 @@ void Foam::vtkPVblockMesh::convertMeshBlocks
         Info<< "<beg> convertMeshBlocks" << endl;
     }
 
-    vtkDataArraySelection* selection = reader_->GetBlockSelection();
+    const Map<string> blockStatus = getSelectedArrayMap
+    (
+        reader_->GetBlockSelection()
+    );
+
     arrayRange& range = rangeBlocks_;
     range.block(blockNo);   // set output block
     label datasetNo = 0;    // restart at dataset 0
@@ -61,29 +65,23 @@ void Foam::vtkPVblockMesh::convertMeshBlocks
     const blockMesh& blkMesh = *meshPtr_;
     const pointField blkPoints(blkMesh.vertices() * blkMesh.scaleFactor());
 
-    int blockI = 0;
-    for
-    (
-        auto iter = range.cbegin();
-        iter != range.cend();
-        ++iter, ++blockI
-    )
+    vtkIdType nodeIds[8];  // Space for VTK_HEXAHEDRON vertices
+    int blockId = -1;
+    for (auto partId : range)
     {
-        const auto partId = *iter;
-        if (!blockStatus_[partId])
+        ++blockId; // Increment first
+        if (!blockStatus.found(partId))
         {
             continue;
         }
+        const auto& longName = blockStatus[partId];
 
-        const blockDescriptor& blockDef = blkMesh[blockI];
+        const blockDescriptor& blockDef = blkMesh[blockId];
         const labelList& blockLabels = blockDef.blockShape();
 
-        vtkSmartPointer<vtkPoints> vtkpoints =
-            vtkSmartPointer<vtkPoints>::New();
-
+        auto vtkpoints = vtkSmartPointer<vtkPoints>::New();
         vtkpoints->SetNumberOfPoints(blockLabels.size());
 
-        vtkIdType nodeIds[8];
         forAll(blockLabels, pointi)
         {
             vtkpoints->SetPoint
@@ -94,8 +92,7 @@ void Foam::vtkPVblockMesh::convertMeshBlocks
             nodeIds[pointi] = pointi;
         }
 
-        vtkSmartPointer<vtkUnstructuredGrid> vtkmesh =
-            vtkSmartPointer<vtkUnstructuredGrid>::New();
+        auto vtkmesh = vtkSmartPointer<vtkUnstructuredGrid>::New();
 
         vtkmesh->Allocate(1);
         vtkmesh->InsertNextCell
@@ -107,11 +104,7 @@ void Foam::vtkPVblockMesh::convertMeshBlocks
 
         vtkmesh->SetPoints(vtkpoints);
 
-        addToBlock
-        (
-            output, vtkmesh, range, datasetNo,
-            selection->GetArrayName(partId)
-        );
+        addToBlock(output, vtkmesh, range, datasetNo, longName);
         ++datasetNo;
     }
 
@@ -135,7 +128,11 @@ void Foam::vtkPVblockMesh::convertMeshEdges
     int& blockNo
 )
 {
-    vtkDataArraySelection* selection = reader_->GetCurvedEdgesSelection();
+    const Map<string> edgeStatus = getSelectedArrayMap
+    (
+        reader_->GetCurvedEdgesSelection()
+    );
+
     arrayRange& range = rangeEdges_;
 
     range.block(blockNo);      // set output block
@@ -145,24 +142,20 @@ void Foam::vtkPVblockMesh::convertMeshEdges
     const blockEdgeList& edges = blkMesh.edges();
     const scalar scaleFactor = blkMesh.scaleFactor();
 
-    int edgeI = 0;
-    for
-    (
-        auto iter = range.cbegin();
-        iter != range.cend();
-        ++iter, ++edgeI
-    )
+    int edgeId = -1;
+    for (auto partId : range)
     {
-        const auto partId = *iter;
-        if (!edgeStatus_[partId])
+        ++edgeId; // Increment first
+        if (!edgeStatus.found(partId))
         {
             continue;
         }
+        const auto& longName = edgeStatus[partId];
 
-        // search each block
-        forAll(blkMesh, blockI)
+        // Search each block
+        forAll(blkMesh, blockId)
         {
-            const blockDescriptor& blockDef = blkMesh[blockI];
+            const blockDescriptor& blockDef = blkMesh[blockId];
 
             edgeList blkEdges = blockDef.blockShape().edges();
 
@@ -175,7 +168,7 @@ void Foam::vtkPVblockMesh::convertMeshEdges
             label foundEdgeI = -1;
             forAll(blkEdges, blkEdgeI)
             {
-                if (edges[edgeI].compare(blkEdges[blkEdgeI]))
+                if (edges[edgeId].compare(blkEdges[blkEdgeI]))
                 {
                     foundEdgeI = blkEdgeI;
                     break;
@@ -186,9 +179,7 @@ void Foam::vtkPVblockMesh::convertMeshEdges
             {
                 const List<point>& edgePoints = edgesPoints[foundEdgeI];
 
-                vtkSmartPointer<vtkPoints> vtkpoints =
-                    vtkSmartPointer<vtkPoints>::New();
-
+                auto vtkpoints = vtkSmartPointer<vtkPoints>::New();
                 vtkpoints->SetNumberOfPoints(edgePoints.size());
 
                 vtkIdType pointIds[edgePoints.size()];
@@ -200,8 +191,7 @@ void Foam::vtkPVblockMesh::convertMeshEdges
                     pointIds[pointi] = pointi;
                 }
 
-                vtkSmartPointer<vtkPolyData> vtkmesh =
-                    vtkSmartPointer<vtkPolyData>::New();
+                auto vtkmesh = vtkSmartPointer<vtkPolyData>::New();
 
                 vtkmesh->Allocate(1);
                 vtkmesh->InsertNextCell
@@ -213,11 +203,7 @@ void Foam::vtkPVblockMesh::convertMeshEdges
 
                 vtkmesh->SetPoints(vtkpoints);
 
-                addToBlock
-                (
-                    output, vtkmesh, range, datasetNo,
-                    selection->GetArrayName(partId)
-                );
+                addToBlock(output, vtkmesh, range, datasetNo, longName);
                 ++datasetNo;
 
                 break;
@@ -253,35 +239,23 @@ void Foam::vtkPVblockMesh::convertMeshCorners
 
     if (debug)
     {
-        Info<< "<beg> convertMeshCorners" << endl;
+        Info<< "<beg> " << FUNCTION_NAME << endl;
     }
 
-    if (true)  // or some flag or other condition
+    if (true)  // Or some flag or other condition
     {
-        vtkSmartPointer<vtkPolyData> vtkmesh =
-            vtkSmartPointer<vtkPolyData>::New();
-
-        vtkSmartPointer<vtkPoints> vtkpoints =
-            vtkSmartPointer<vtkPoints>::New();
-
-        vtkSmartPointer<vtkCellArray> vtkcells =
-            vtkSmartPointer<vtkCellArray>::New();
-
+        auto vtkpoints = vtkSmartPointer<vtkPoints>::New();
         vtkpoints->SetNumberOfPoints(blkPoints.size());
-        vtkcells->Allocate(2*blkPoints.size());
-        // If reusing memory, ensure insert always starts from 0
-        vtkcells->Reset();
 
-        vtkIdType pointId = 0;
         forAll(blkPoints, pointi)
         {
             vtkpoints->SetPoint(pointi, blkPoints[pointi].v_);
-            vtkcells->InsertNextCell(1, &pointId);  // VTK_VERTEX
-            pointId++;
         }
 
+        auto vtkmesh = vtkSmartPointer<vtkPolyData>::New();
+
         vtkmesh->SetPoints(vtkpoints);
-        vtkmesh->SetVerts(vtkcells);
+        vtkmesh->SetVerts(foamPvCore::identityVertices(blkPoints.size()));
 
         addToBlock(output, vtkmesh, range, datasetNo, range.name());
         ++datasetNo;
@@ -295,7 +269,7 @@ void Foam::vtkPVblockMesh::convertMeshCorners
 
     if (debug)
     {
-        Info<< "<end> convertMeshCorners" << endl;
+        Info<< "<end> " << FUNCTION_NAME << endl;
     }
 }
 
diff --git a/applications/utilities/postProcessing/graphics/PVReaders/foamPv/foamPvCore.C b/applications/utilities/postProcessing/graphics/PVReaders/foamPv/foamPvCore.C
index 7e67d10a11..57e52af03d 100644
--- a/applications/utilities/postProcessing/graphics/PVReaders/foamPv/foamPvCore.C
+++ b/applications/utilities/postProcessing/graphics/PVReaders/foamPv/foamPvCore.C
@@ -34,6 +34,8 @@ License
 #include "vtkInformation.h"
 #include "vtkSmartPointer.h"
 
+#include "foamVtkAdaptors.H"
+
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
 namespace Foam
@@ -82,7 +84,7 @@ void Foam::foamPvCore::addToBlock
 
     block->SetBlock(datasetNo, dataset);
 
-    // name the output block when assigning dataset 0
+    // Name the output block when assigning dataset 0
     if (datasetNo == 0)
     {
         output->GetMetaData(blockNo)->Set
@@ -103,34 +105,6 @@ void Foam::foamPvCore::addToBlock
 }
 
 
-int Foam::foamPvCore::getSelected
-(
-    boolList& status,
-    vtkDataArraySelection* selection
-)
-{
-    const int n = selection->GetNumberOfArrays();
-    if (status.size() != n)
-    {
-        status.setSize(n);
-        status = false;
-    }
-
-    int count = 0;
-    forAll(status, i)
-    {
-        const bool setting = selection->GetArraySetting(i);
-        if (setting)
-        {
-            ++count;
-        }
-        status[i] = setting;
-    }
-
-    return count;
-}
-
-
 Foam::hashedWordList Foam::foamPvCore::getSelected
 (
     vtkDataArraySelection* select
@@ -173,54 +147,15 @@ Foam::hashedWordList Foam::foamPvCore::getSelected
 
 
 Foam::HashSet<Foam::string>
-Foam::foamPvCore::getSelectedArrayEntries
+Foam::foamPvCore::getSelectedArraySet
 (
     vtkDataArraySelection* select
 )
-{
-    const int n = select->GetNumberOfArrays();
-    HashSet<string> selections(2*n);
-
-    for (int i=0; i < n; ++i)
-    {
-        if (select->GetArraySetting(i))
-        {
-            selections.insert(select->GetArrayName(i));
-        }
-    }
-
-    if (debug > 1)
-    {
-        const int n = select->GetNumberOfArrays();
-        Info<< "available(";
-        for (int i=0; i < n; ++i)
-        {
-            Info<< " \"" << select->GetArrayName(i) << "\"";
-        }
-        Info<< " )\nselected(";
-
-        for (auto k : selections)
-        {
-            Info<< " " << k;
-        }
-        Info<< " )\n";
-    }
-
-    return selections;
-}
-
-
-Foam::HashSet<Foam::string>
-Foam::foamPvCore::getSelectedArrayEntries
-(
-    vtkDataArraySelection* select,
-    const arrayRange& slice
-)
 {
     const int n = select->GetNumberOfArrays();
     HashSet<string> enabled(2*n);
 
-    for (auto i : slice)
+    for (int i=0; i < n; ++i)
     {
         if (select->GetArraySetting(i))
         {
@@ -230,8 +165,9 @@ Foam::foamPvCore::getSelectedArrayEntries
 
     if (debug > 1)
     {
+        const int n = select->GetNumberOfArrays();
         Info<< "available(";
-        for (auto i : slice)
+        for (int i=0; i < n; ++i)
         {
             Info<< " \"" << select->GetArrayName(i) << "\"";
         }
@@ -248,25 +184,24 @@ Foam::foamPvCore::getSelectedArrayEntries
 }
 
 
-void Foam::foamPvCore::setSelectedArrayEntries
+Foam::Map<Foam::string>
+Foam::foamPvCore::getSelectedArrayMap
 (
-    vtkDataArraySelection* select,
-    const HashSet<string>& enabled
+    vtkDataArraySelection* select
 )
 {
     const int n = select->GetNumberOfArrays();
-    // disable everything not explicitly enabled
-    select->DisableAllArrays();
+    Map<string> enabled(2*n);
 
-    // Loop through entries, enabling as required
     for (int i=0; i < n; ++i)
     {
-        const char* arrayName = select->GetArrayName(i);
-        if (enabled.found(arrayName))
+        if (select->GetArraySetting(i))
         {
-            select->EnableArray(arrayName);
+            enabled.insert(i, select->GetArrayName(i));
         }
     }
+
+    return enabled;
 }
 
 
@@ -312,4 +247,29 @@ void Foam::foamPvCore::printMemory()
 }
 
 
+vtkSmartPointer<vtkCellArray> Foam::foamPvCore::identityVertices
+(
+    const label size
+)
+{
+    // VTK_VERTEX
+    auto cells = vtkSmartPointer<vtkCellArray>::New();
+
+    UList<vtkIdType> cellsUL = vtkUList(cells, size, 2*size);
+
+    // Cell connectivity for vertex
+    // [size, ids.., size, ids...]
+    // which means
+    // [1, id, 1, id, ...]
+    label idx = 0;
+    for (label id=0; id < size; ++id)
+    {
+        cellsUL[idx++] = 1;
+        cellsUL[idx++] = id;
+    }
+
+    return cells;
+}
+
+
 // ************************************************************************* //
diff --git a/applications/utilities/postProcessing/graphics/PVReaders/foamPv/foamPvCore.H b/applications/utilities/postProcessing/graphics/PVReaders/foamPv/foamPvCore.H
index e4ab28316d..3bbc92855e 100644
--- a/applications/utilities/postProcessing/graphics/PVReaders/foamPv/foamPvCore.H
+++ b/applications/utilities/postProcessing/graphics/PVReaders/foamPv/foamPvCore.H
@@ -40,17 +40,19 @@ SourceFiles
 #include "wordList.H"
 #include "Hash.H"
 #include "HashSet.H"
+#include "Map.H"
 #include "hashedWordList.H"
 #include "labelRange.H"
 
-#include "vtkPoints.h"
-
 // * * * * * * * * * * * * * Forward Declarations  * * * * * * * * * * * * * //
 
+class vtkCellArray;
 class vtkDataArraySelection;
 class vtkDataSet;
-class vtkMultiBlockDataSet;
 class vtkIndent;
+class vtkMultiBlockDataSet;
+class vtkPoints;
+template<class T> class vtkSmartPointer;
 
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -168,13 +170,6 @@ public:
     );
 
 
-    //- Retrieve the current selections into a boolList
-    static int getSelected
-    (
-        boolList& lst,
-        vtkDataArraySelection* select
-    );
-
     //- Retrieve the current selections as a hashedWordList,
     //  while stripping off any prefix or suffix
     static hashedWordList getSelected
@@ -192,25 +187,24 @@ public:
     );
 
 
-    //- Retrieve the currently enabled selections
-    static HashSet<string> getSelectedArrayEntries
+    //- Retrieve the currently enabled selections as hashset
+    static HashSet<string> getSelectedArraySet
     (
         vtkDataArraySelection* select
     );
 
-    //- Retrieve a sub-list of the currently enabled selections
-    static HashSet<string> getSelectedArrayEntries
+    //- Retrieve the currently enabled selections as id/name map
+    static Map<string> getSelectedArrayMap
     (
-        vtkDataArraySelection* select,
-        const arrayRange& slice
+        vtkDataArraySelection* select
     );
 
-
     //- Enable the selection(s)
+    template<class AnyValue, class AnyHasher>
     static void setSelectedArrayEntries
     (
         vtkDataArraySelection* select,
-        const HashSet<string>& enabled
+        const HashTable<AnyValue, string, AnyHasher>& enabled
     );
 
 
@@ -222,6 +216,13 @@ public:
     static void printMemory();
 
 
+    //- Return an identity list of VTK_VERTEX
+    static vtkSmartPointer<vtkCellArray> identityVertices
+    (
+        const label size
+    );
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 }; // End class foamPvCore
diff --git a/applications/utilities/postProcessing/graphics/PVReaders/foamPv/foamPvCoreTemplates.C b/applications/utilities/postProcessing/graphics/PVReaders/foamPv/foamPvCoreTemplates.C
index 46c4bf3eb7..54eeee88c0 100644
--- a/applications/utilities/postProcessing/graphics/PVReaders/foamPv/foamPvCoreTemplates.C
+++ b/applications/utilities/postProcessing/graphics/PVReaders/foamPv/foamPvCoreTemplates.C
@@ -54,4 +54,27 @@ Foam::label Foam::foamPvCore::addToSelection
 }
 
 
+template<class AnyValue, class AnyHasher>
+void Foam::foamPvCore::setSelectedArrayEntries
+(
+    vtkDataArraySelection* select,
+    const HashTable<AnyValue, string, AnyHasher>& enabled
+)
+{
+    const int n = select->GetNumberOfArrays();
+    // disable everything not explicitly enabled
+    select->DisableAllArrays();
+
+    // Loop through entries, enabling as required
+    for (int i=0; i < n; ++i)
+    {
+        const char* arrayName = select->GetArrayName(i);
+        if (enabled.found(arrayName))
+        {
+            select->EnableArray(arrayName);
+        }
+    }
+}
+
+
 // ************************************************************************* //
diff --git a/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/foamVtkAdaptors.H b/applications/utilities/postProcessing/graphics/PVReaders/foamPv/foamVtkAdaptors.H
similarity index 100%
rename from applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/foamVtkAdaptors.H
rename to applications/utilities/postProcessing/graphics/PVReaders/foamPv/foamVtkAdaptors.H

From 03944c2a2694cbd6217f40658e8d1c2290e4d5cc Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Tue, 30 May 2017 10:34:01 +0200
Subject: [PATCH 16/27] ENH: support enumerations for vtk xml file tags and
 some legacy text elements

---
 src/fileFormats/Make/files                    |   1 +
 src/fileFormats/vtk/format/foamVtkFormatter.C | 122 +-----------
 src/fileFormats/vtk/format/foamVtkFormatter.H |  65 ++++---
 .../vtk/format/foamVtkFormatterI.H            | 183 ++++++++++++++++++
 src/fileFormats/vtk/output/foamVtkOutput.C    |  46 ++++-
 src/fileFormats/vtk/output/foamVtkOutput.H    |  41 +++-
 src/fileFormats/vtk/type/foamVtkFileEnums.C   |  64 ++++++
 src/fileFormats/vtk/type/foamVtkFileEnums.H   |  90 +++++++++
 8 files changed, 450 insertions(+), 162 deletions(-)
 create mode 100644 src/fileFormats/vtk/format/foamVtkFormatterI.H
 create mode 100644 src/fileFormats/vtk/type/foamVtkFileEnums.C
 create mode 100644 src/fileFormats/vtk/type/foamVtkFileEnums.H

diff --git a/src/fileFormats/Make/files b/src/fileFormats/Make/files
index cff7f7c33f..c2024986a3 100644
--- a/src/fileFormats/Make/files
+++ b/src/fileFormats/Make/files
@@ -26,6 +26,7 @@ vtk/format/foamVtkLegacyRawFormatter.C
 vtk/output/foamVtkOutput.C
 vtk/output/foamVtkOutputOptions.C
 vtk/read/vtkUnstructuredReader.C
+vtk/type/foamVtkFileEnums.C
 vtk/type/foamVtkPTraits.C
 
 coordSet/coordSet.C
diff --git a/src/fileFormats/vtk/format/foamVtkFormatter.C b/src/fileFormats/vtk/format/foamVtkFormatter.C
index 79a420e585..bc8c4696ea 100644
--- a/src/fileFormats/vtk/format/foamVtkFormatter.C
+++ b/src/fileFormats/vtk/format/foamVtkFormatter.C
@@ -24,16 +24,6 @@ License
 
 #include "foamVtkFormatter.H"
 
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
-
-Foam::foamVtkOutput::formatter::formatter(std::ostream& os)
-:
-    os_(os),
-    xmlTags_(),
-    inTag_(false)
-{}
-
-
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
 
 Foam::foamVtkOutput::formatter::~formatter()
@@ -92,19 +82,20 @@ Foam::foamVtkOutput::formatter::comment(const std::string& text)
 
 
 Foam::foamVtkOutput::formatter&
-Foam::foamVtkOutput::formatter::openTag(const word& tag)
+Foam::foamVtkOutput::formatter::openTag(const word& tagName)
 {
     if (inTag_)
     {
         WarningInFunction
-            << "open XML tag '" << tag << "', but already within a tag!"
+            << "open XML tag '" << tagName
+            << "', but already within a tag!"
             << endl;
     }
 
     indent();
-    os_ << '<' << tag;
+    os_ << '<' << tagName;
 
-    xmlTags_.push(tag);
+    xmlTags_.push(tagName);
     inTag_ = true;
 
     return *this;
@@ -136,7 +127,7 @@ Foam::foamVtkOutput::formatter::closeTag(const bool isEmpty)
 
 
 Foam::foamVtkOutput::formatter&
-Foam::foamVtkOutput::formatter::endTag(const word& tag)
+Foam::foamVtkOutput::formatter::endTag(const word& tagName)
 {
     const word curr = xmlTags_.pop();
     indent();
@@ -150,10 +141,10 @@ Foam::foamVtkOutput::formatter::endTag(const word& tag)
     }
 
     // verify inTag_
-    if (!tag.empty() && tag != curr)
+    if (!tagName.empty() && tagName != curr)
     {
         WarningInFunction
-            << "expected to end xml-tag '" << tag
+            << "expected to end xml-tag '" << tagName
             << "' but found '" << curr << "' instead"
             << endl;
     }
@@ -166,16 +157,6 @@ Foam::foamVtkOutput::formatter::endTag(const word& tag)
 }
 
 
-Foam::foamVtkOutput::formatter&
-Foam::foamVtkOutput::formatter::tag(const word& tag)
-{
-    openTag(tag);
-    closeTag();
-
-    return *this;
-}
-
-
 Foam::foamVtkOutput::formatter&
 Foam::foamVtkOutput::formatter::beginVTKFile
 (
@@ -184,7 +165,7 @@ Foam::foamVtkOutput::formatter::beginVTKFile
     const bool leaveOpen
 )
 {
-    openTag("VTKFile");
+    openTag(vtkFileTag::VTK_FILE);
     xmlAttr("type",        contentType);
     xmlAttr("version",     contentVersion);
     xmlAttr("byte_order",  foamVtkPTraits<Foam::endian>::typeName);
@@ -234,89 +215,4 @@ Foam::foamVtkOutput::formatter::xmlAttr
 }
 
 
-Foam::foamVtkOutput::formatter&
-Foam::foamVtkOutput::formatter::xmlAttr
-(
-    const word& k,
-    const int32_t v,
-    const char quote
-)
-{
-    return xmlAttribute(k, v, quote);
-}
-
-
-Foam::foamVtkOutput::formatter&
-Foam::foamVtkOutput::formatter::xmlAttr
-(
-    const word& k,
-    const int64_t v,
-    const char quote
-)
-{
-    return xmlAttribute(k, v, quote);
-}
-
-
-Foam::foamVtkOutput::formatter&
-Foam::foamVtkOutput::formatter::xmlAttr
-(
-    const word& k,
-    const uint64_t v,
-    const char quote
-)
-{
-    return xmlAttribute(k, v, quote);
-}
-
-
-Foam::foamVtkOutput::formatter&
-Foam::foamVtkOutput::formatter::xmlAttr
-(
-    const word& k,
-    const scalar v,
-    const char quote
-)
-{
-    return xmlAttribute(k, v, quote);
-}
-
-
-// * * * * * * * * * * * * * * Member Operators * * * * * * * * * * * * * * //
-
-Foam::foamVtkOutput::formatter&
-Foam::foamVtkOutput::formatter::operator()(const word& k, const std::string& v)
-{
-    return xmlAttr(k, v);
-}
-
-
-Foam::foamVtkOutput::formatter&
-Foam::foamVtkOutput::formatter::operator()(const word& k, const int32_t v)
-{
-    return xmlAttr(k, v);
-}
-
-
-Foam::foamVtkOutput::formatter&
-Foam::foamVtkOutput::formatter::operator()(const word& k, const int64_t v)
-{
-    return xmlAttr(k, v);
-}
-
-
-Foam::foamVtkOutput::formatter&
-Foam::foamVtkOutput::formatter::operator()(const word& k, const uint64_t v)
-{
-    return xmlAttr(k, v);
-}
-
-
-Foam::foamVtkOutput::formatter&
-Foam::foamVtkOutput::formatter::operator()(const word& k, const scalar v)
-{
-    return xmlAttr(k, v);
-}
-
-
 // ************************************************************************* //
diff --git a/src/fileFormats/vtk/format/foamVtkFormatter.H b/src/fileFormats/vtk/format/foamVtkFormatter.H
index 572316e562..1ed43fb45e 100644
--- a/src/fileFormats/vtk/format/foamVtkFormatter.H
+++ b/src/fileFormats/vtk/format/foamVtkFormatter.H
@@ -44,6 +44,7 @@ SourceFiles
 #include "word.H"
 #include "UList.H"
 #include "LIFOStack.H"
+#include "foamVtkFileEnums.H"
 #include "foamVtkPTraits.H"
 #include "foamVtkOutputTypes.H"
 
@@ -89,7 +90,7 @@ protected:
     // Protected Member Functions
 
         //- Construct and attach to an output stream
-        formatter(std::ostream& os);
+        inline formatter(std::ostream& os);
 
 public:
 
@@ -108,11 +109,7 @@ public:
       // Access
 
         //- Access to the underlying output stream
-        inline std::ostream& os()
-        {
-            return os_;
-        }
-
+        inline std::ostream& os();
 
         //- The output formatType.
         virtual enum formatType format() const = 0;
@@ -158,7 +155,11 @@ public:
 
         //- Open XML tag
         //  \return formatter for chaining
-        formatter& openTag(const word& tag);
+        formatter& openTag(const word& tagName);
+
+        //- Open XML tag
+        //  \return formatter for chaining
+        inline formatter& openTag(const vtkFileTag& tagEnum);
 
         //- Close XML tag, optional as an empty container.
         //  Always adds a trailing newline.
@@ -168,11 +169,20 @@ public:
         //- End XML tag, optional with sanity check
         //  Always adds a trailing newline.
         //  \return formatter for chaining
-        formatter& endTag(const word& tag = word::null);
+        formatter& endTag(const word& tagName = word::null);
+
+        //- End XML tag with sanity check
+        //  Always adds a trailing newline.
+        //  \return formatter for chaining
+        inline formatter& endTag(const vtkFileTag& tagEnum);
 
         //- Write XML tag without any attributes. Combines openTag/closeTag.
         //  \return formatter for chaining
-        formatter& tag(const word& tag);
+        inline formatter& tag(const word& tagName);
+
+        //- Write XML tag without any attributes. Combines openTag/closeTag.
+        //  \return formatter for chaining
+        inline formatter& tag(const vtkFileTag& tagEnum);
 
         //- Add a "VTKFile" XML tag for contentType, followed by a tag for
         //  the contentType itself. Optionally leave the contentType tag
@@ -206,26 +216,15 @@ public:
 
         //- End "DataArray" XML tag
         //  \return formatter for chaining
-        inline formatter& endDataArray()
-        {
-            return endTag("DataArray");
-        }
+        inline formatter& endDataArray();
 
         //- End "AppendedData" XML tag
         //  \return formatter for chaining
-        inline formatter& endAppendedData()
-        {
-            flush();     // flush any pending encoded content
-            os_ << '\n'; // clear separation from content.
-            return endTag("AppendedData");
-        }
+        inline formatter& endAppendedData();
 
         //- End "VTKFile" XML tag
         //  \return formatter for chaining
-        inline formatter& endVTKFile()
-        {
-            return endTag("VTKFile");
-        }
+        inline formatter& endVTKFile();
 
 
         //- Write XML attribute
@@ -239,7 +238,7 @@ public:
 
         //- Write XML attribute
         //  \return formatter for chaining
-        formatter& xmlAttr
+        inline formatter& xmlAttr
         (
             const word& k,
             const int32_t v,
@@ -248,7 +247,7 @@ public:
 
         //- Write XML attribute
         //  \return formatter for chaining
-        formatter& xmlAttr
+        inline formatter& xmlAttr
         (
             const word& k,
             const int64_t v,
@@ -257,7 +256,7 @@ public:
 
         //- Write XML attribute
         //  \return formatter for chaining
-        formatter& xmlAttr
+        inline formatter& xmlAttr
         (
             const word& k,
             const uint64_t v,
@@ -266,7 +265,7 @@ public:
 
         //- Write XML attribute
         //  \return formatter for chaining
-        formatter& xmlAttr
+        inline formatter& xmlAttr
         (
             const word& k,
             const scalar v,
@@ -278,23 +277,23 @@ public:
 
         //- Write XML attribute
         //  \return formatter for chaining
-        formatter& operator()(const word& k, const std::string& v);
+        inline formatter& operator()(const word& k, const std::string& v);
 
         //- Write XML attribute
         //  \return formatter for chaining
-        formatter& operator()(const word& k, const int32_t v);
+        inline formatter& operator()(const word& k, const int32_t v);
 
         //- Write XML attribute
         //  \return formatter for chaining
-        formatter& operator()(const word& k, const int64_t v);
+        inline formatter& operator()(const word& k, const int64_t v);
 
         //- Write XML attribute
         //  \return formatter for chaining
-        formatter& operator()(const word& k, const uint64_t v);
+        inline formatter& operator()(const word& k, const uint64_t v);
 
         //- Write XML attribute
         //  \return formatter for chaining
-        formatter& operator()(const word& k, const scalar v);
+        inline formatter& operator()(const word& k, const scalar v);
 
 };
 
@@ -306,6 +305,8 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+#include "foamVtkFormatterI.H"
+
 #ifdef NoRepository
     #include "foamVtkFormatterTemplates.C"
 #endif
diff --git a/src/fileFormats/vtk/format/foamVtkFormatterI.H b/src/fileFormats/vtk/format/foamVtkFormatterI.H
new file mode 100644
index 0000000000..df3a987394
--- /dev/null
+++ b/src/fileFormats/vtk/format/foamVtkFormatterI.H
@@ -0,0 +1,183 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2017 OpenCFD Ltd.
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+inline Foam::foamVtkOutput::formatter::formatter(std::ostream& os)
+:
+    os_(os),
+    xmlTags_(),
+    inTag_(false)
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+inline std::ostream& Foam::foamVtkOutput::formatter::os()
+{
+    return os_;
+}
+
+
+inline Foam::foamVtkOutput::formatter&
+Foam::foamVtkOutput::formatter::openTag(const vtkFileTag& tagEnum)
+{
+    return openTag(vtkFileTagNames[tagEnum]);
+}
+
+
+inline Foam::foamVtkOutput::formatter&
+Foam::foamVtkOutput::formatter::endTag(const vtkFileTag& tagEnum)
+{
+    return endTag(vtkFileTagNames[tagEnum]);
+}
+
+
+inline Foam::foamVtkOutput::formatter&
+Foam::foamVtkOutput::formatter::tag(const word& tagName)
+{
+    openTag(tagName);
+    closeTag();
+
+    return *this;
+}
+
+
+inline Foam::foamVtkOutput::formatter&
+Foam::foamVtkOutput::formatter::tag(const vtkFileTag& tagEnum)
+{
+    return tag(vtkFileTagNames[tagEnum]);
+}
+
+
+inline Foam::foamVtkOutput::formatter&
+Foam::foamVtkOutput::formatter::endDataArray()
+{
+    return endTag("DataArray");
+}
+
+
+inline Foam::foamVtkOutput::formatter&
+Foam::foamVtkOutput::formatter::endAppendedData()
+{
+    flush();     // flush any pending encoded content
+    os_ << '\n'; // clear separation from content.
+    return endTag("AppendedData");
+}
+
+
+inline Foam::foamVtkOutput::formatter&
+Foam::foamVtkOutput::formatter::endVTKFile()
+{
+    return endTag(vtkFileTag::VTK_FILE);
+}
+
+
+inline Foam::foamVtkOutput::formatter&
+Foam::foamVtkOutput::formatter::xmlAttr
+(
+    const word& k,
+    const int32_t v,
+    const char quote
+)
+{
+    return xmlAttribute(k, v, quote);
+}
+
+
+inline Foam::foamVtkOutput::formatter&
+Foam::foamVtkOutput::formatter::xmlAttr
+(
+    const word& k,
+    const int64_t v,
+    const char quote
+)
+{
+    return xmlAttribute(k, v, quote);
+}
+
+
+inline Foam::foamVtkOutput::formatter&
+Foam::foamVtkOutput::formatter::xmlAttr
+(
+    const word& k,
+    const uint64_t v,
+    const char quote
+)
+{
+    return xmlAttribute(k, v, quote);
+}
+
+
+inline Foam::foamVtkOutput::formatter&
+Foam::foamVtkOutput::formatter::xmlAttr
+(
+    const word& k,
+    const scalar v,
+    const char quote
+)
+{
+    return xmlAttribute(k, v, quote);
+}
+
+
+// * * * * * * * * * * * * * * Member Operators * * * * * * * * * * * * * * //
+
+inline Foam::foamVtkOutput::formatter&
+Foam::foamVtkOutput::formatter::operator()(const word& k, const std::string& v)
+{
+    return xmlAttr(k, v);
+}
+
+
+inline Foam::foamVtkOutput::formatter&
+Foam::foamVtkOutput::formatter::operator()(const word& k, const int32_t v)
+{
+    return xmlAttr(k, v);
+}
+
+
+inline Foam::foamVtkOutput::formatter&
+Foam::foamVtkOutput::formatter::operator()(const word& k, const int64_t v)
+{
+    return xmlAttr(k, v);
+}
+
+
+inline Foam::foamVtkOutput::formatter&
+Foam::foamVtkOutput::formatter::operator()(const word& k, const uint64_t v)
+{
+    return xmlAttr(k, v);
+}
+
+
+inline Foam::foamVtkOutput::formatter&
+Foam::foamVtkOutput::formatter::operator()(const word& k, const scalar v)
+{
+    return xmlAttr(k, v);
+}
+
+
+// ************************************************************************* //
diff --git a/src/fileFormats/vtk/output/foamVtkOutput.C b/src/fileFormats/vtk/output/foamVtkOutput.C
index b4577fb948..1e66e1cfcc 100644
--- a/src/fileFormats/vtk/output/foamVtkOutput.C
+++ b/src/fileFormats/vtk/output/foamVtkOutput.C
@@ -36,7 +36,24 @@ License
 
 // * * * * * * * * * * * * * * * Static Data * * * * * * * * * * * * * * * * //
 
-const Foam::word Foam::foamVtkOutput::legacy::EXT = "vtk";
+const Foam::Enum<Foam::foamVtkOutput::legacy::textElemType>
+Foam::foamVtkOutput::legacy::textNames
+{
+    { textElemType::POINTS,            "POINTS" },
+    { textElemType::CELLS,             "CELLS" },
+    { textElemType::POLYS,             "POLYGONS" },
+    { textElemType::VERTS,             "VERTICES" },
+    { textElemType::POLY_DATA,         "POLYDATA" },
+    { textElemType::UNSTRUCTURED_GRID, "UNSTRUCTURED_GRID" },
+};
+
+
+const Foam::Enum<Foam::vtkFileTag>
+Foam::foamVtkOutput::legacy::dataTypeNames
+{
+    { vtkFileTag::CELL_DATA,  "CELL_DATA" },
+    { vtkFileTag::POINT_DATA, "POINT_DATA" }
+};
 
 
 // * * * * * * * * * * * * * * Global Functions  * * * * * * * * * * * * * * //
@@ -99,7 +116,7 @@ Foam::label Foam::foamVtkOutput::writeVtmFile
     forAll(files, i)
     {
         vtmFile
-            .openTag("DataSet")
+            .openTag(vtkFileTag::DATA_SET)
             ( "index", i )
             ( "file", files[i] )
             .closeTag(true);
@@ -136,31 +153,40 @@ std::ostream& Foam::foamVtkOutput::legacy::fileHeader
 }
 
 
-std::ostream& Foam::foamVtkOutput::legacy::cellDataHeader
+std::ostream& Foam::foamVtkOutput::legacy::dataHeader
 (
     std::ostream& os,
-    const label nCells,
+    const vtkFileTag& dataTypeTag,
+    const label nEntries,
     const label nFields
 )
 {
-    os  << "CELL_DATA " << nCells << nl
+    os  << dataTypeNames[dataTypeTag] << ' ' << nEntries << nl
         << "FIELD attributes " << nFields << nl;
 
     return os;
 }
 
 
+std::ostream& Foam::foamVtkOutput::legacy::cellDataHeader
+(
+    std::ostream& os,
+    const label nEntries,
+    const label nFields
+)
+{
+    return dataHeader(os, vtkFileTag::CELL_DATA, nEntries, nFields);
+}
+
+
 std::ostream& Foam::foamVtkOutput::legacy::pointDataHeader
 (
     std::ostream& os,
-    const label nPoints,
+    const label nEntries,
     const label nFields
 )
 {
-    os  << "POINT_DATA " << nPoints << nl
-        << "FIELD attributes " << nFields << nl;
-
-    return os;
+    return dataHeader(os, vtkFileTag::POINT_DATA, nEntries, nFields);
 }
 
 
diff --git a/src/fileFormats/vtk/output/foamVtkOutput.H b/src/fileFormats/vtk/output/foamVtkOutput.H
index f9d44d15e4..7c04be9b9d 100644
--- a/src/fileFormats/vtk/output/foamVtkOutput.H
+++ b/src/fileFormats/vtk/output/foamVtkOutput.H
@@ -44,6 +44,7 @@ SourceFiles
 #define foamVtkOutput_H
 
 #include "autoPtr.H"
+#include "Enum.H"
 #include "foamVtkOutputTypes.H"
 #include "foamVtkFormatter.H"
 #include "floatScalar.H"
@@ -120,10 +121,22 @@ namespace foamVtkOutput
 //- Some minimal additional support for writing legacy files
 namespace legacy
 {
-  // Constants
+    //- Some standard text elements for legacy vtk files
+    enum class textElemType
+    {
+        POINTS,             //!< "POINTS"
+        CELLS,              //!< "CELLS"
+        POLYS,              //!< "POLYGONS"
+        VERTS,              //!< "VERTICES"
+        POLY_DATA,          //!< "POLYDATA"
+        UNSTRUCTURED_GRID,  //!< "UNSTRUCTURED_GRID"
+    };
 
-    //- File extension for legacy files (vtk)
-    extern const Foam::word EXT;
+    //- Strings corresponding to the elements
+    extern const Foam::Enum<textElemType> textNames;
+
+    //- Strings corresponding to the elements
+    extern const Foam::Enum<vtkFileTag>   dataTypeNames;
 
 
   // Functions
@@ -145,20 +158,34 @@ namespace legacy
         const std::string& title
     );
 
-    //- Emit header for legacy CELL_DATA
-    std::ostream& cellDataHeader
+
+    //- Emit header for legacy CELL_DATA or POINT_DATA, corresponding to the
+    //  enumeration textElemType::CELLS or textElemType::POINTS, respectively.
+    //  The nEntries corresponds similarly to the number of cells or points,
+    //  respectively.
+    std::ostream& dataHeader
     (
         std::ostream& os,
-        const label nCells,
+        const vtkFileTag& dataTypeTag,
+        const label nEntries,
         const label nFields
     );
 
+    //- Emit header for legacy CELL_DATA.
+    //  The nEntries should normally correspond to the number of cells.
+    std::ostream& cellDataHeader
+    (
+        std::ostream& os,
+        const label nEntries,
+        const label nFields
+    );
 
     //- Emit header for legacy POINT_DATA
+    //  The nEntries should normally correspond to the number of points.
     std::ostream& pointDataHeader
     (
         std::ostream& os,
-        const label nPoints,
+        const label nEntries,
         const label nFields
     );
 
diff --git a/src/fileFormats/vtk/type/foamVtkFileEnums.C b/src/fileFormats/vtk/type/foamVtkFileEnums.C
new file mode 100644
index 0000000000..bf9d0d5cd3
--- /dev/null
+++ b/src/fileFormats/vtk/type/foamVtkFileEnums.C
@@ -0,0 +1,64 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2017 OpenCFD Ltd.
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "foamVtkFileEnums.H"
+#include "Enum.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+const Foam::Enum<Foam::vtkFileTag> Foam::vtkFileTagNames
+(
+    vtkFileTag::VTK_FILE,
+    {
+        "VTKFile",
+        "DataArray",
+        "Piece",
+        "DataSet",
+        "Points",
+        "Cells",
+        "Polys",
+        "Verts",
+        "CellData",
+        "PointData",
+        "PolyData",
+        "UnstructuredGrid",
+    }
+);
+
+
+const Foam::Enum<Foam::vtkFileAttr> Foam::vtkFileAttrNames
+(
+    vtkFileAttr::OFFSET,
+    {
+        "offset",
+        "NumberOfPoints",
+        "NumberOfCells",
+        "NumberOfPolys",
+        "NumberOfVerts"
+    }
+);
+
+
+// ************************************************************************* //
diff --git a/src/fileFormats/vtk/type/foamVtkFileEnums.H b/src/fileFormats/vtk/type/foamVtkFileEnums.H
new file mode 100644
index 0000000000..cb683661c0
--- /dev/null
+++ b/src/fileFormats/vtk/type/foamVtkFileEnums.H
@@ -0,0 +1,90 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2017 OpenCFD Ltd.
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+InNamespace
+    Foam::foam
+
+Description
+    Enumerations for commonly used VTK file items.
+
+SourceFiles
+    foamVtkFileEnums.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef foamVtkFileEnums_H
+#define foamVtkFileEnums_H
+
+#include "Enum.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+//- Some common XML tags for vtk files
+enum class vtkFileTag
+{
+    VTK_FILE,           //!< "VTKFile"
+    DATA_ARRAY,         //!< "DataArray"
+    PIECE,              //!< "Piece"
+    DATA_SET,           //!< "DataSet"
+    POINTS,             //!< "Points"
+    CELLS,              //!< "Cells"
+    POLYS,              //!< "Polys"
+    VERTS,              //!< "Verts"
+    CELL_DATA,          //!< "CellData"
+    POINT_DATA,         //!< "PointData"
+    POLY_DATA,          //!< "PolyData"
+    UNSTRUCTURED_GRID,  //!< "UnstructuredGrid"
+};
+
+//- Strings corresponding to the elements
+extern const Foam::Enum<vtkFileTag> vtkFileTagNames;
+
+
+//- Some common XML attributes for vtk files
+enum class vtkFileAttr
+{
+    OFFSET,             //!< "offset"
+    NUMBER_OF_POINTS,   //!< "NumberOfPoints"
+    NUMBER_OF_CELLS,    //!< "NumberOfCells"
+    NUMBER_OF_POLYS,    //!< "NumberOfPolys"
+    NUMBER_OF_VERTS,    //!< "NumberOfVerts"
+};
+
+//- Strings corresponding to the elements
+extern const Foam::Enum<vtkFileAttr> vtkFileAttrNames;
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //

From c4f13494967276e3eaa0d19ede00ad2f5ace384e Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Wed, 31 May 2017 22:08:54 +0200
Subject: [PATCH 17/27] ENH: construct VTK writers with the outputOptions and
 adjust internally

- this shifts responsibility away from caller to the individual writers
  for knowing which file formats are supported and which file ending is
  appropriate. When the writer receives the output format request,
  it can elect to downgrade or otherwise adjust it to what it can
  actually manage (eg, legacy vs xml vs xml-append).

  But currently still just with legacy format backends.
---
 .../mesh/manipulation/setSet/Make/options     |   1 +
 .../mesh/manipulation/setSet/setSet.C         | 109 ++++++++--------
 .../dataConversion/foamToVTK/foamToVTK.C      |  89 +++++++-------
 .../foamToVTK/foamVtkLagrangianWriter.C       |  34 ++---
 .../foamToVTK/foamVtkLagrangianWriter.H       |  14 ++-
 .../vtk/output/foamVtkInternalWriter.C        |  26 ++--
 .../vtk/output/foamVtkInternalWriter.H        |   9 +-
 .../vtk/output/foamVtkPatchWriter.C           |  47 +++----
 .../vtk/output/foamVtkPatchWriter.H           |  10 +-
 .../vtk/output/foamVtkSurfaceMeshWriter.C     |  33 ++---
 .../vtk/output/foamVtkSurfaceMeshWriter.H     |  10 +-
 .../vtk/output/foamVtkWriteSurfFields.C       |  25 ++--
 .../vtk/output/foamVtkWriteSurfFields.H       |   5 +-
 src/conversion/vtk/part/foamVtkCells.C        |  30 ++++-
 src/conversion/vtk/part/foamVtkCells.H        |  23 ++++
 .../sampledSetWriters/vtk/vtkSetWriter.C      |   1 -
 .../vtk/format/foamVtkAppendBase64Formatter.C |  11 ++
 .../vtk/format/foamVtkAppendBase64Formatter.H |  16 ++-
 .../vtk/format/foamVtkAppendRawFormatter.C    |  11 ++
 .../vtk/format/foamVtkAppendRawFormatter.H    |   9 +-
 .../vtk/format/foamVtkAsciiFormatter.C        |  11 ++
 .../vtk/format/foamVtkAsciiFormatter.H        |   8 +-
 .../vtk/format/foamVtkBase64Formatter.C       |  11 ++
 .../vtk/format/foamVtkBase64Formatter.H       |  11 +-
 .../vtk/format/foamVtkBase64Layer.H           |   1 +
 src/fileFormats/vtk/format/foamVtkFormatter.H |  22 +++-
 .../vtk/format/foamVtkFormatterI.H            |  17 +++
 .../vtk/format/foamVtkFormatterTemplates.C    |  11 ++
 .../vtk/format/foamVtkLegacyAsciiFormatter.C  |  11 ++
 .../vtk/format/foamVtkLegacyAsciiFormatter.H  |  11 +-
 .../vtk/format/foamVtkLegacyRawFormatter.C    |  11 ++
 .../vtk/format/foamVtkLegacyRawFormatter.H    |   8 +-
 src/fileFormats/vtk/output/foamVtkOutput.C    |  12 +-
 src/fileFormats/vtk/output/foamVtkOutput.H    |   1 -
 .../vtk/output/foamVtkOutputOptions.C         | 116 +++++++++++++-----
 .../vtk/output/foamVtkOutputOptions.H         |  18 +--
 .../vtk/output/foamVtkOutputOptionsI.H        |  26 ++--
 src/fileFormats/vtk/type/foamVtkOutputTypes.H |   2 +-
 .../utilities/writeVTK/writeVTK.C             |   7 +-
 .../output/foamVtkWriteCellSetFaces.C         |  24 ++--
 .../output/foamVtkWriteCellSetFaces.H         |   5 +-
 src/meshTools/output/foamVtkWriteFaceSet.C    |  24 ++--
 src/meshTools/output/foamVtkWriteFaceSet.H    |   6 +-
 src/meshTools/output/foamVtkWritePointSet.C   |  22 ++--
 src/meshTools/output/foamVtkWritePointSet.H   |   6 +-
 45 files changed, 593 insertions(+), 322 deletions(-)

diff --git a/applications/utilities/mesh/manipulation/setSet/Make/options b/applications/utilities/mesh/manipulation/setSet/Make/options
index febadade7b..7c01749935 100644
--- a/applications/utilities/mesh/manipulation/setSet/Make/options
+++ b/applications/utilities/mesh/manipulation/setSet/Make/options
@@ -1,4 +1,5 @@
 EXE_INC = \
+    -I$(LIB_SRC)/fileFormats/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
     $(COMP_FLAGS)
 
diff --git a/applications/utilities/mesh/manipulation/setSet/setSet.C b/applications/utilities/mesh/manipulation/setSet/setSet.C
index 361acf1222..eaa89f2fb7 100644
--- a/applications/utilities/mesh/manipulation/setSet/setSet.C
+++ b/applications/utilities/mesh/manipulation/setSet/setSet.C
@@ -76,7 +76,7 @@ void writeVTK
 (
     const polyMesh& mesh,
     const topoSet& currentSet,
-    const fileName& vtkName
+    const fileName& vtkBaseName
 )
 {
     if (isA<faceSet>(currentSet))
@@ -84,10 +84,10 @@ void writeVTK
         // Faces of set with OpenFOAM faceID as value
         foamVtkOutput::writeFaceSet
         (
-            true,
             mesh,
             currentSet,
-            mesh.time().path()/vtkName
+            mesh.time().path()/vtkBaseName,
+            foamVtkOutput::formatType::LEGACY_BINARY
         );
     }
     else if (isA<cellSet>(currentSet))
@@ -95,20 +95,20 @@ void writeVTK
         // External faces of cellset with OpenFOAM cellID as value
         foamVtkOutput::writeCellSetFaces
         (
-            true,
             mesh,
             currentSet,
-            mesh.time().path()/vtkName
+            mesh.time().path()/vtkBaseName,
+            foamVtkOutput::formatType::LEGACY_BINARY
         );
     }
     else if (isA<pointSet>(currentSet))
     {
         foamVtkOutput::writePointSet
         (
-            true,
             mesh,
             currentSet,
-            mesh.time().path()/vtkName
+            mesh.time().path()/vtkBaseName,
+            foamVtkOutput::formatType::LEGACY_BINARY
         );
     }
     else
@@ -123,58 +123,58 @@ void writeVTK
 void printHelp(Ostream& os)
 {
     os  << "Please type 'help', 'list', 'quit', 'time ddd'"
-        << " or a set command after prompt." << endl
-        << "'list' will show all current cell/face/point sets." << endl
-        << "'time ddd' will change the current time." << endl
-        << endl
-        << "A set command should be of the following form" << endl
-        << endl
+        << " or a set command after prompt." << nl
+        << "'list' will show all current cell/face/point sets." << nl
+        << "'time ddd' will change the current time." << nl
+        << nl
+        << "A set command should be of the following form" << nl
+        << nl
         << "    cellSet|faceSet|pointSet <setName> <action> <source>"
-        << endl
-        << endl
-        << "The <action> is one of" << endl
-        << "    list            - prints the contents of the set" << endl
-        << "    clear           - clears the set" << endl
-        << "    invert          - inverts the set" << endl
-        << "    remove          - remove the set" << endl
-        << "    new <source>    - sets to set to the source set" << endl
-        << "    add <source>    - adds all elements from the source set" << endl
-        << "    delete <source> - deletes      ,," << endl
+        << nl
+        << nl
+        << "The <action> is one of" << nl
+        << "    list            - prints the contents of the set" << nl
+        << "    clear           - clears the set" << nl
+        << "    invert          - inverts the set" << nl
+        << "    remove          - remove the set" << nl
+        << "    new <source>    - sets to set to the source set" << nl
+        << "    add <source>    - adds all elements from the source set" << nl
+        << "    delete <source> - deletes      ,," << nl
         << "    subset <source> - combines current set with the source set"
-        << endl
-        << endl
+        << nl
+        << nl
         << "The sources come in various forms. Type a wrong source"
-        << " to see all the types available." << endl
-        << endl
+        << " to see all the types available." << nl
+        << nl
         << "Example: pick up all cells connected by point or face to patch"
-        << " movingWall" << endl
-        << endl
-        << "Pick up all faces of patch:" << endl
-        << "    faceSet f0 new patchToFace movingWall" << endl
-        << "Add faces 0,1,2:" << endl
-        << "    faceSet f0 add labelToFace (0 1 2)" << endl
-        << "Pick up all points used by faces in faceSet f0:" << endl
-        << "    pointSet p0 new faceToPoint f0 all" << endl
-        << "Pick up cell which has any face in f0:" << endl
-        << "    cellSet c0 new faceToCell f0 any" << endl
-        << "Add cells which have any point in p0:" << endl
-        << "    cellSet c0 add pointToCell p0 any" << endl
-        << "List set:" << endl
-        << "    cellSet c0 list" << endl
-        << endl
-        << "Zones can be set using zoneSets from corresponding sets:" << endl
-        << "    cellZoneSet c0Zone new setToCellZone c0" << endl
-        << "    faceZoneSet f0Zone new setToFaceZone f0" << endl
-        << endl
-        << "or if orientation is important:" << endl
-        << "    faceZoneSet f0Zone new setsToFaceZone f0 c0" << endl
-        << endl
-        << "ZoneSets can be manipulated using the general actions:" << endl
-        << "    list            - prints the contents of the set" << endl
-        << "    clear           - clears the set" << endl
+        << " movingWall" << nl
+        << nl
+        << "Pick up all faces of patch:" << nl
+        << "    faceSet f0 new patchToFace movingWall" << nl
+        << "Add faces 0,1,2:" << nl
+        << "    faceSet f0 add labelToFace (0 1 2)" << nl
+        << "Pick up all points used by faces in faceSet f0:" << nl
+        << "    pointSet p0 new faceToPoint f0 all" << nl
+        << "Pick up cell which has any face in f0:" << nl
+        << "    cellSet c0 new faceToCell f0 any" << nl
+        << "Add cells which have any point in p0:" << nl
+        << "    cellSet c0 add pointToCell p0 any" << nl
+        << "List set:" << nl
+        << "    cellSet c0 list" << nl
+        << nl
+        << "Zones can be set using zoneSets from corresponding sets:" << nl
+        << "    cellZoneSet c0Zone new setToCellZone c0" << nl
+        << "    faceZoneSet f0Zone new setToFaceZone f0" << nl
+        << nl
+        << "or if orientation is important:" << nl
+        << "    faceZoneSet f0Zone new setsToFaceZone f0 c0" << nl
+        << nl
+        << "ZoneSets can be manipulated using the general actions:" << nl
+        << "    list            - prints the contents of the set" << nl
+        << "    clear           - clears the set" << nl
         << "    invert          - inverts the set (undefined orientation)"
-        << endl
-        << "    remove          - remove the set" << endl
+        << nl
+        << "    remove          - remove the set" << nl
         << endl;
 }
 
@@ -513,7 +513,6 @@ bool doCommand
                         "VTK"/currentSet.name()/currentSet.name()
                       + "_"
                       + name(mesh.time().timeIndex())
-                      + ".vtk"
                     );
 
                     Info<< "    Writing " << currentSet.name()
diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK.C b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK.C
index 1cc6bed8ec..aff6d2d585 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK.C
+++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK.C
@@ -239,24 +239,32 @@ labelList getSelectedPatches
 // Process args for output options
 // Default from foamVtkOutputOptions is inline ASCII xml
 //
-enum foamVtkOutput::formatType getOutputOptions(const argList& args)
+foamVtkOutput::outputOptions getOutputOptions(const argList& args)
 {
-    if (!args.optionFound("ascii"))
+    foamVtkOutput::outputOptions opts;
+
     {
-        if (sizeof(floatScalar) != 4 || sizeof(label) != 4)
+        opts.legacy(true);
+
+        if (!args.optionFound("ascii"))
         {
-            WarningInFunction
-                << "Using ASCII rather than binary VTK format since "
-                << "floatScalar and/or label are not 4 bytes in size."
-                << nl << endl;
-        }
-        else
-        {
-            return foamVtkOutput::formatType::LEGACY_BINARY;
+            if (sizeof(floatScalar) != 4 || sizeof(label) != 4)
+            {
+                opts.ascii(true);
+
+                WarningInFunction
+                    << "Using ASCII rather than binary VTK format since "
+                    << "floatScalar and/or label are not 4 bytes in size."
+                    << nl << endl;
+            }
+            else
+            {
+                opts.ascii(false);
+            }
         }
     }
 
-    return foamVtkOutput::formatType::LEGACY_ASCII;
+    return opts;
 }
 
 
@@ -398,10 +406,9 @@ int main(int argc, char *argv[])
     const bool doLinks         = !args.optionFound("noLinks");
     const bool useTimeName     = args.optionFound("useTimeName");
     const bool noLagrangian    = args.optionFound("noLagrangian");
+    const bool nearCellValue   = args.optionFound("nearCellValue");
 
-    const enum foamVtkOutput::formatType fmtType = getOutputOptions(args);
-    const bool binary = (fmtType == foamVtkOutput::formatType::LEGACY_BINARY);
-    const bool nearCellValue = args.optionFound("nearCellValue");
+    const foamVtkOutput::outputOptions fmtType = getOutputOptions(args);
 
     if (nearCellValue)
     {
@@ -495,11 +502,7 @@ int main(int argc, char *argv[])
     meshSubsetHelper meshRef(mesh, meshSubsetHelper::SET, cellSetName);
 
     // Collect decomposition information etc.
-    foamVtkCells foamVtkMeshCells
-    (
-        foamVtkCells::contentType::LEGACY,
-        decomposePoly
-    );
+    foamVtkCells foamVtkMeshCells(fmtType, decomposePoly);
 
     Info<< "VTK mesh topology: "
         << timer.cpuTimeIncrement() << " s, "
@@ -545,17 +548,16 @@ int main(int argc, char *argv[])
                 fvPath/set.name()/set.name()
               + "_"
               + timeDesc
-              + ".vtk"
             );
             Info<< "    faceSet   : "
                 << relativeName(runTime, outputName) << nl;
 
             foamVtkOutput::writeFaceSet
             (
-                binary,
                 meshRef.mesh(),
                 set,
-                outputName
+                outputName,
+                fmtType
             );
             continue;
         }
@@ -574,17 +576,16 @@ int main(int argc, char *argv[])
                 fvPath/set.name()/set.name()
               + "_"
               + timeDesc
-              + ".vtk"
             );
             Info<< "    pointSet  : "
                 << relativeName(runTime, outputName) << nl;
 
             foamVtkOutput::writePointSet
             (
-                binary,
                 meshRef.mesh(),
                 set,
-                outputName
+                outputName,
+                fmtType
             );
             continue;
         }
@@ -594,7 +595,7 @@ int main(int argc, char *argv[])
         IOobjectList objects(mesh, runTime.timeName());
 
         HashSet<word> selectedFields;
-        bool specifiedFields = args.optionReadIfPresent
+        const bool specifiedFields = args.optionReadIfPresent
         (
             "fields",
             selectedFields
@@ -836,7 +837,6 @@ int main(int argc, char *argv[])
                 fvPath/vtkName
               + "_"
               + timeDesc
-              + ".vtk"
             );
             Info<< "    Internal  : "
                 << relativeName(runTime, outputName) << endl;
@@ -845,9 +845,9 @@ int main(int argc, char *argv[])
             foamVtkOutput::internalWriter writer
             (
                 meshRef.baseMesh(),
-                fmtType,
                 foamVtkMeshCells,
-                outputName
+                outputName,
+                fmtType
             );
 
             // CellData
@@ -963,14 +963,13 @@ int main(int argc, char *argv[])
                   / "surfaceFields"
                   + "_"
                   + timeDesc
-                  + ".vtk"
                 );
 
                 foamVtkOutput::writeSurfFields
                 (
-                    binary,
                     meshRef.mesh(),
                     outputName,
+                    fmtType,
                     sVectorFld
                 );
             }
@@ -995,7 +994,6 @@ int main(int argc, char *argv[])
               / (meshRef.useSubMesh() ? cellSetName : "allPatches")
               + "_"
               + timeDesc
-              + ".vtk"
             );
             Info<< "    Combined patches     : "
                 << relativeName(runTime, outputName) << nl;
@@ -1003,9 +1001,9 @@ int main(int argc, char *argv[])
             foamVtkOutput::patchWriter writer
             (
                 meshRef.mesh(),
-                binary,
-                nearCellValue,
                 outputName,
+                fmtType,
+                nearCellValue,
                 getSelectedPatches(patches, excludePatches)
             );
 
@@ -1064,7 +1062,6 @@ int main(int argc, char *argv[])
                   / (meshRef.useSubMesh() ? cellSetName : pp.name())
                   + "_"
                   + timeDesc
-                  + ".vtk"
                 );
                 Info<< "    Patch     : "
                     << relativeName(runTime, outputName) << nl;
@@ -1072,9 +1069,9 @@ int main(int argc, char *argv[])
                 foamVtkOutput::patchWriter writer
                 (
                     meshRef.mesh(),
-                    binary,
-                    nearCellValue,
                     outputName,
+                    fmtType,
+                    nearCellValue,
                     labelList{patchi}
                 );
 
@@ -1168,7 +1165,6 @@ int main(int argc, char *argv[])
                   / (meshRef.useSubMesh() ? cellSetName : fz.name())
                   + "_"
                   + timeDesc
-                  + ".vtk"
                 );
                 Info<< "    FaceZone  : "
                     << relativeName(runTime, outputName) << nl;
@@ -1181,10 +1177,10 @@ int main(int argc, char *argv[])
 
                 foamVtkOutput::surfaceMeshWriter writer
                 (
-                    binary,
                     pp,
                     fz.name(),
-                    outputName
+                    outputName,
+                    fmtType
                 );
 
                 // Number of fields
@@ -1214,7 +1210,7 @@ int main(int argc, char *argv[])
             fileName outputName
             (
                 fvPath/cloud::prefix/cloudName/cloudName
-              + "_" + timeDesc + ".vtk"
+              + "_" + timeDesc
             );
             Info<< "    Lagrangian: "
                 << relativeName(runTime, outputName) << nl;
@@ -1267,10 +1263,9 @@ int main(int argc, char *argv[])
                 foamVtkOutput::lagrangianWriter writer
                 (
                     meshRef.mesh(),
-                    binary,
-                    outputName,
                     cloudName,
-                    false
+                    outputName,
+                    fmtType
                 );
 
                 // Write number of fields
@@ -1299,9 +1294,9 @@ int main(int argc, char *argv[])
                 foamVtkOutput::lagrangianWriter writer
                 (
                     meshRef.mesh(),
-                    binary,
-                    outputName,
                     cloudName,
+                    outputName,
+                    fmtType,
                     true
                 );
 
diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamVtkLagrangianWriter.C b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamVtkLagrangianWriter.C
index 123357e18d..c01cd0b9a4 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamVtkLagrangianWriter.C
+++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamVtkLagrangianWriter.C
@@ -32,30 +32,30 @@ License
 Foam::foamVtkOutput::lagrangianWriter::lagrangianWriter
 (
     const fvMesh& mesh,
-    const bool binary,
-    const fileName& fName,
     const word& cloudName,
+    const fileName& baseName,
+    const foamVtkOutput::outputOptions outOpts,
     const bool dummyCloud
 )
 :
     mesh_(mesh),
     format_(),
     cloudName_(cloudName),
-    os_(fName.c_str()),
+    os_(),
     nParcels_(0)
 {
-    format_ = foamVtkOutput::newFormatter
-    (
-        os_,
-        (
-            binary
-          ? foamVtkOutput::LEGACY_BINARY
-          : foamVtkOutput::LEGACY_ASCII
-        )
-    );
+    outputOptions opts(outOpts);
+    opts.legacy(true);  // Legacy only, no append
 
-    foamVtkOutput::legacy::fileHeader(format(), mesh_.time().caseName())
-        << "DATASET POLYDATA" << nl;
+    os_.open((baseName + (opts.legacy() ? ".vtk" : ".vtp")).c_str());
+
+    format_ = opts.newFormatter(os_);
+
+    if (opts.legacy())
+    {
+        foamVtkOutput::legacy::fileHeader(format(), mesh_.time().caseName())
+            << "DATASET POLYDATA" << nl;
+    }
 
     if (dummyCloud)
     {
@@ -80,6 +80,12 @@ Foam::foamVtkOutput::lagrangianWriter::lagrangianWriter
 }
 
 
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+Foam::foamVtkOutput::lagrangianWriter::~lagrangianWriter()
+{}
+
+
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 void Foam::foamVtkOutput::lagrangianWriter::beginParcelData
diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamVtkLagrangianWriter.H b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamVtkLagrangianWriter.H
index 8d4103c53d..1d7e5105d8 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamVtkLagrangianWriter.H
+++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamVtkLagrangianWriter.H
@@ -40,7 +40,7 @@ SourceFiles
 #include "Cloud.H"
 #include "volFields.H"
 #include "pointFields.H"
-#include "foamVtkOutput.H"
+#include "foamVtkOutputOptions.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -76,13 +76,17 @@ public:
         lagrangianWriter
         (
             const fvMesh& mesh,
-            const bool binary,
-            const fileName&,
-            const word&,
-            const bool dummyCloud
+            const word& cloudName,
+            const fileName& baseName,
+            const foamVtkOutput::outputOptions outOpts,
+            const bool dummyCloud = false
         );
 
 
+    //- Destructor
+    ~lagrangianWriter();
+
+
     // Member Functions
 
         inline std::ofstream& os()
diff --git a/src/conversion/vtk/output/foamVtkInternalWriter.C b/src/conversion/vtk/output/foamVtkInternalWriter.C
index 7466de29e0..1a6a3163b3 100644
--- a/src/conversion/vtk/output/foamVtkInternalWriter.C
+++ b/src/conversion/vtk/output/foamVtkInternalWriter.C
@@ -30,21 +30,27 @@ License
 Foam::foamVtkOutput::internalWriter::internalWriter
 (
     const fvMesh& mesh,
-    enum foamVtkOutput::formatType fmtType,
     const foamVtkCells& cells,
-    const fileName& outputName
+    const fileName& baseName,
+    const foamVtkOutput::outputOptions outOpts
 )
 :
     mesh_(mesh),
     format_(),
     vtkCells_(cells),
-    os_(outputName.c_str())
+    os_()
 {
-    format_ = foamVtkOutput::newFormatter(os_, fmtType);
+    outputOptions opts(outOpts);
+    opts.legacy(true);  // Legacy only, no append
 
-    // Write header
-    foamVtkOutput::legacy::fileHeader(format(), mesh.time().caseName())
-        << "DATASET UNSTRUCTURED_GRID" << nl;
+    os_.open((baseName + (opts.legacy() ? ".vtk" : ".vtu")).c_str());
+    format_ = opts.newFormatter(os_);
+
+    if (opts.legacy())
+    {
+        foamVtkOutput::legacy::fileHeader(format(), mesh.time().caseName())
+            << "DATASET UNSTRUCTURED_GRID" << nl;
+    }
 
     //------------------------------------------------------------------
     //
@@ -84,6 +90,12 @@ Foam::foamVtkOutput::internalWriter::internalWriter
 }
 
 
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+Foam::foamVtkOutput::internalWriter::~internalWriter()
+{}
+
+
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 
diff --git a/src/conversion/vtk/output/foamVtkInternalWriter.H b/src/conversion/vtk/output/foamVtkInternalWriter.H
index 6a6423b4ff..fc33f9d6ee 100644
--- a/src/conversion/vtk/output/foamVtkInternalWriter.H
+++ b/src/conversion/vtk/output/foamVtkInternalWriter.H
@@ -42,6 +42,7 @@ SourceFiles
 
 #include "foamVtkCells.H"
 #include "foamVtkOutputFields.H"
+#include "foamVtkOutputOptions.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -78,12 +79,16 @@ public:
         internalWriter
         (
             const fvMesh& mesh,
-            enum foamVtkOutput::formatType fmtType,
             const foamVtkCells& cells,
-            const fileName& outputName
+            const fileName& baseName,
+            const foamVtkOutput::outputOptions outOpts
         );
 
 
+    //- Destructor
+    ~internalWriter();
+
+
     // Member Functions
 
         inline std::ofstream& os()
diff --git a/src/conversion/vtk/output/foamVtkPatchWriter.C b/src/conversion/vtk/output/foamVtkPatchWriter.C
index b56d58e3c5..a671d35f2f 100644
--- a/src/conversion/vtk/output/foamVtkPatchWriter.C
+++ b/src/conversion/vtk/output/foamVtkPatchWriter.C
@@ -31,9 +31,9 @@ License
 Foam::foamVtkOutput::patchWriter::patchWriter
 (
     const fvMesh& mesh,
-    const bool binary,
+    const fileName& baseName,
+    const foamVtkOutput::outputOptions outOpts,
     const bool nearCellValue,
-    const fileName& fName,
     const labelList& patchIDs
 )
 :
@@ -41,29 +41,28 @@ Foam::foamVtkOutput::patchWriter::patchWriter
     format_(),
     nearCellValue_(nearCellValue),
     patchIDs_(patchIDs),
-    os_(fName.c_str())
+    os_()
 {
+    outputOptions opts(outOpts);
+    opts.legacy(true);  // Legacy only, no append
+
+    os_.open((baseName + (opts.legacy() ? ".vtk" : ".vtp")).c_str());
+    format_ = opts.newFormatter(os_);
+
     const polyBoundaryMesh& patches = mesh.boundaryMesh();
 
-    format_ = foamVtkOutput::newFormatter
-    (
-        os_,
+    if (opts.legacy())
+    {
+        foamVtkOutput::legacy::fileHeader
         (
-            binary
-          ? foamVtkOutput::LEGACY_BINARY
-          : foamVtkOutput::LEGACY_ASCII
-        )
-    );
-
-    foamVtkOutput::legacy::fileHeader
-    (
-        format(),
-        (
-            patchIDs_.size() == 1
-          ? patches[patchIDs_.first()].name()
-          : "patches"
-        )
-    ) << "DATASET POLYDATA" << nl;
+            format(),
+            (
+                patchIDs_.size() == 1
+              ? patches[patchIDs_.first()].name()
+              : "patches"
+            )
+        ) << "DATASET POLYDATA" << nl;
+    }
 
     //------------------------------------------------------------------
 
@@ -120,6 +119,12 @@ Foam::foamVtkOutput::patchWriter::patchWriter
 }
 
 
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+Foam::foamVtkOutput::patchWriter::~patchWriter()
+{}
+
+
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 void Foam::foamVtkOutput::patchWriter::beginCellData(label nFields)
diff --git a/src/conversion/vtk/output/foamVtkPatchWriter.H b/src/conversion/vtk/output/foamVtkPatchWriter.H
index a43dc54910..10b73e14a9 100644
--- a/src/conversion/vtk/output/foamVtkPatchWriter.H
+++ b/src/conversion/vtk/output/foamVtkPatchWriter.H
@@ -42,7 +42,7 @@ SourceFiles
 #include "pointFields.H"
 #include "indirectPrimitivePatch.H"
 #include "PrimitivePatchInterpolation.H"
-#include "foamVtkOutput.H"
+#include "foamVtkOutputOptions.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -82,13 +82,17 @@ public:
         patchWriter
         (
             const fvMesh& mesh,
-            const bool binary,
+            const fileName& baseName,
+            const foamVtkOutput::outputOptions outOpts,
             const bool nearCellValue,
-            const fileName& fName,
             const labelList& patchIDs
         );
 
 
+    //- Destructor
+    ~patchWriter();
+
+
     // Member Functions
 
         inline std::ofstream& os()
diff --git a/src/conversion/vtk/output/foamVtkSurfaceMeshWriter.C b/src/conversion/vtk/output/foamVtkSurfaceMeshWriter.C
index 810620bf11..12aab0acef 100644
--- a/src/conversion/vtk/output/foamVtkSurfaceMeshWriter.C
+++ b/src/conversion/vtk/output/foamVtkSurfaceMeshWriter.C
@@ -30,28 +30,27 @@ License
 
 Foam::foamVtkOutput::surfaceMeshWriter::surfaceMeshWriter
 (
-    const bool binary,
     const indirectPrimitivePatch& pp,
     const word& name,
-    const fileName& fName
+    const fileName& baseName,
+    const foamVtkOutput::outputOptions outOpts
 )
 :
     pp_(pp),
     format_(),
-    os_(fName.c_str())
+    os_()
 {
-    format_ = foamVtkOutput::newFormatter
-    (
-        os_,
-        (
-            binary
-          ? foamVtkOutput::LEGACY_BINARY
-          : foamVtkOutput::LEGACY_ASCII
-        )
-    );
+    outputOptions opts(outOpts);
+    opts.legacy(true);  // Legacy only, no append
 
-    foamVtkOutput::legacy::fileHeader(format(), name)
-        << "DATASET POLYDATA" << nl;
+    os_.open((baseName + (opts.legacy() ? ".vtk" : ".vtp")).c_str());
+    format_ = opts.newFormatter(os_);
+
+    if (opts.legacy())
+    {
+        foamVtkOutput::legacy::fileHeader(format(), name)
+            << "DATASET POLYDATA" << nl;
+    }
 
     //------------------------------------------------------------------
 
@@ -81,6 +80,12 @@ Foam::foamVtkOutput::surfaceMeshWriter::surfaceMeshWriter
 }
 
 
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+Foam::foamVtkOutput::surfaceMeshWriter::~surfaceMeshWriter()
+{}
+
+
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 void Foam::foamVtkOutput::surfaceMeshWriter::beginCellData(label nFields)
diff --git a/src/conversion/vtk/output/foamVtkSurfaceMeshWriter.H b/src/conversion/vtk/output/foamVtkSurfaceMeshWriter.H
index 7173f53e86..30a5f5de46 100644
--- a/src/conversion/vtk/output/foamVtkSurfaceMeshWriter.H
+++ b/src/conversion/vtk/output/foamVtkSurfaceMeshWriter.H
@@ -41,7 +41,7 @@ SourceFiles
 #include "volFields.H"
 #include "surfaceFields.H"
 #include "indirectPrimitivePatch.H"
-#include "foamVtkOutput.H"
+#include "foamVtkOutputOptions.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -72,13 +72,17 @@ public:
         //- Construct from components
         surfaceMeshWriter
         (
-            const bool binary,
             const indirectPrimitivePatch& pp,
             const word& name,
-            const fileName&
+            const fileName& baseName,
+            const foamVtkOutput::outputOptions outOpts
         );
 
 
+    //- Destructor
+    ~surfaceMeshWriter();
+
+
     // Member Functions
 
         inline std::ofstream& os()
diff --git a/src/conversion/vtk/output/foamVtkWriteSurfFields.C b/src/conversion/vtk/output/foamVtkWriteSurfFields.C
index 99a006a150..97d85b29f2 100644
--- a/src/conversion/vtk/output/foamVtkWriteSurfFields.C
+++ b/src/conversion/vtk/output/foamVtkWriteSurfFields.C
@@ -34,26 +34,23 @@ License
 
 void Foam::foamVtkOutput::writeSurfFields
 (
-    const bool binary,
     const fvMesh& mesh,
-    const fileName& fileName,
+    const fileName& baseName,
+    const foamVtkOutput::outputOptions outOpts,
     const UPtrList<const surfaceVectorField>& surfVectorFields
 )
 {
-    std::ofstream os(fileName.c_str());
+    outputOptions opts(outOpts);
+    opts.legacy(true);  // Legacy only, no append
 
-    autoPtr<foamVtkOutput::formatter> format = foamVtkOutput::newFormatter
-    (
-        os,
-        (
-            binary
-          ? foamVtkOutput::LEGACY_BINARY
-          : foamVtkOutput::LEGACY_ASCII
-        )
-    );
+    std::ofstream os((baseName + (opts.legacy() ? ".vtk" : ".vtp")).c_str());
+    autoPtr<foamVtkOutput::formatter> format = opts.newFormatter(os);
 
-    foamVtkOutput::legacy::fileHeader(format(), "surfaceFields")
-        << "DATASET POLYDATA" << nl;
+    if (opts.legacy())
+    {
+        foamVtkOutput::legacy::fileHeader(format(), "surfaceFields")
+            << "DATASET POLYDATA" << nl;
+    }
 
     const pointField& fc = mesh.faceCentres();
 
diff --git a/src/conversion/vtk/output/foamVtkWriteSurfFields.H b/src/conversion/vtk/output/foamVtkWriteSurfFields.H
index 9ce9f4096c..e34c11d043 100644
--- a/src/conversion/vtk/output/foamVtkWriteSurfFields.H
+++ b/src/conversion/vtk/output/foamVtkWriteSurfFields.H
@@ -38,6 +38,7 @@ SourceFiles
 #include "fvMesh.H"
 #include "surfaceMesh.H"
 #include "surfaceFieldsFwd.H"
+#include "foamVtkOutputOptions.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -49,9 +50,9 @@ namespace foamVtkOutput
 //- Write surface vector fields
 void writeSurfFields
 (
-    const bool binary,
     const fvMesh& mesh,
-    const fileName& fileName,
+    const fileName& baseName,
+    const foamVtkOutput::outputOptions outOpts,
     const UPtrList<const surfaceVectorField>& surfVectorFields
 );
 
diff --git a/src/conversion/vtk/part/foamVtkCells.C b/src/conversion/vtk/part/foamVtkCells.C
index b80ae51176..8b9faf7142 100644
--- a/src/conversion/vtk/part/foamVtkCells.C
+++ b/src/conversion/vtk/part/foamVtkCells.C
@@ -23,8 +23,9 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "foamVtkCells.H"
 #include "polyMesh.H"
+#include "foamVtkCells.H"
+#include "foamVtkOutputOptions.H"
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
@@ -59,6 +60,33 @@ Foam::foamVtkCells::foamVtkCells
 }
 
 
+Foam::foamVtkCells::foamVtkCells
+(
+    const foamVtkOutput::outputOptions outOpts,
+    const bool decompose
+)
+:
+    foamVtkCells
+    (
+        (outOpts.legacy() ? contentType::LEGACY : contentType::XML),
+        decompose
+    )
+{}
+
+
+Foam::foamVtkCells::foamVtkCells
+(
+    const polyMesh& mesh,
+    const foamVtkOutput::outputOptions outOpts,
+    const bool decompose
+)
+:
+    foamVtkCells(outOpts, decompose)
+{
+    reset(mesh);
+}
+
+
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
 
 Foam::foamVtkCells::~foamVtkCells()
diff --git a/src/conversion/vtk/part/foamVtkCells.H b/src/conversion/vtk/part/foamVtkCells.H
index b6704e6767..5ad70cda51 100644
--- a/src/conversion/vtk/part/foamVtkCells.H
+++ b/src/conversion/vtk/part/foamVtkCells.H
@@ -61,6 +61,12 @@ namespace Foam
 // Forward declaration of classes
 class polyMesh;
 
+namespace foamVtkOutput
+{
+    class outputOptions;
+}
+
+
 /*---------------------------------------------------------------------------*\
                         Class foamVtkCells Declaration
 \*---------------------------------------------------------------------------*/
@@ -132,6 +138,23 @@ public:
             const bool decompose = false
         );
 
+        //- Construct from components.
+        //  Optionally with polyhedral decomposition.
+        foamVtkCells
+        (
+            const foamVtkOutput::outputOptions outOpts,
+            const bool decompose = false
+        );
+
+        //- Construct from components and create the output information
+        //  immediately
+        foamVtkCells
+        (
+            const polyMesh& mesh,
+            const foamVtkOutput::outputOptions outOpts,
+            const bool decompose = false
+        );
+
 
     //- Destructor
     ~foamVtkCells();
diff --git a/src/fileFormats/sampledSetWriters/vtk/vtkSetWriter.C b/src/fileFormats/sampledSetWriters/vtk/vtkSetWriter.C
index 87996eeff5..f48080f69d 100644
--- a/src/fileFormats/sampledSetWriters/vtk/vtkSetWriter.C
+++ b/src/fileFormats/sampledSetWriters/vtk/vtkSetWriter.C
@@ -79,7 +79,6 @@ void Foam::vtkSetWriter<Type>::write
         os  << pt.x() << ' ' << pt.y() << ' ' << pt.z() << nl;
     }
 
-
     os  << "POINT_DATA " << points.size() << nl
         << " FIELD attributes " << valueSetNames.size() << nl;
 
diff --git a/src/fileFormats/vtk/format/foamVtkAppendBase64Formatter.C b/src/fileFormats/vtk/format/foamVtkAppendBase64Formatter.C
index bacc45c1a5..f54edcabea 100644
--- a/src/fileFormats/vtk/format/foamVtkAppendBase64Formatter.C
+++ b/src/fileFormats/vtk/format/foamVtkAppendBase64Formatter.C
@@ -24,11 +24,15 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "foamVtkAppendBase64Formatter.H"
+#include "foamVtkOutputOptions.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
 const char* Foam::foamVtkOutput::appendBase64Formatter::name_ = "append";
 
+const Foam::foamVtkOutput::outputOptions
+Foam::foamVtkOutput::appendBase64Formatter::opts_(formatType::APPEND_BASE64);
+
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
@@ -51,6 +55,13 @@ Foam::foamVtkOutput::appendBase64Formatter::~appendBase64Formatter()
 
 // * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
 
+const Foam::foamVtkOutput::outputOptions&
+Foam::foamVtkOutput::appendBase64Formatter::opts() const
+{
+    return opts_;
+}
+
+
 const char* Foam::foamVtkOutput::appendBase64Formatter::name() const
 {
     return name_;
diff --git a/src/fileFormats/vtk/format/foamVtkAppendBase64Formatter.H b/src/fileFormats/vtk/format/foamVtkAppendBase64Formatter.H
index 2cd289b6e4..0a0dff20e3 100644
--- a/src/fileFormats/vtk/format/foamVtkAppendBase64Formatter.H
+++ b/src/fileFormats/vtk/format/foamVtkAppendBase64Formatter.H
@@ -56,15 +56,16 @@ class appendBase64Formatter
     // Private Data Members
 
         static const char* name_;
+        static const outputOptions opts_;
 
 
     // Private Member Functions
 
-    //- Disallow default bitwise copy construct
-    appendBase64Formatter(const appendBase64Formatter&) = delete;
+        //- Disallow default bitwise copy construct
+        appendBase64Formatter(const appendBase64Formatter&) = delete;
 
-    //- Disallow default bitwise assignment
-    void operator=(const appendBase64Formatter&) = delete;
+        //- Disallow default bitwise assignment
+        void operator=(const appendBase64Formatter&) = delete;
 
 
 public:
@@ -81,11 +82,8 @@ public:
 
     // Member Functions
 
-        //- The output formatType is APPEND_BASE64.
-        virtual enum formatType format() const
-        {
-            return formatType::APPEND_BASE64;
-        }
+        //- The output is APPEND_BASE64.
+        virtual const outputOptions& opts() const;
 
         //- Output name for XML type ("append")
         virtual const char* name() const;
diff --git a/src/fileFormats/vtk/format/foamVtkAppendRawFormatter.C b/src/fileFormats/vtk/format/foamVtkAppendRawFormatter.C
index cc587aae50..40effed271 100644
--- a/src/fileFormats/vtk/format/foamVtkAppendRawFormatter.C
+++ b/src/fileFormats/vtk/format/foamVtkAppendRawFormatter.C
@@ -24,12 +24,16 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "foamVtkAppendRawFormatter.H"
+#include "foamVtkOutputOptions.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
 const char* Foam::foamVtkOutput::appendRawFormatter::name_     = "append";
 const char* Foam::foamVtkOutput::appendRawFormatter::encoding_ = "raw";
 
+const Foam::foamVtkOutput::outputOptions
+Foam::foamVtkOutput::appendRawFormatter::opts_(formatType::APPEND_BINARY);
+
 
 // * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * //
 
@@ -59,6 +63,13 @@ Foam::foamVtkOutput::appendRawFormatter::~appendRawFormatter()
 
 // * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
 
+const Foam::foamVtkOutput::outputOptions&
+Foam::foamVtkOutput::appendRawFormatter::opts() const
+{
+    return opts_;
+}
+
+
 const char* Foam::foamVtkOutput::appendRawFormatter::name() const
 {
     return name_;
diff --git a/src/fileFormats/vtk/format/foamVtkAppendRawFormatter.H b/src/fileFormats/vtk/format/foamVtkAppendRawFormatter.H
index 11de7e9b64..aca458b05e 100644
--- a/src/fileFormats/vtk/format/foamVtkAppendRawFormatter.H
+++ b/src/fileFormats/vtk/format/foamVtkAppendRawFormatter.H
@@ -56,6 +56,8 @@ class appendRawFormatter
 
         static const char* name_;
         static const char* encoding_;
+        static const outputOptions opts_;
+
 
     // Private Member Functions
 
@@ -88,11 +90,8 @@ public:
 
     // Member Functions
 
-        //- The output formatType is APPEND_BINARY.
-        virtual enum formatType format() const
-        {
-            return formatType::APPEND_BINARY;
-        }
+        //- The output is APPEND_BINARY.
+        virtual const outputOptions& opts() const;
 
         //- Output name for XML type ("append")
         virtual const char* name() const;
diff --git a/src/fileFormats/vtk/format/foamVtkAsciiFormatter.C b/src/fileFormats/vtk/format/foamVtkAsciiFormatter.C
index b19a3762db..7b05aafaf8 100644
--- a/src/fileFormats/vtk/format/foamVtkAsciiFormatter.C
+++ b/src/fileFormats/vtk/format/foamVtkAsciiFormatter.C
@@ -24,11 +24,15 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "foamVtkAsciiFormatter.H"
+#include "foamVtkOutputOptions.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
 const char* Foam::foamVtkOutput::asciiFormatter::name_ = "ascii";
 
+const Foam::foamVtkOutput::outputOptions
+Foam::foamVtkOutput::asciiFormatter::opts_(formatType::INLINE_ASCII);
+
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
@@ -89,6 +93,13 @@ Foam::foamVtkOutput::asciiFormatter::~asciiFormatter()
 
 // * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
 
+const Foam::foamVtkOutput::outputOptions&
+Foam::foamVtkOutput::asciiFormatter::opts() const
+{
+    return opts_;
+}
+
+
 const char* Foam::foamVtkOutput::asciiFormatter::name() const
 {
     return name_;
diff --git a/src/fileFormats/vtk/format/foamVtkAsciiFormatter.H b/src/fileFormats/vtk/format/foamVtkAsciiFormatter.H
index 6289e0fd83..c50281779e 100644
--- a/src/fileFormats/vtk/format/foamVtkAsciiFormatter.H
+++ b/src/fileFormats/vtk/format/foamVtkAsciiFormatter.H
@@ -57,6 +57,7 @@ class asciiFormatter
     // Private Data Members
 
         static const char* name_;
+        static const outputOptions opts_;
 
         //- Track the current output position
         unsigned short pos_;
@@ -95,11 +96,8 @@ public:
 
     // Member Functions
 
-        //- The output formatType is INLINE_ASCII.
-        virtual enum formatType format() const
-        {
-            return formatType::INLINE_ASCII;
-        }
+        //- The output is INLINE_ASCII.
+        virtual const outputOptions& opts() const;
 
         //- Name for the XML output type ("ascii")
         virtual const char* name() const;
diff --git a/src/fileFormats/vtk/format/foamVtkBase64Formatter.C b/src/fileFormats/vtk/format/foamVtkBase64Formatter.C
index a27d14c129..a4ebc925fe 100644
--- a/src/fileFormats/vtk/format/foamVtkBase64Formatter.C
+++ b/src/fileFormats/vtk/format/foamVtkBase64Formatter.C
@@ -24,11 +24,15 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "foamVtkBase64Formatter.H"
+#include "foamVtkOutputOptions.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
 const char* Foam::foamVtkOutput::base64Formatter::name_ = "binary";
 
+const Foam::foamVtkOutput::outputOptions
+Foam::foamVtkOutput::base64Formatter::opts_(formatType::INLINE_BASE64);
+
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
@@ -51,6 +55,13 @@ Foam::foamVtkOutput::base64Formatter::~base64Formatter()
 
 // * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
 
+const Foam::foamVtkOutput::outputOptions&
+Foam::foamVtkOutput::base64Formatter::opts() const
+{
+    return opts_;
+}
+
+
 const char* Foam::foamVtkOutput::base64Formatter::name() const
 {
     return name_;
diff --git a/src/fileFormats/vtk/format/foamVtkBase64Formatter.H b/src/fileFormats/vtk/format/foamVtkBase64Formatter.H
index 52f7d025f1..edf64797ed 100644
--- a/src/fileFormats/vtk/format/foamVtkBase64Formatter.H
+++ b/src/fileFormats/vtk/format/foamVtkBase64Formatter.H
@@ -33,6 +33,7 @@ Description
 #ifndef foamVtkBase64Formatter_H
 #define foamVtkBase64Formatter_H
 
+#include "foamVtkFormatter.H"
 #include "foamVtkBase64Layer.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -53,7 +54,7 @@ class base64Formatter
     // Private Data Members
 
         static const char* name_;
-        static const char* encoding_;
+        static const outputOptions opts_;
 
 
     // Private Member Functions
@@ -64,6 +65,7 @@ class base64Formatter
         //- Disallow default bitwise assignment
         void operator=(const base64Formatter&) = delete;
 
+
 public:
 
     // Constructors
@@ -78,11 +80,8 @@ public:
 
     // Member Functions
 
-        //- The output formatType is INLINE_BASE64.
-        virtual enum formatType format() const
-        {
-            return formatType::INLINE_BASE64;
-        }
+        //- The output is INLINE_BASE64.
+        virtual const outputOptions& opts() const;
 
         //- Name for the XML output type ("binary")
         virtual const char* name() const;
diff --git a/src/fileFormats/vtk/format/foamVtkBase64Layer.H b/src/fileFormats/vtk/format/foamVtkBase64Layer.H
index da541bbde2..09b978017b 100644
--- a/src/fileFormats/vtk/format/foamVtkBase64Layer.H
+++ b/src/fileFormats/vtk/format/foamVtkBase64Layer.H
@@ -64,6 +64,7 @@ class foamVtkBase64Layer
         //- Disallow default bitwise assignment
         void operator=(const foamVtkBase64Layer&) = delete;
 
+
 protected:
 
     // Protected Member Functions
diff --git a/src/fileFormats/vtk/format/foamVtkFormatter.H b/src/fileFormats/vtk/format/foamVtkFormatter.H
index 1ed43fb45e..248730c726 100644
--- a/src/fileFormats/vtk/format/foamVtkFormatter.H
+++ b/src/fileFormats/vtk/format/foamVtkFormatter.H
@@ -57,6 +57,8 @@ namespace Foam
 namespace foamVtkOutput
 {
 
+class outputOptions;
+
 /*---------------------------------------------------------------------------*\
                           Class formatter Declaration
 \*---------------------------------------------------------------------------*/
@@ -111,8 +113,8 @@ public:
         //- Access to the underlying output stream
         inline std::ostream& os();
 
-        //- The output formatType.
-        virtual enum formatType format() const = 0;
+        //- The format-type / output options.
+        virtual const outputOptions& opts() const = 0;
 
         //- Name for the XML output type or the legacy output type.
         virtual const char* name() const = 0;
@@ -195,6 +197,17 @@ public:
             const bool leaveOpen = false
         );
 
+        //- Add a "VTKFile" XML tag for contentType, followed by a tag for
+        //  the contentType itself. Optionally leave the contentType tag
+        //  open for adding additional attributes.
+        //  \return formatter for chaining
+        inline formatter& beginVTKFile
+        (
+            const vtkFileTag& contentType,
+            const word& contentVersion,
+            const bool leaveOpen = false
+        );
+
         //- Add a "AppendedData" XML tag with the current encoding and output
         //  the requisite '_' prefix.
         //  \return formatter for chaining
@@ -206,6 +219,11 @@ public:
         template<class Type, int nComp=0>
         formatter& openDataArray(const word& dataName);
 
+        //- Open "DataArray" XML tag
+        //  \return formatter for chaining
+        template<class Type, int nComp=0>
+        formatter& openDataArray(const vtkFileTag& tagEnum);
+
 
         //- Insert a single "PDataArray" XML entry tag.
         //  For some entries, the name is optional.
diff --git a/src/fileFormats/vtk/format/foamVtkFormatterI.H b/src/fileFormats/vtk/format/foamVtkFormatterI.H
index df3a987394..39e1e5a013 100644
--- a/src/fileFormats/vtk/format/foamVtkFormatterI.H
+++ b/src/fileFormats/vtk/format/foamVtkFormatterI.H
@@ -72,6 +72,23 @@ Foam::foamVtkOutput::formatter::tag(const vtkFileTag& tagEnum)
 }
 
 
+inline Foam::foamVtkOutput::formatter&
+Foam::foamVtkOutput::formatter::beginVTKFile
+(
+    const vtkFileTag& contentType,
+    const word& contentVersion,
+    const bool leaveOpen
+)
+{
+    return beginVTKFile
+    (
+        vtkFileTagNames[contentType],
+        contentVersion,
+        leaveOpen
+    );
+}
+
+
 inline Foam::foamVtkOutput::formatter&
 Foam::foamVtkOutput::formatter::endDataArray()
 {
diff --git a/src/fileFormats/vtk/format/foamVtkFormatterTemplates.C b/src/fileFormats/vtk/format/foamVtkFormatterTemplates.C
index 1c1ec9b35f..79e3b7a239 100644
--- a/src/fileFormats/vtk/format/foamVtkFormatterTemplates.C
+++ b/src/fileFormats/vtk/format/foamVtkFormatterTemplates.C
@@ -68,6 +68,17 @@ Foam::foamVtkOutput::formatter::openDataArray
 }
 
 
+template<class Type, int nComp>
+Foam::foamVtkOutput::formatter&
+Foam::foamVtkOutput::formatter::openDataArray
+(
+    const vtkFileTag& tagEnum
+)
+{
+    return openDataArray<Type, nComp>(vtkFileTagNames[tagEnum]);
+}
+
+
 template<class Type, int nComp>
 Foam::foamVtkOutput::formatter&
 Foam::foamVtkOutput::formatter::PDataArray
diff --git a/src/fileFormats/vtk/format/foamVtkLegacyAsciiFormatter.C b/src/fileFormats/vtk/format/foamVtkLegacyAsciiFormatter.C
index 226ee3a48f..4e31fc46af 100644
--- a/src/fileFormats/vtk/format/foamVtkLegacyAsciiFormatter.C
+++ b/src/fileFormats/vtk/format/foamVtkLegacyAsciiFormatter.C
@@ -24,11 +24,15 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "foamVtkLegacyAsciiFormatter.H"
+#include "foamVtkOutputOptions.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
 const char* Foam::foamVtkOutput::legacyAsciiFormatter::legacyName_ = "ASCII";
 
+const Foam::foamVtkOutput::outputOptions
+Foam::foamVtkOutput::legacyAsciiFormatter::opts_(formatType::LEGACY_ASCII);
+
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
@@ -59,6 +63,13 @@ Foam::foamVtkOutput::legacyAsciiFormatter::~legacyAsciiFormatter()
 
 // * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
 
+const Foam::foamVtkOutput::outputOptions&
+Foam::foamVtkOutput::legacyAsciiFormatter::opts() const
+{
+    return opts_;
+}
+
+
 const char* Foam::foamVtkOutput::legacyAsciiFormatter::name() const
 {
     return legacyName_;
diff --git a/src/fileFormats/vtk/format/foamVtkLegacyAsciiFormatter.H b/src/fileFormats/vtk/format/foamVtkLegacyAsciiFormatter.H
index 248c848cc1..cb764b2992 100644
--- a/src/fileFormats/vtk/format/foamVtkLegacyAsciiFormatter.H
+++ b/src/fileFormats/vtk/format/foamVtkLegacyAsciiFormatter.H
@@ -56,6 +56,10 @@ class legacyAsciiFormatter
     // Private Data Members
 
         static const char* legacyName_;
+        static const outputOptions opts_;
+
+
+    // Private Member Functions
 
         //- Disallow default bitwise copy construct
         legacyAsciiFormatter(const legacyAsciiFormatter&) = delete;
@@ -81,11 +85,8 @@ public:
 
     // Member Functions
 
-        //- The output formatType is LEGACY_ASCII.
-        virtual enum formatType format() const
-        {
-            return formatType::LEGACY_ASCII;
-        }
+        //- The output is LEGACY_ASCII.
+        virtual const outputOptions& opts() const;
 
         //- Name for the legacy ascii output type ("ASCII")
         virtual const char* name() const;
diff --git a/src/fileFormats/vtk/format/foamVtkLegacyRawFormatter.C b/src/fileFormats/vtk/format/foamVtkLegacyRawFormatter.C
index 733d7a4ab0..b533d0c56e 100644
--- a/src/fileFormats/vtk/format/foamVtkLegacyRawFormatter.C
+++ b/src/fileFormats/vtk/format/foamVtkLegacyRawFormatter.C
@@ -24,12 +24,16 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "foamVtkLegacyRawFormatter.H"
+#include "foamVtkOutputOptions.H"
 #include "endian.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
 const char* Foam::foamVtkOutput::legacyRawFormatter::legacyName_ = "BINARY";
 
+const Foam::foamVtkOutput::outputOptions
+Foam::foamVtkOutput::legacyRawFormatter::opts_(formatType::LEGACY_BINARY);
+
 
 // * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * //
 
@@ -62,6 +66,13 @@ Foam::foamVtkOutput::legacyRawFormatter::~legacyRawFormatter()
 
 // * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
 
+const Foam::foamVtkOutput::outputOptions&
+Foam::foamVtkOutput::legacyRawFormatter::opts() const
+{
+    return opts_;
+}
+
+
 const char* Foam::foamVtkOutput::legacyRawFormatter::name() const
 {
     return legacyName_;
diff --git a/src/fileFormats/vtk/format/foamVtkLegacyRawFormatter.H b/src/fileFormats/vtk/format/foamVtkLegacyRawFormatter.H
index 47717a598b..2b558fc977 100644
--- a/src/fileFormats/vtk/format/foamVtkLegacyRawFormatter.H
+++ b/src/fileFormats/vtk/format/foamVtkLegacyRawFormatter.H
@@ -58,6 +58,7 @@ class legacyRawFormatter
     // Private Data Members
 
         static const char* legacyName_;
+        static const outputOptions opts_;
 
 
     // Private Member Functions
@@ -91,11 +92,8 @@ public:
 
     // Member Functions
 
-        //- The output formatType is LEGACY_BINARY.
-        virtual enum formatType format() const
-        {
-            return formatType::LEGACY_BINARY;
-        }
+        //- The output is LEGACY_BINARY.
+        virtual const outputOptions& opts() const;
 
         //- Name for the legacy binary output type ("BINARY")
         virtual const char* name() const;
diff --git a/src/fileFormats/vtk/output/foamVtkOutput.C b/src/fileFormats/vtk/output/foamVtkOutput.C
index 1e66e1cfcc..7c2385c07a 100644
--- a/src/fileFormats/vtk/output/foamVtkOutput.C
+++ b/src/fileFormats/vtk/output/foamVtkOutput.C
@@ -70,27 +70,27 @@ Foam::foamVtkOutput::newFormatter
 
     switch (fmtType)
     {
-        case INLINE_ASCII:
+        case formatType::INLINE_ASCII:
             fmt.set(new foamVtkOutput::asciiFormatter(os, prec));
             break;
 
-        case INLINE_BASE64:
+        case formatType::INLINE_BASE64:
             fmt.set(new foamVtkOutput::base64Formatter(os));
             break;
 
-        case APPEND_BASE64:
+        case formatType::APPEND_BASE64:
             fmt.set(new foamVtkOutput::appendBase64Formatter(os));
             break;
 
-        case APPEND_BINARY:
+        case formatType::APPEND_BINARY:
             fmt.set(new foamVtkOutput::appendRawFormatter(os));
             break;
 
-        case LEGACY_ASCII:
+        case formatType::LEGACY_ASCII:
             fmt.set(new foamVtkOutput::legacyAsciiFormatter(os, prec));
             break;
 
-        case LEGACY_BINARY:
+        case formatType::LEGACY_BINARY:
             fmt.set(new foamVtkOutput::legacyRawFormatter(os));
             break;
     }
diff --git a/src/fileFormats/vtk/output/foamVtkOutput.H b/src/fileFormats/vtk/output/foamVtkOutput.H
index 7c04be9b9d..5be62c87c9 100644
--- a/src/fileFormats/vtk/output/foamVtkOutput.H
+++ b/src/fileFormats/vtk/output/foamVtkOutput.H
@@ -70,7 +70,6 @@ namespace foamVtkOutput
     //- Return a default asciiFormatter
     autoPtr<foamVtkOutput::formatter> newFormatter(std::ostream& os);
 
-
     //- Return a new formatter based on the specified format type
     autoPtr<foamVtkOutput::formatter> newFormatter
     (
diff --git a/src/fileFormats/vtk/output/foamVtkOutputOptions.C b/src/fileFormats/vtk/output/foamVtkOutputOptions.C
index 232ea5f0ab..d58cf3849b 100644
--- a/src/fileFormats/vtk/output/foamVtkOutputOptions.C
+++ b/src/fileFormats/vtk/output/foamVtkOutputOptions.C
@@ -35,20 +35,40 @@ Foam::foamVtkOutput::outputOptions::ascii(bool on)
     {
         switch (fmtType_)
         {
-            case INLINE_BASE64: fmtType_ = INLINE_ASCII;   break;
-            case APPEND_BINARY: fmtType_ = APPEND_BASE64;  break;
-            case LEGACY_BINARY: fmtType_ = LEGACY_ASCII;   break;
-            default: break; // no change
+            case formatType::INLINE_BASE64:
+                fmtType_ = formatType::INLINE_ASCII;
+                break;
+
+            case formatType::APPEND_BINARY:
+                fmtType_ = formatType::APPEND_BASE64;
+                break;
+
+            case formatType::LEGACY_BINARY:
+                fmtType_ = formatType::LEGACY_ASCII;
+                break;
+
+            default:  // No change
+                break;
         }
     }
     else
     {
         switch (fmtType_)
         {
-            case INLINE_ASCII:  fmtType_ = INLINE_BASE64;  break;
-            case APPEND_BASE64: fmtType_ = APPEND_BINARY;  break;
-            case LEGACY_ASCII:  fmtType_ = LEGACY_BINARY;  break;
-            default: break; // no change
+            case formatType::INLINE_ASCII:
+                fmtType_ = formatType::INLINE_BASE64;
+                break;
+
+            case formatType::APPEND_BASE64:
+                fmtType_ = formatType::APPEND_BINARY;
+                break;
+
+            case formatType::LEGACY_ASCII:
+                fmtType_ = formatType::LEGACY_BINARY;
+                break;
+
+            default:  // No change
+                break;
         }
     }
 
@@ -63,20 +83,34 @@ Foam::foamVtkOutput::outputOptions::append(bool on)
     {
         switch (fmtType_)
         {
-            case INLINE_ASCII:  fmtType_ = APPEND_BASE64;  break;
-            case LEGACY_ASCII:  fmtType_ = APPEND_BASE64;  break;
-            case INLINE_BASE64: fmtType_ = APPEND_BINARY;  break;
-            case LEGACY_BINARY: fmtType_ = APPEND_BINARY;  break;
-            default: break; // no change
+            case formatType::INLINE_ASCII:
+            case formatType::LEGACY_ASCII:
+                fmtType_ = formatType::APPEND_BASE64;
+                break;
+
+            case formatType::INLINE_BASE64:
+            case formatType::LEGACY_BINARY:
+                fmtType_ = formatType::APPEND_BINARY;
+                break;
+
+            default:  // No change
+                break;
         }
     }
     else
     {
         switch (fmtType_)
         {
-            case APPEND_BASE64: fmtType_ = INLINE_ASCII;   break;
-            case APPEND_BINARY: fmtType_ = INLINE_BASE64;  break;
-            default: break; // no change
+            case formatType::APPEND_BASE64:
+                fmtType_ = formatType::INLINE_ASCII;
+                break;
+
+            case formatType::APPEND_BINARY:
+                fmtType_ = formatType::INLINE_BASE64;
+                break;
+
+            default:  // No change
+                break;
         }
     }
 
@@ -91,20 +125,34 @@ Foam::foamVtkOutput::outputOptions::legacy(bool on)
     {
         switch (fmtType_)
         {
-            case INLINE_ASCII:  fmtType_ = LEGACY_ASCII;   break;
-            case INLINE_BASE64: fmtType_ = LEGACY_BINARY;  break;
-            case APPEND_BASE64: fmtType_ = LEGACY_ASCII;   break;
-            case APPEND_BINARY: fmtType_ = LEGACY_BINARY;  break;
-            default: break; // no change
+            case formatType::INLINE_ASCII:
+            case formatType::APPEND_BASE64:
+                fmtType_ = formatType::LEGACY_ASCII;
+                break;
+
+            case formatType::INLINE_BASE64:
+            case formatType::APPEND_BINARY:
+                fmtType_ = formatType::LEGACY_BINARY;
+                break;
+
+            default:  // no change
+                break;
         }
     }
     else
     {
         switch (fmtType_)
         {
-            case LEGACY_ASCII:  fmtType_ = INLINE_ASCII;   break;
-            case LEGACY_BINARY: fmtType_ = INLINE_BASE64;  break;
-            default: break; // no change
+            case formatType::LEGACY_ASCII:
+                fmtType_ = formatType::INLINE_ASCII;
+                break;
+
+            case formatType::LEGACY_BINARY:
+                fmtType_ = formatType::INLINE_BASE64;
+                break;
+
+            default:  // no change
+                break;
         }
     }
 
@@ -112,16 +160,24 @@ Foam::foamVtkOutput::outputOptions::legacy(bool on)
 }
 
 
+Foam::foamVtkOutput::outputOptions&
+Foam::foamVtkOutput::outputOptions::precision(unsigned prec)
+{
+    precision_ = prec;
+    return *this;
+}
+
+
 Foam::string Foam::foamVtkOutput::outputOptions::description() const
 {
     switch (fmtType_)
     {
-        case INLINE_ASCII:  return "xml ascii";
-        case INLINE_BASE64: return "xml base64";
-        case APPEND_BASE64: return "xml-append base64";
-        case APPEND_BINARY: return "xml-append binary";
-        case LEGACY_ASCII:  return "legacy ascii";
-        case LEGACY_BINARY: return "legacy binary";
+        case formatType::INLINE_ASCII:  return "xml ascii";
+        case formatType::INLINE_BASE64: return "xml base64";
+        case formatType::APPEND_BASE64: return "xml-append base64";
+        case formatType::APPEND_BINARY: return "xml-append binary";
+        case formatType::LEGACY_ASCII:  return "legacy ascii";
+        case formatType::LEGACY_BINARY: return "legacy binary";
     }
 
     return "";
diff --git a/src/fileFormats/vtk/output/foamVtkOutputOptions.H b/src/fileFormats/vtk/output/foamVtkOutputOptions.H
index 826dc75128..c93dbd5f1f 100644
--- a/src/fileFormats/vtk/output/foamVtkOutputOptions.H
+++ b/src/fileFormats/vtk/output/foamVtkOutputOptions.H
@@ -28,6 +28,9 @@ Description
     Encapsulated combinations of output format options.
     This is primarily useful when defining the output type based on some
     command-line arguments or dictionary contents.
+    However, it can also be a useful alternative to using the underlying
+    enumeration directly, since this class provides additional methods
+    not possible with an enum.
 
 SourceFiles
     foamVtkOutputOptions.C
@@ -53,8 +56,6 @@ namespace foamVtkOutput
 
 class outputOptions
 {
-private:
-
     // Private Member Data
 
         //- The output style tuning
@@ -64,7 +65,6 @@ private:
             HEADER = 0x01   //!< Emit xml header
         };
 
-
         //- The output format type
         formatType fmtType_;
 
@@ -79,7 +79,8 @@ public:
         //- Construct null - XML insitu ASCII format with default precision
         inline outputOptions();
 
-        //- Construct with specified format
+        //- Construct with specified format.
+        //  This constructor should remain non-explicit.
         inline outputOptions(enum formatType fmtType);
 
 
@@ -94,7 +95,7 @@ public:
       // Access
 
         //- The output format type
-        inline formatType format() const;
+        inline formatType fmt() const;
 
         //- True if writer uses legacy file format
         inline bool legacy() const;
@@ -111,6 +112,9 @@ public:
         //- True if output format is ASCII
         inline bool ascii() const;
 
+        //- Return the ASCII write precision
+        inline unsigned precision() const;
+
 
       // Edit
 
@@ -131,12 +135,12 @@ public:
 
         //- Set the write precision to be used for new ASCII formatters
         //  \return outputOptions for chaining
-        inline const outputOptions& precision(unsigned prec) const;
+        outputOptions& precision(unsigned prec);
 
 
     // Other
 
-        //- Report description about the option selected
+        //- A text description about the output option selected
         string description() const;
 
 };
diff --git a/src/fileFormats/vtk/output/foamVtkOutputOptionsI.H b/src/fileFormats/vtk/output/foamVtkOutputOptionsI.H
index f4a0aafcff..7d398ee7ea 100644
--- a/src/fileFormats/vtk/output/foamVtkOutputOptionsI.H
+++ b/src/fileFormats/vtk/output/foamVtkOutputOptionsI.H
@@ -23,12 +23,14 @@ License
 
 \*---------------------------------------------------------------------------*/
 
+#include "foamVtkOutput.H"
+
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 inline Foam::foamVtkOutput::outputOptions::outputOptions()
 :
-    fmtType_(INLINE_ASCII),
+    fmtType_(formatType::INLINE_ASCII),
     precision_(IOstream::defaultPrecision())
 {}
 
@@ -55,7 +57,7 @@ Foam::foamVtkOutput::outputOptions::newFormatter(std::ostream& os) const
 // * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
 
 inline Foam::foamVtkOutput::formatType
-Foam::foamVtkOutput::outputOptions::format() const
+Foam::foamVtkOutput::outputOptions::fmt() const
 {
     return fmtType_;
 }
@@ -63,7 +65,11 @@ Foam::foamVtkOutput::outputOptions::format() const
 
 inline bool Foam::foamVtkOutput::outputOptions::legacy() const
 {
-    return (fmtType_ & formatType::LEGACY_ASCII & formatType::LEGACY_BINARY);
+    return
+    (
+        fmtType_ == formatType::LEGACY_ASCII
+     || fmtType_ == formatType::LEGACY_BINARY
+    );
 }
 
 
@@ -75,7 +81,11 @@ inline bool Foam::foamVtkOutput::outputOptions::xml() const
 
 inline bool Foam::foamVtkOutput::outputOptions::append() const
 {
-    return (fmtType_ & formatType::APPEND_BASE64 & formatType::APPEND_BINARY);
+    return
+    (
+        fmtType_ == formatType::APPEND_BASE64
+     || fmtType_ == formatType::APPEND_BINARY
+    );
 }
 
 
@@ -87,15 +97,13 @@ inline bool Foam::foamVtkOutput::outputOptions::insitu() const
 
 inline bool Foam::foamVtkOutput::outputOptions::ascii() const
 {
-    return !(fmtType_ & 0xF);
+    return !(unsigned(fmtType_) & 0x0F);
 }
 
 
-inline const Foam::foamVtkOutput::outputOptions&
-Foam::foamVtkOutput::outputOptions::precision(unsigned prec) const
+inline unsigned Foam::foamVtkOutput::outputOptions::precision() const
 {
-    precision_ = prec;
-    return *this;
+    return precision_;
 }
 
 
diff --git a/src/fileFormats/vtk/type/foamVtkOutputTypes.H b/src/fileFormats/vtk/type/foamVtkOutputTypes.H
index d4dbe0d5c8..3eab6006f8 100644
--- a/src/fileFormats/vtk/type/foamVtkOutputTypes.H
+++ b/src/fileFormats/vtk/type/foamVtkOutputTypes.H
@@ -48,7 +48,7 @@ namespace foamVtkOutput
 
     //- The output format type for file contents.
     //  Upper bits for output type, lower bits for the format itself.
-    enum formatType
+    enum class formatType
     {
         /** XML inline ASCII, using the asciiFormatter */
         INLINE_ASCII  = 0,
diff --git a/src/functionObjects/utilities/writeVTK/writeVTK.C b/src/functionObjects/utilities/writeVTK/writeVTK.C
index 2b7c58dca8..2fe616effd 100644
--- a/src/functionObjects/utilities/writeVTK/writeVTK.C
+++ b/src/functionObjects/utilities/writeVTK/writeVTK.C
@@ -106,12 +106,11 @@ bool Foam::functionObjects::writeVTK::write()
     }
 
     // Create file and write header
-    fileName outputName
+    const fileName outputName
     (
         fvPath/vtkName
       + "_"
       + timeDesc
-      + ".vtk"
     );
 
     Info<< "    Internal  : " << outputName << endl;
@@ -127,9 +126,9 @@ bool Foam::functionObjects::writeVTK::write()
     foamVtkOutput::internalWriter writer
     (
         mesh_,
-        foamVtkOutput::LEGACY_ASCII,
         foamVtkMeshCells,
-        outputName
+        outputName,
+        foamVtkOutput::formatType::LEGACY_ASCII
     );
 
 
diff --git a/src/meshTools/output/foamVtkWriteCellSetFaces.C b/src/meshTools/output/foamVtkWriteCellSetFaces.C
index 54772cf7f7..0c9c33d55d 100644
--- a/src/meshTools/output/foamVtkWriteCellSetFaces.C
+++ b/src/meshTools/output/foamVtkWriteCellSetFaces.C
@@ -34,22 +34,24 @@ License
 
 void Foam::foamVtkOutput::writeCellSetFaces
 (
-    const bool binary,
     const primitiveMesh& mesh,
     const cellSet& set,
-    const fileName& fileName
+    const fileName& baseName,
+    const foamVtkOutput::outputOptions outOpts
 )
 {
-    std::ofstream os(fileName.c_str());
+    outputOptions opts(outOpts);
+    opts.legacy(true);  // Legacy only, no append
 
-    autoPtr<foamVtkOutput::formatter> format =
-        foamVtkOutput::outputOptions().legacy(true).ascii(!binary).newFormatter
-        (
-            os
-        );
+    std::ofstream os((baseName + (opts.legacy() ? ".vtk" : ".vtp")).c_str());
 
-    foamVtkOutput::legacy::fileHeader(format(), set.name())
-        << "DATASET POLYDATA" << nl;
+    autoPtr<foamVtkOutput::formatter> format = opts.newFormatter(os);
+
+    if (opts.legacy())
+    {
+        foamVtkOutput::legacy::fileHeader(format(), set.name())
+            << "DATASET POLYDATA" << nl;
+    }
 
     //-------------------------------------------------------------------------
 
@@ -87,7 +89,7 @@ void Foam::foamVtkOutput::writeCellSetFaces
         }
     }
 
-    labelList faceLabels = cellFaces.sortedToc();
+    const labelList faceLabels = cellFaces.sortedToc();
     labelList faceValues(cellFaces.size());
 
     forAll(faceLabels, facei)
diff --git a/src/meshTools/output/foamVtkWriteCellSetFaces.H b/src/meshTools/output/foamVtkWriteCellSetFaces.H
index 621dbb0e06..047f4b16f8 100644
--- a/src/meshTools/output/foamVtkWriteCellSetFaces.H
+++ b/src/meshTools/output/foamVtkWriteCellSetFaces.H
@@ -39,6 +39,7 @@ SourceFiles
 
 #include "primitiveMesh.H"
 #include "uindirectPrimitivePatch.H"
+#include "foamVtkOutputOptions.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -55,10 +56,10 @@ namespace foamVtkOutput
 //  The data are the original cell ids
 void writeCellSetFaces
 (
-    const bool binary,
     const primitiveMesh& mesh,
     const cellSet& set,
-    const fileName& fileName
+    const fileName& baseName,
+    const foamVtkOutput::outputOptions outOpts
 );
 
 } // End namespace foamVtkOutput
diff --git a/src/meshTools/output/foamVtkWriteFaceSet.C b/src/meshTools/output/foamVtkWriteFaceSet.C
index e1221177c1..8d2b4bb4f6 100644
--- a/src/meshTools/output/foamVtkWriteFaceSet.C
+++ b/src/meshTools/output/foamVtkWriteFaceSet.C
@@ -34,27 +34,29 @@ License
 
 void Foam::foamVtkOutput::writeFaceSet
 (
-    const bool binary,
     const primitiveMesh& mesh,
     const faceSet& set,
-    const fileName& fileName
+    const fileName& baseName,
+    const foamVtkOutput::outputOptions outOpts
 )
 {
-    std::ofstream os(fileName.c_str());
+    outputOptions opts(outOpts);
+    opts.legacy(true);  // Legacy only, no append
 
-    autoPtr<foamVtkOutput::formatter> format =
-        foamVtkOutput::outputOptions().legacy(true).ascii(!binary).newFormatter
-        (
-            os
-        );
+    std::ofstream os((baseName + (opts.legacy() ? ".vtk" : ".vtp")).c_str());
 
-    foamVtkOutput::legacy::fileHeader(format(), set.name())
-        << "DATASET POLYDATA" << nl;
+    autoPtr<foamVtkOutput::formatter> format = opts.newFormatter(os);
+
+    if (opts.legacy())
+    {
+        foamVtkOutput::legacy::fileHeader(format(), set.name())
+            << "DATASET POLYDATA" << nl;
+    }
 
     //-------------------------------------------------------------------------
 
     // Faces of set with OpenFOAM faceID as value
-    labelList faceLabels = set.sortedToc();
+    const labelList faceLabels = set.sortedToc();
 
     uindirectPrimitivePatch pp
     (
diff --git a/src/meshTools/output/foamVtkWriteFaceSet.H b/src/meshTools/output/foamVtkWriteFaceSet.H
index c44437f03f..d709b0a681 100644
--- a/src/meshTools/output/foamVtkWriteFaceSet.H
+++ b/src/meshTools/output/foamVtkWriteFaceSet.H
@@ -36,6 +36,8 @@ SourceFiles
 #ifndef foamVtkWriteFaceSet_H
 #define foamVtkWriteFaceSet_H
 
+#include "foamVtkOutputOptions.H"
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
@@ -51,10 +53,10 @@ namespace foamVtkOutput
 //  Only one data which is original pointID.
 void writeFaceSet
 (
-    const bool binary,
     const primitiveMesh& mesh,
     const faceSet& set,
-    const fileName& fileName
+    const fileName& baseName,
+    const foamVtkOutput::outputOptions outOpts
 );
 
 
diff --git a/src/meshTools/output/foamVtkWritePointSet.C b/src/meshTools/output/foamVtkWritePointSet.C
index d58346d803..f111ac75fe 100644
--- a/src/meshTools/output/foamVtkWritePointSet.C
+++ b/src/meshTools/output/foamVtkWritePointSet.C
@@ -33,22 +33,24 @@ License
 
 void Foam::foamVtkOutput::writePointSet
 (
-    const bool binary,
     const primitiveMesh& mesh,
     const pointSet& set,
-    const fileName& fileName
+    const fileName& baseName,
+    const foamVtkOutput::outputOptions outOpts
 )
 {
-    std::ofstream os(fileName.c_str());
+    outputOptions opts(outOpts);
+    opts.legacy(true);  // Legacy only, no append
 
-    autoPtr<foamVtkOutput::formatter> format =
-        foamVtkOutput::outputOptions().legacy(true).ascii(!binary).newFormatter
-        (
-            os
-        );
+    std::ofstream os((baseName + (opts.legacy() ? ".vtk" : ".vtp")).c_str());
 
-    foamVtkOutput::legacy::fileHeader(format(), set.name())
-        << "DATASET POLYDATA" << nl;
+    autoPtr<foamVtkOutput::formatter> format = opts.newFormatter(os);
+
+    if (opts.legacy())
+    {
+        foamVtkOutput::legacy::fileHeader(format(), set.name())
+            << "DATASET POLYDATA" << nl;
+    }
 
     //-------------------------------------------------------------------------
 
diff --git a/src/meshTools/output/foamVtkWritePointSet.H b/src/meshTools/output/foamVtkWritePointSet.H
index f06e07cb01..3ceda2914e 100644
--- a/src/meshTools/output/foamVtkWritePointSet.H
+++ b/src/meshTools/output/foamVtkWritePointSet.H
@@ -36,6 +36,8 @@ SourceFiles
 #ifndef foamVtkWritePointSet_H
 #define foamVtkWritePointSet_H
 
+#include "foamVtkOutputOptions.H"
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
@@ -51,10 +53,10 @@ namespace foamVtkOutput
 //  The data are the original point ids.
 void writePointSet
 (
-    const bool binary,
     const primitiveMesh& mesh,
     const pointSet& set,
-    const fileName& fileName
+    const fileName& baseName,
+    const foamVtkOutput::outputOptions outOpts
 );
 
 

From a2e978d43ede49082c31e583e6c78aef6c34a1e9 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Thu, 1 Jun 2017 18:28:40 +0200
Subject: [PATCH 18/27] ENH: add VTP, VTU output for most vtk writers (insitu
 only)

- with the xml append format it is possible to write raw binary
  (instead of base64), but the writer becomes more complicated.
  Either needs two passes to create, or need to allocate a block
  of space for the header information (like VTK itself does) and
  write later.

    * internalWriter
    * patchWriter
    * surfaceMeshWriter
    * lagrangianWriter

 Also these special purpose ones:
    * foamVtkWriteSurfFields
---
 .../dataConversion/foamToVTK/foamToVTK.C      |  27 +-
 .../foamToVTK/foamVtkLagrangianWriter.C       | 227 +++++++++--
 .../foamToVTK/foamVtkLagrangianWriter.H       |  49 ++-
 .../foamVtkLagrangianWriterTemplates.C        |  67 +++-
 .../steadyParticleTracks/Make/options         |   1 +
 .../vtk/output/foamVtkInternalWriter.C        | 341 +++++++++++++---
 .../vtk/output/foamVtkInternalWriter.H        |  33 ++
 .../output/foamVtkInternalWriterTemplates.C   | 133 ++++---
 .../vtk/output/foamVtkPatchWriter.C           | 363 +++++++++++++++---
 .../vtk/output/foamVtkPatchWriter.H           |  51 ++-
 .../vtk/output/foamVtkPatchWriterTemplates.C  |  68 +++-
 .../vtk/output/foamVtkSurfaceMeshWriter.C     | 228 +++++++++--
 .../vtk/output/foamVtkSurfaceMeshWriter.H     |  45 ++-
 .../foamVtkSurfaceMeshWriterTemplates.C       |  26 +-
 .../vtk/output/foamVtkWriteSurfFields.C       | 105 ++++-
 .../vtk/output/foamVtkWriteSurfFields.H       |   2 +-
 src/fileFormats/vtk/format/foamVtkFormatter.C |   4 +-
 src/fileFormats/vtk/format/foamVtkFormatter.H |   2 +-
 src/fileFormats/vtk/output/foamVtkOutput.C    |  71 +---
 src/fileFormats/vtk/output/foamVtkOutput.H    | 127 +++---
 src/fileFormats/vtk/output/foamVtkOutputI.H   | 146 +++++++
 .../vtk/output/foamVtkOutputTemplates.C       |  14 +
 .../output/foamVtkWriteCellSetFaces.C         |  26 +-
 src/meshTools/output/foamVtkWriteFaceSet.C    |  27 +-
 src/meshTools/output/foamVtkWritePointSet.C   |  14 +-
 25 files changed, 1762 insertions(+), 435 deletions(-)
 create mode 100644 src/fileFormats/vtk/output/foamVtkOutputI.H

diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK.C b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK.C
index aff6d2d585..b3813f22c3 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK.C
+++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK.C
@@ -28,7 +28,7 @@ Group
     grpPostProcessingUtilities
 
 Description
-    Legacy VTK file format writer.
+    VTK file format writer.
 
     - Handles volFields, pointFields, surfaceScalarField, surfaceVectorField
       fields.
@@ -46,6 +46,9 @@ Usage
       - \par -ascii
         Write VTK data in ASCII format instead of binary.
 
+      - \par -xml
+        Write VTK data in XML format instead of legacy format
+
       - \par -mesh \<name\>
         Use a different mesh name (instead of -region)
 
@@ -243,6 +246,11 @@ foamVtkOutput::outputOptions getOutputOptions(const argList& args)
 {
     foamVtkOutput::outputOptions opts;
 
+    if (args.optionFound("xml"))
+    {
+        opts.ascii(args.optionFound("ascii"));
+    }
+    else
     {
         opts.legacy(true);
 
@@ -335,6 +343,11 @@ int main(int argc, char *argv[])
         "write in ASCII format instead of binary"
     );
     argList::addBoolOption
+    (
+        "xml",
+        "write VTK xml instead of legacy format"
+    );
+    argList::addBoolOption
     (
         "poly",
         "write polyhedral cells without tet/pyramid decomposition"
@@ -902,6 +915,8 @@ int main(int argc, char *argv[])
 
                 writer.endPointData();
             }
+
+            writer.writeFooter();
         }
 
         //---------------------------------------------------------------------
@@ -1041,6 +1056,8 @@ int main(int argc, char *argv[])
 
                 writer.endPointData();
             }
+
+            writer.writeFooter();
         }
         else
         {
@@ -1118,6 +1135,8 @@ int main(int argc, char *argv[])
                         writer.endPointData();
                     }
                 }
+
+                writer.writeFooter();
             }
         }
 
@@ -1190,6 +1209,8 @@ int main(int argc, char *argv[])
                 writer.write(sVectorFld);
 
                 writer.endCellData();
+
+                writer.writeFooter();
             }
         }
 
@@ -1288,6 +1309,8 @@ int main(int argc, char *argv[])
                 writer.writeIOField<tensor>(tensorNames);
 
                 writer.endParcelData();
+
+                writer.writeFooter();
             }
             else
             {
@@ -1304,6 +1327,8 @@ int main(int argc, char *argv[])
                 writer.beginParcelData(0);
 
                 writer.endParcelData();
+
+                writer.writeFooter();
             }
         }
 
diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamVtkLagrangianWriter.C b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamVtkLagrangianWriter.C
index c01cd0b9a4..4101672b69 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamVtkLagrangianWriter.C
+++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamVtkLagrangianWriter.C
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
-     \\/     M anipulation  | Copyright (C) 2016 OpenCFD Ltd.
+     \\/     M anipulation  | Copyright (C) 2016-2017 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -27,6 +27,134 @@ License
 #include "Cloud.H"
 #include "passiveParticle.H"
 
+// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
+
+void Foam::foamVtkOutput::lagrangianWriter::beginPiece()
+{
+    if (!legacy_)
+    {
+        if (useVerts_)
+        {
+            format()
+                .openTag(vtkFileTag::PIECE)
+                ( "NumberOfPoints", nParcels_ )
+                ( "NumberOfVerts",  nParcels_ )
+                .closeTag();
+        }
+        else
+        {
+            format()
+                .openTag(vtkFileTag::PIECE)
+                ( "NumberOfPoints", nParcels_ )
+                .closeTag();
+        }
+    }
+}
+
+
+void Foam::foamVtkOutput::lagrangianWriter::writePoints()
+{
+    Cloud<passiveParticle> parcels(mesh_, cloudName_, false);
+    nParcels_ = parcels.size();
+
+    const uint64_t payLoad = (nParcels_ * 3 * sizeof(float));
+
+    if (legacy_)
+    {
+        legacy::beginPoints(os_, nParcels_);
+    }
+    else
+    {
+        beginPiece(); // Tricky - hide in here
+
+        format().tag(vtkFileTag::POINTS)
+            .openDataArray<float,3>(vtkFileTag::POINTS)
+            .closeTag();
+    }
+
+    format().writeSize(payLoad);
+
+    forAllConstIters(parcels, iter)
+    {
+        const point& pt = iter().position();
+
+        foamVtkOutput::write(format(), pt);
+    }
+    format().flush();
+
+    if (!legacy_)
+    {
+        format()
+            .endDataArray()
+            .endTag(vtkFileTag::POINTS);
+    }
+}
+
+
+void Foam::foamVtkOutput::lagrangianWriter::writeVertsLegacy()
+{
+    os_ << "VERTICES " << nParcels_ << ' ' << 2*nParcels_ << nl;
+
+    // legacy has cells + connectivity together
+    // count the number of vertices referenced
+
+    for (label i=0; i < nParcels_; ++i)
+    {
+        format().write(1);  // Number of vertices for this cell (==1)
+        format().write(i);
+    }
+    format().flush();
+}
+
+
+void Foam::foamVtkOutput::lagrangianWriter::writeVerts()
+{
+    format().tag(vtkFileTag::VERTS);
+
+    // Same payload throughout
+    const uint64_t payLoad = (nParcels_ * sizeof(label));
+
+    //
+    // 'connectivity'
+    // = linear mapping onto points
+    //
+    {
+        format().openDataArray<label>("connectivity")
+            .closeTag();
+
+        format().writeSize(payLoad);
+        for (label i=0; i < nParcels_; ++i)
+        {
+            format().write(i);
+        }
+        format().flush();
+
+        format().endDataArray();
+    }
+
+
+    //
+    // 'offsets'  (connectivity offsets)
+    // = linear mapping onto points (with 1 offset)
+    //
+    {
+        format().openDataArray<label>("offsets")
+            .closeTag();
+
+        format().writeSize(payLoad);
+        for (label i=0; i < nParcels_; ++i)
+        {
+            format().write(i+1);
+        }
+        format().flush();
+
+        format().endDataArray();
+    }
+
+    format().endTag(vtkFileTag::VERTS);
+}
+
+
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 Foam::foamVtkOutput::lagrangianWriter::lagrangianWriter
@@ -39,43 +167,54 @@ Foam::foamVtkOutput::lagrangianWriter::lagrangianWriter
 )
 :
     mesh_(mesh),
+    legacy_(outOpts.legacy()),
+    useVerts_(false),
     format_(),
     cloudName_(cloudName),
     os_(),
     nParcels_(0)
 {
+
     outputOptions opts(outOpts);
-    opts.legacy(true);  // Legacy only, no append
-
-    os_.open((baseName + (opts.legacy() ? ".vtk" : ".vtp")).c_str());
+    opts.append(false);  // No append supported
 
+    os_.open((baseName + (legacy_ ? ".vtk" : ".vtp")).c_str());
     format_ = opts.newFormatter(os_);
 
-    if (opts.legacy())
-    {
-        foamVtkOutput::legacy::fileHeader(format(), mesh_.time().caseName())
-            << "DATASET POLYDATA" << nl;
-    }
+    const auto& title = mesh_.time().caseName();
 
-    if (dummyCloud)
+    if (legacy_)
     {
-        os_ << "POINTS " << nParcels_ << " float" << nl;
+        legacy::fileHeader(format(), title, vtkFileTag::POLY_DATA);
+
+        if (dummyCloud)
+        {
+            legacy::beginPoints(os_, nParcels_);
+        }
+        else
+        {
+            writePoints();
+            if (useVerts_) writeVertsLegacy();
+        }
     }
     else
     {
-        Cloud<passiveParticle> parcels(mesh, cloudName_, false);
+        // XML (inline)
 
-        nParcels_ = parcels.size();
+        format()
+            .xmlHeader()
+            .xmlComment(title)
+            .beginVTKFile(vtkFileTag::POLY_DATA, "0.1");
 
-        os_ << "POINTS " << nParcels_ << " float" << nl;
-
-        forAllConstIters(parcels, iter)
+        if (dummyCloud)
         {
-            const point& pt = iter().position();
-
-            foamVtkOutput::write(format(), pt);
+            beginPiece();
+        }
+        else
+        {
+            writePoints();
+            if (useVerts_) writeVerts();
         }
-        format().flush();
     }
 }
 
@@ -88,17 +227,53 @@ Foam::foamVtkOutput::lagrangianWriter::~lagrangianWriter()
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-void Foam::foamVtkOutput::lagrangianWriter::beginParcelData
-(
-    const label nFields
-)
+void Foam::foamVtkOutput::lagrangianWriter::beginParcelData(label nFields)
 {
-    foamVtkOutput::legacy::pointDataHeader(os_, nParcels_, nFields);
+    const vtkFileTag dataType =
+    (
+        useVerts_
+      ? vtkFileTag::CELL_DATA
+      : vtkFileTag::POINT_DATA
+    );
+
+    if (legacy_)
+    {
+        legacy::dataHeader(os_, dataType, nParcels_, nFields);
+    }
+    else
+    {
+        format().tag(dataType);
+    }
 }
 
 
 void Foam::foamVtkOutput::lagrangianWriter::endParcelData()
-{}
+{
+    const vtkFileTag dataType =
+    (
+        useVerts_
+      ? vtkFileTag::CELL_DATA
+      : vtkFileTag::POINT_DATA
+    );
+
+    if (!legacy_)
+    {
+        format().endTag(dataType);
+    }
+}
+
+
+void Foam::foamVtkOutput::lagrangianWriter::writeFooter()
+{
+    if (!legacy_)
+    {
+        // slight cheat. </Piece> too
+        format().endTag(vtkFileTag::PIECE);
+
+        format().endTag(vtkFileTag::POLY_DATA)
+            .endVTKFile();
+    }
+}
 
 
 // ************************************************************************* //
diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamVtkLagrangianWriter.H b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamVtkLagrangianWriter.H
index 1d7e5105d8..5fba971387 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamVtkLagrangianWriter.H
+++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamVtkLagrangianWriter.H
@@ -52,20 +52,51 @@ namespace foamVtkOutput
 {
 
 /*---------------------------------------------------------------------------*\
-                           Class lagrangianWriter Declaration
+                      Class lagrangianWriter Declaration
 \*---------------------------------------------------------------------------*/
 
 class lagrangianWriter
 {
-    const fvMesh& mesh_;
+    // Private Member Data
 
-    autoPtr<foamVtkOutput::formatter> format_;
+        //- Reference to the OpenFOAM mesh (or subset)
+        const fvMesh& mesh_;
 
-    const word cloudName_;
+        //- Commonly used query
+        const bool legacy_;
 
-    std::ofstream os_;
+        //- Write lagrangian as cell data (verts) or point data?
+        const bool useVerts_;
 
-    label nParcels_;
+        autoPtr<foamVtkOutput::formatter> format_;
+
+        const word cloudName_;
+
+        std::ofstream os_;
+
+        label nParcels_;
+
+
+    // Private Member Functions
+
+        //- Begin piece
+        void beginPiece();
+
+        //- Write positions
+        void writePoints();
+
+        //- Write vertex (cells)
+        void writeVertsLegacy();
+
+        //- Write vertex (cells)
+        void writeVerts();
+
+
+        //- Disallow default bitwise copy construct
+        lagrangianWriter(const lagrangianWriter&) = delete;
+
+        //- Disallow default bitwise assignment
+        void operator=(const lagrangianWriter&) = delete;
 
 
 public:
@@ -104,13 +135,15 @@ public:
             return nParcels_;
         }
 
-        void beginParcelData(const label nFields);
+        void beginParcelData(label nFields);
         void endParcelData();
 
+        //- Write file footer
+        void writeFooter();
 
         //- Write IOField
         template<class Type>
-        void writeIOField(const wordList&);
+        void writeIOField(const wordList& objectNames);
 };
 
 
diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamVtkLagrangianWriterTemplates.C b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamVtkLagrangianWriterTemplates.C
index 7810657902..6695f5d10f 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamVtkLagrangianWriterTemplates.C
+++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamVtkLagrangianWriterTemplates.C
@@ -31,33 +31,78 @@ License
 template<class Type>
 void Foam::foamVtkOutput::lagrangianWriter::writeIOField
 (
-    const wordList& objects
+    const wordList& objectNames
 )
 {
-    forAll(objects, i)
-    {
-        const word& object = objects[i];
+    const int nCmpt(pTraits<Type>::nComponents);
 
+    const bool useIntField =
+        std::is_integral<typename pTraits<Type>::cmptType>();
+
+    for (const word& fldName : objectNames)
+    {
         IOobject header
         (
-            object,
+            fldName,
             mesh_.time().timeName(),
             cloud::prefix/cloudName_,
             mesh_,
             IOobject::MUST_READ,
             IOobject::NO_WRITE,
-            false
+            false  // no register
         );
 
         IOField<Type> fld(header);
 
-        // Legacy
-        os()<< object << ' '
-            << int(pTraits<Type>::nComponents) << ' '
-            << fld.size() << " float" << nl;
+        if (useIntField)
+        {
+            const uint64_t payLoad(fld.size() * nCmpt * sizeof(label));
+
+            if (legacy_)
+            {
+                legacy::intField(os(), fldName, nCmpt, fld.size());
+            }
+            else
+            {
+                format().openDataArray<label, nCmpt>(fldName)
+                    .closeTag();
+            }
+
+            format().writeSize(payLoad);
+
+            // Ensure consistent output width
+            for (const Type& val : fld)
+            {
+                for (int cmpt=0; cmpt < nCmpt; ++cmpt)
+                {
+                    format().write(label(component(val, cmpt)));
+                }
+            }
+        }
+        else
+        {
+            const uint64_t payLoad(fld.size() * nCmpt * sizeof(float));
+
+            if (legacy_)
+            {
+                legacy::floatField(os(), fldName, nCmpt, fld.size());
+            }
+            else
+            {
+                format().openDataArray<float, nCmpt>(fldName)
+                    .closeTag();
+            }
+
+            format().writeSize(payLoad);
+            foamVtkOutput::writeList(format(), fld);
+        }
 
-        foamVtkOutput::writeList(format(), fld);
         format().flush();
+
+        if (!legacy_)
+        {
+            format().endDataArray();
+        }
     }
 }
 
diff --git a/applications/utilities/postProcessing/lagrangian/steadyParticleTracks/Make/options b/applications/utilities/postProcessing/lagrangian/steadyParticleTracks/Make/options
index 004f0474b8..6898c7800d 100644
--- a/applications/utilities/postProcessing/lagrangian/steadyParticleTracks/Make/options
+++ b/applications/utilities/postProcessing/lagrangian/steadyParticleTracks/Make/options
@@ -1,5 +1,6 @@
 EXE_INC = \
     -I$(LIB_SRC)/lagrangian/basic/lnInclude \
+    -I$(LIB_SRC)/fileFormats/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/finiteVolume/lnInclude
 
diff --git a/src/conversion/vtk/output/foamVtkInternalWriter.C b/src/conversion/vtk/output/foamVtkInternalWriter.C
index 1a6a3163b3..2f07228109 100644
--- a/src/conversion/vtk/output/foamVtkInternalWriter.C
+++ b/src/conversion/vtk/output/foamVtkInternalWriter.C
@@ -25,51 +25,62 @@ License
 
 #include "foamVtkInternalWriter.H"
 
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-Foam::foamVtkOutput::internalWriter::internalWriter
-(
-    const fvMesh& mesh,
-    const foamVtkCells& cells,
-    const fileName& baseName,
-    const foamVtkOutput::outputOptions outOpts
-)
-:
-    mesh_(mesh),
-    format_(),
-    vtkCells_(cells),
-    os_()
+// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
+
+void Foam::foamVtkOutput::internalWriter::beginPiece()
 {
-    outputOptions opts(outOpts);
-    opts.legacy(true);  // Legacy only, no append
-
-    os_.open((baseName + (opts.legacy() ? ".vtk" : ".vtu")).c_str());
-    format_ = opts.newFormatter(os_);
-
-    if (opts.legacy())
+    if (!legacy_)
     {
-        foamVtkOutput::legacy::fileHeader(format(), mesh.time().caseName())
-            << "DATASET UNSTRUCTURED_GRID" << nl;
+        format()
+            .openTag(vtkFileTag::PIECE)
+            ( "NumberOfPoints", vtkCells_.nFieldPoints() )
+            ( "NumberOfCells",  vtkCells_.nFieldCells() )
+            .closeTag();
+    }
+}
+
+
+void Foam::foamVtkOutput::internalWriter::writePoints()
+{
+    // payload size
+    const uint64_t payLoad = (vtkCells_.nFieldPoints() * 3 * sizeof(float));
+
+    if (legacy_)
+    {
+        legacy::beginPoints(os_, vtkCells_.nFieldPoints());
+    }
+    else
+    {
+        format()
+            .tag(vtkFileTag::POINTS)
+            .openDataArray<float,3>(vtkFileTag::POINTS)
+            .closeTag();
     }
 
-    //------------------------------------------------------------------
-    //
-    // Write topology
-    //
-    //------------------------------------------------------------------
+    format().writeSize(payLoad);
 
-    os_ << "POINTS " << vtkCells_.nFieldPoints() << " float" << nl;
-    foamVtkOutput::writeList(format(), mesh.points());
-
-    const pointField& ctrs = mesh.cellCentres();
-    foamVtkOutput::writeList(format(), ctrs, vtkCells_.addPointCellLabels());
+    foamVtkOutput::writeList(format(), mesh_.points());
+    foamVtkOutput::writeList
+    (
+        format(),
+        mesh_.cellCentres(),
+        vtkCells_.addPointCellLabels()
+    );
 
     format().flush();
 
-    //
-    // Write cells
-    //
+    if (!legacy_)
+    {
+        format()
+            .endDataArray()
+            .endTag(vtkFileTag::POINTS);
+    }
+}
 
+
+void Foam::foamVtkOutput::internalWriter::writeCellsLegacy()
+{
     const List<uint8_t>& cellTypes = vtkCells_.cellTypes();
     const labelList& vertLabels = vtkCells_.vertLabels();
 
@@ -90,6 +101,177 @@ Foam::foamVtkOutput::internalWriter::internalWriter
 }
 
 
+void Foam::foamVtkOutput::internalWriter::writeCells()
+{
+    format().tag(vtkFileTag::CELLS);
+
+    //
+    // 'connectivity'
+    //
+    {
+        const labelList& vertLabels = vtkCells_.vertLabels();
+        const uint64_t payLoad = vertLabels.size() * sizeof(label);
+
+        format().openDataArray<label>("connectivity")
+            .closeTag();
+
+        format().writeSize(payLoad);
+        foamVtkOutput::writeList(format(), vertLabels);
+        format().flush();
+
+        format().endDataArray();
+    }
+
+
+    //
+    // 'offsets'  (connectivity offsets)
+    //
+    {
+        const labelList& vertOffsets = vtkCells_.vertOffsets();
+        const uint64_t payLoad = vertOffsets.size() * sizeof(label);
+
+        format().openDataArray<label>("offsets")
+            .closeTag();
+
+        format().writeSize(payLoad);
+        foamVtkOutput::writeList(format(), vertOffsets);
+        format().flush();
+
+        format().endDataArray();
+    }
+
+
+    //
+    // 'types' (cell types)
+    //
+    {
+        const List<uint8_t>& cellTypes = vtkCells_.cellTypes();
+        const uint64_t payLoad = cellTypes.size() * sizeof(uint8_t);
+
+        format().openDataArray<uint8_t>("types")
+            .closeTag();
+
+        format().writeSize(payLoad);
+        forAll(cellTypes, i)
+        {
+            // No nComponents for char, cannot use foamVtkOutput::writeList here
+            format().write(cellTypes[i]);
+        }
+        format().flush();
+
+        format().endDataArray();
+    }
+
+
+    //
+    // can quit here if there are NO face streams
+    //
+    if (vtkCells_.faceLabels().empty())
+    {
+        format().endTag(vtkFileTag::CELLS);
+
+        return;
+    }
+
+
+    // --------------------------------------------------
+
+    //
+    // 'faces' (face streams)
+    //
+    {
+        const labelList& faceLabels = vtkCells_.faceLabels();
+        const uint64_t payLoad = faceLabels.size() * sizeof(label);
+
+        format().openDataArray<label>("faces")
+            .closeTag();
+
+        format().writeSize(payLoad);
+        foamVtkOutput::writeList(format(), faceLabels);
+        format().flush();
+
+        format().endDataArray();
+    }
+
+
+    // 'faceoffsets' (face stream offsets)
+    // -1 to indicate that the cell is a primitive type that does not
+    // have a face stream
+    {
+        const labelList& faceOffsets = vtkCells_.faceOffsets();
+        const uint64_t payLoad = faceOffsets.size() * sizeof(label);
+
+        format().openDataArray<label>("faceoffsets")
+            .closeTag();
+
+        format().writeSize(payLoad);
+        foamVtkOutput::writeList(format(), faceOffsets);
+        format().flush();
+
+        format().endDataArray();
+    }
+
+    format().endTag(vtkFileTag::CELLS);
+}
+
+
+void Foam::foamVtkOutput::internalWriter::writeMesh()
+{
+    writePoints();
+    if (legacy_)
+    {
+        writeCellsLegacy();
+    }
+    else
+    {
+        writeCells();
+    }
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::foamVtkOutput::internalWriter::internalWriter
+(
+    const fvMesh& mesh,
+    const foamVtkCells& cells,
+    const fileName& baseName,
+    const foamVtkOutput::outputOptions outOpts
+)
+:
+    mesh_(mesh),
+    legacy_(outOpts.legacy()),
+    format_(),
+    vtkCells_(cells),
+    os_()
+{
+    outputOptions opts(outOpts);
+    opts.append(false);  // No append supported
+
+    os_.open((baseName + (legacy_ ? ".vtk" : ".vtu")).c_str());
+    format_ = opts.newFormatter(os_);
+
+    const auto& title = mesh_.time().caseName();
+
+    if (legacy_)
+    {
+        legacy::fileHeader(format(), title, vtkFileTag::UNSTRUCTURED_GRID);
+    }
+    else
+    {
+        // XML (inline)
+
+        format()
+            .xmlHeader()
+            .xmlComment(title)
+            .beginVTKFile(vtkFileTag::UNSTRUCTURED_GRID, "0.1");
+    }
+
+    beginPiece();
+    writeMesh();
+}
+
+
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
 
 Foam::foamVtkOutput::internalWriter::~internalWriter()
@@ -101,43 +283,98 @@ Foam::foamVtkOutput::internalWriter::~internalWriter()
 
 void Foam::foamVtkOutput::internalWriter::beginCellData(label nFields)
 {
-    foamVtkOutput::legacy::cellDataHeader
-    (
-        os(),
-        vtkCells_.nFieldCells(),
-        nFields
-    );
+    if (legacy_)
+    {
+        legacy::dataHeader
+        (
+            os(),
+            vtkFileTag::CELL_DATA,
+            vtkCells_.nFieldCells(),
+            nFields
+        );
+    }
+    else
+    {
+        format().tag(vtkFileTag::CELL_DATA);
+    }
 }
 
 
 void Foam::foamVtkOutput::internalWriter::endCellData()
-{}
+{
+    if (!legacy_)
+    {
+        format().endTag(vtkFileTag::CELL_DATA);
+    }
+}
 
 
 void Foam::foamVtkOutput::internalWriter::beginPointData(label nFields)
 {
-    foamVtkOutput::legacy::pointDataHeader
-    (
-        os(),
-        vtkCells_.nFieldPoints(),
-        nFields
-    );
+    if (legacy_)
+    {
+        legacy::dataHeader
+        (
+            os(),
+            vtkFileTag::POINT_DATA,
+            vtkCells_.nFieldPoints(),
+            nFields
+        );
+    }
+    else
+    {
+        format().tag(vtkFileTag::POINT_DATA);
+    }
 }
 
 
 void Foam::foamVtkOutput::internalWriter::endPointData()
-{}
+{
+    if (!legacy_)
+    {
+        format().endTag(vtkFileTag::POINT_DATA);
+    }
+}
+
+
+void Foam::foamVtkOutput::internalWriter::writeFooter()
+{
+    if (!legacy_)
+    {
+        // slight cheat. </Piece> too
+        format().endTag(vtkFileTag::PIECE);
+
+        format().endTag(vtkFileTag::UNSTRUCTURED_GRID)
+            .endVTKFile();
+    }
+}
 
 
 void Foam::foamVtkOutput::internalWriter::writeCellIDs()
 {
-    const labelList& cellMap = vtkCells_.cellMap();
-
     // Cell ids first
-    os_ << "cellID 1 " << vtkCells_.nFieldCells() << " int" << nl;
+    const labelList& cellMap = vtkCells_.cellMap();
+    const uint64_t payLoad = vtkCells_.nFieldCells() * sizeof(label);
+
+    if (legacy_)
+    {
+        os_ << "cellID 1 " << vtkCells_.nFieldCells() << " int" << nl;
+    }
+    else
+    {
+        format().openDataArray<label>("cellID")
+            .closeTag();
+    }
+
+    format().writeSize(payLoad);
 
     foamVtkOutput::writeList(format(), cellMap);
     format().flush();
+
+    if (!legacy_)
+    {
+        format().endDataArray();
+    }
 }
 
 
diff --git a/src/conversion/vtk/output/foamVtkInternalWriter.H b/src/conversion/vtk/output/foamVtkInternalWriter.H
index fc33f9d6ee..93cd54f960 100644
--- a/src/conversion/vtk/output/foamVtkInternalWriter.H
+++ b/src/conversion/vtk/output/foamVtkInternalWriter.H
@@ -64,6 +64,9 @@ class internalWriter
         //- Reference to the OpenFOAM mesh (or subset)
         const fvMesh& mesh_;
 
+        //- Commonly used query
+        const bool legacy_;
+
         autoPtr<foamVtkOutput::formatter> format_;
 
         //- The volume cells (internalMesh)
@@ -71,6 +74,32 @@ class internalWriter
 
         std::ofstream os_;
 
+
+    // Private Member Functions
+
+        //- Begin piece
+        void beginPiece();
+
+        //- Write mesh points
+        void writePoints();
+
+        //- Write mesh cells
+        void writeCellsLegacy();
+
+        //- Write mesh cells
+        void writeCells();
+
+        //- Write mesh topology
+        void writeMesh();
+
+
+        //- Disallow default bitwise copy construct
+        internalWriter(const internalWriter&) = delete;
+
+        //- Disallow default bitwise assignment
+        void operator=(const internalWriter&) = delete;
+
+
 public:
 
     // Constructors
@@ -120,6 +149,10 @@ public:
         //- Write cellIDs
         void writeCellIDs();
 
+        //- Write file footer
+        void writeFooter();
+
+
         //- Write internal fields
         template<class Type>
         void write
diff --git a/src/conversion/vtk/output/foamVtkInternalWriterTemplates.C b/src/conversion/vtk/output/foamVtkInternalWriterTemplates.C
index c3eaaf5e67..0770dc0571 100644
--- a/src/conversion/vtk/output/foamVtkInternalWriterTemplates.C
+++ b/src/conversion/vtk/output/foamVtkInternalWriterTemplates.C
@@ -36,21 +36,32 @@ void Foam::foamVtkOutput::internalWriter::write
     const UPtrList<const DimensionedField<Type, volMesh>>& flds
 )
 {
-    const int nCmpt(pTraits<Type>::nComponents);
     const labelList& cellMap = vtkCells_.cellMap();
 
+    const int nCmpt(pTraits<Type>::nComponents);
+    // const uint64_t payLoad(cellMap.size() * nCmpt * sizeof(float));
+
     forAll(flds, i)
     {
         const auto& fld = flds[i];
 
-        // Legacy
-        os()<< fld.name() << ' '
-            << nCmpt << ' '
-            << cellMap.size() << " float"
-            << nl;
+        if (legacy_)
+        {
+            legacy::floatField(os(), fld.name(), nCmpt, cellMap.size());
+        }
+        else
+        {
+            format().openDataArray<float, nCmpt>(fld.name())
+                .closeTag();
+        }
 
         // writeField includes payload size
         foamVtkOutput::writeField(format(), fld, cellMap);
+
+        if (!legacy_)
+        {
+            format().endDataArray();
+        }
     }
 }
 
@@ -61,21 +72,32 @@ void Foam::foamVtkOutput::internalWriter::write
     const UPtrList<const GeometricField<Type, PatchField, volMesh>>& flds
 )
 {
-    const int nCmpt(pTraits<Type>::nComponents);
     const labelList& cellMap = vtkCells_.cellMap();
 
+    const int nCmpt(pTraits<Type>::nComponents);
+    // const uint64_t payLoad(cellMap.size() * nCmpt * sizeof(float));
+
     forAll(flds, i)
     {
         const auto& fld = flds[i];
 
-        // Legacy
-        os()<< fld.name() << ' '
-            << nCmpt << ' '
-            << cellMap.size() << " float"
-            << nl;
+        if (legacy_)
+        {
+            legacy::floatField(os(), fld.name(), nCmpt, cellMap.size());
+        }
+        else
+        {
+            format().openDataArray<float, nCmpt>(fld.name())
+                .closeTag();
+        }
 
         // writeField includes payload size
         foamVtkOutput::writeField(format(), fld, cellMap);
+
+        if (!legacy_)
+        {
+            format().endDataArray();
+        }
     }
 }
 
@@ -86,25 +108,27 @@ void Foam::foamVtkOutput::internalWriter::write
     const UPtrList<const GeometricField<Type, PatchField, pointMesh>>& flds
 )
 {
-    const int nCmpt(pTraits<Type>::nComponents);
-    const int nVals(vtkCells_.nFieldPoints());
     const labelList& addPointCellLabels = vtkCells_.addPointCellLabels();
 
+    const int nCmpt(pTraits<Type>::nComponents);
+    const int nVals(vtkCells_.nFieldPoints());
+
     // Only needed for non-legacy
-    const uint64_t payLoad
-    (
-        nVals * nCmpt * sizeof(float)
-    );
+    const uint64_t payLoad(nVals * nCmpt * sizeof(float));
 
     forAll(flds, i)
     {
         const auto& fld = flds[i];
 
-        // Legacy
-        os()<< fld.name() << ' '
-            << nCmpt << ' '
-            << nVals << " float"
-            << nl;
+        if (legacy_)
+        {
+            legacy::floatField(os(), fld.name(), nCmpt, nVals);
+        }
+        else
+        {
+            format().openDataArray<float, nCmpt>(fld.name())
+                .closeTag();
+        }
 
         format().writeSize(payLoad);
         foamVtkOutput::writeList(format(), fld);
@@ -116,6 +140,11 @@ void Foam::foamVtkOutput::internalWriter::write
         }
 
         format().flush();
+
+        if (!legacy_)
+        {
+            format().endDataArray();
+        }
     }
 }
 
@@ -127,31 +156,38 @@ void Foam::foamVtkOutput::internalWriter::write
     const UPtrList<const DimensionedField<Type, volMesh>>& flds
 )
 {
-    const int nCmpt(pTraits<Type>::nComponents);
-    const int nVals(vtkCells_.nFieldPoints());
     const labelList& addPointCellLabels = vtkCells_.addPointCellLabels();
 
+    const int nCmpt(pTraits<Type>::nComponents);
+    const int nVals(vtkCells_.nFieldPoints());
+
     // Only needed for non-legacy
-    const uint64_t payLoad
-    (
-        nVals * nCmpt * sizeof(float)
-    );
+    const uint64_t payLoad(nVals * nCmpt * sizeof(float));
 
     forAll(flds, i)
     {
         const auto& vfield = flds[i];
         const auto& pfield = pInterp.interpolate(vfield)();
 
-        // Legacy
-        os()<< vfield.name() << ' '
-            << nCmpt << ' '
-            << nVals << " float"
-            << nl;
+        if (legacy_)
+        {
+            legacy::floatField(os(), vfield.name(), nCmpt, nVals);
+        }
+        else
+        {
+            format().openDataArray<float, nCmpt>(vfield.name())
+                .closeTag();
+        }
 
         format().writeSize(payLoad);
         foamVtkOutput::writeList(format(), pfield);
         foamVtkOutput::writeList(format(), vfield, addPointCellLabels);
         format().flush();
+
+        if (!legacy_)
+        {
+            format().endDataArray();
+        }
     }
 }
 
@@ -163,31 +199,38 @@ void Foam::foamVtkOutput::internalWriter::write
     const UPtrList<const GeometricField<Type, PatchField, volMesh>>& flds
 )
 {
-    const int nCmpt(pTraits<Type>::nComponents);
-    const int nVals(vtkCells_.nFieldPoints());
     const labelList& addPointCellLabels = vtkCells_.addPointCellLabels();
 
+    const int nCmpt(pTraits<Type>::nComponents);
+    const int nVals(vtkCells_.nFieldPoints());
+
     // Only needed for non-legacy
-    const uint64_t payLoad
-    (
-        nVals * nCmpt * sizeof(float)
-    );
+    const uint64_t payLoad(nVals * nCmpt * sizeof(float));
 
     forAll(flds, i)
     {
         const auto& vfield = flds[i];
         const auto& pfield = pInterp.interpolate(vfield)();
 
-        // Legacy
-        os()<< vfield.name() << ' '
-            << nCmpt << ' '
-            << nVals << " float"
-            << nl;
+        if (legacy_)
+        {
+            legacy::floatField(os(), vfield.name(), nCmpt, nVals);
+        }
+        else
+        {
+            format().openDataArray<float, nCmpt>(vfield.name())
+                .closeTag();
+        }
 
         format().writeSize(payLoad);
         foamVtkOutput::writeList(format(), pfield);
         foamVtkOutput::writeList(format(), vfield, addPointCellLabels);
         format().flush();
+
+        if (!legacy_)
+        {
+            format().endDataArray();
+        }
     }
 }
 
diff --git a/src/conversion/vtk/output/foamVtkPatchWriter.C b/src/conversion/vtk/output/foamVtkPatchWriter.C
index a671d35f2f..f52a0c9a0f 100644
--- a/src/conversion/vtk/output/foamVtkPatchWriter.C
+++ b/src/conversion/vtk/output/foamVtkPatchWriter.C
@@ -26,6 +26,206 @@ License
 #include "foamVtkPatchWriter.H"
 #include "foamVtkOutput.H"
 
+
+// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
+
+void Foam::foamVtkOutput::patchWriter::beginPiece()
+{
+    if (!legacy_)
+    {
+        format()
+            .openTag(vtkFileTag::PIECE)
+            ( "NumberOfPoints", nPoints_ )
+            ( "NumberOfPolys",  nFaces_ )
+            .closeTag();
+    }
+}
+
+
+void Foam::foamVtkOutput::patchWriter::writePoints()
+{
+    const polyBoundaryMesh& patches = mesh_.boundaryMesh();
+
+    // payload count
+    const uint64_t payLoad = (nPoints_*3* sizeof(float));
+
+    if (legacy_)
+    {
+        legacy::beginPoints(os_, nPoints_);
+    }
+    else
+    {
+        format().tag(vtkFileTag::POINTS)
+            .openDataArray<float, 3>(vtkFileTag::POINTS)
+            .closeTag();
+    }
+
+    format().writeSize(payLoad);
+
+    forAll(patchIDs_, i)
+    {
+        const polyPatch& pp = patches[patchIDs_[i]];
+
+        foamVtkOutput::writeList(format(), pp.localPoints());
+    }
+    format().flush();
+
+    if (!legacy_)
+    {
+        format()
+            .endDataArray()
+            .endTag(vtkFileTag::POINTS);
+    }
+}
+
+
+void Foam::foamVtkOutput::patchWriter::writePolysLegacy()
+{
+    const polyBoundaryMesh& patches = mesh_.boundaryMesh();
+
+    // connectivity count without additional storage (done internally)
+    uint64_t nConnectivity = 0;
+    forAll(patchIDs_, i)
+    {
+        const polyPatch& pp = patches[patchIDs_[i]];
+
+        forAll(pp, facei)
+        {
+            nConnectivity += pp[facei].size();
+        }
+    }
+
+    legacy::beginPolys(os_, nFaces_, nConnectivity);
+
+
+    // legacy: size + connectivity together
+    // [nPts, id1, id2, ..., nPts, id1, id2, ...]
+
+    label off = 0;
+    forAll(patchIDs_, i)
+    {
+        const polyPatch& pp = patches[patchIDs_[i]];
+
+        forAll(pp, facei)
+        {
+            const face& f = pp.localFaces()[facei];
+
+            format().write(f.size());  // The size prefix
+            forAll(f, fi)
+            {
+                format().write(off + f[fi]);
+            }
+        }
+        off += pp.nPoints();
+    }
+
+    format().flush();
+}
+
+
+void Foam::foamVtkOutput::patchWriter::writePolys()
+{
+    const polyBoundaryMesh& patches = mesh_.boundaryMesh();
+
+    //
+    // 'connectivity'
+    //
+
+    format().tag(vtkFileTag::POLYS);
+
+    //
+    // 'connectivity'
+    //
+    {
+        // payload count
+        uint64_t payLoad = 0;
+        forAll(patchIDs_, i)
+        {
+            const polyPatch& pp = patches[patchIDs_[i]];
+
+            forAll(pp, facei)
+            {
+                const face& f = pp.localFaces()[facei];
+                payLoad += f.size();
+            }
+        }
+
+        format().openDataArray<label>("connectivity")
+            .closeTag();
+
+        // payload size
+        format().writeSize(payLoad * sizeof(label));
+
+        label off = 0;
+        forAll(patchIDs_, i)
+        {
+            const polyPatch& pp = patches[patchIDs_[i]];
+
+            forAll(pp, facei)
+            {
+                const face& f = pp.localFaces()[facei];
+                forAll(f, fi)
+                {
+                    format().write(off + f[fi]);
+                }
+            }
+
+            off += pp.nPoints();
+        }
+
+        format().flush();
+
+        format()
+            .endDataArray();
+    }
+
+
+    //
+    // 'offsets'  (connectivity offsets)
+    //
+    {
+        format()
+            .openDataArray<label>("offsets")
+            .closeTag();
+
+        // payload size
+        format().writeSize(nFaces_ * sizeof(label));
+
+        label off = 0;
+        forAll(patchIDs_, i)
+        {
+            const polyPatch& pp = patches[patchIDs_[i]];
+
+            forAll(pp, facei)
+            {
+                off += pp[facei].size();
+
+                format().write(off);
+            }
+        }
+
+        format().flush();
+        format().endDataArray();
+    }
+
+    format().endTag(vtkFileTag::POLYS);
+}
+
+
+void Foam::foamVtkOutput::patchWriter::writeMesh()
+{
+    writePoints();
+    if (legacy_)
+    {
+        writePolysLegacy();
+    }
+    else
+    {
+        writePolys();
+    }
+}
+
+
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 Foam::foamVtkOutput::patchWriter::patchWriter
@@ -38,84 +238,56 @@ Foam::foamVtkOutput::patchWriter::patchWriter
 )
 :
     mesh_(mesh),
+    legacy_(outOpts.legacy()),
     format_(),
     nearCellValue_(nearCellValue),
     patchIDs_(patchIDs),
-    os_()
+    os_(),
+    nPoints_(0),
+    nFaces_(0)
 {
     outputOptions opts(outOpts);
-    opts.legacy(true);  // Legacy only, no append
+    opts.append(false);  // No append
 
-    os_.open((baseName + (opts.legacy() ? ".vtk" : ".vtp")).c_str());
+    os_.open((baseName + (legacy_ ? ".vtk" : ".vtp")).c_str());
     format_ = opts.newFormatter(os_);
 
-    const polyBoundaryMesh& patches = mesh.boundaryMesh();
+    const polyBoundaryMesh& patches = mesh_.boundaryMesh();
 
-    if (opts.legacy())
-    {
-        foamVtkOutput::legacy::fileHeader
-        (
-            format(),
-            (
-                patchIDs_.size() == 1
-              ? patches[patchIDs_.first()].name()
-              : "patches"
-            )
-        ) << "DATASET POLYDATA" << nl;
-    }
-
-    //------------------------------------------------------------------
-
-    // Write topology
-    nPoints_ = 0;
-    nFaces_ = 0;
-    label nFaceVerts = 0;
+    const word& title =
+    (
+        patchIDs_.size() == 1
+      ? patches[patchIDs_.first()].name()
+      : "patches"
+    );
 
+    // Basic sizes
+    nPoints_ = nFaces_ = 0;
     forAll(patchIDs_, i)
     {
         const polyPatch& pp = patches[patchIDs_[i]];
 
         nPoints_ += pp.nPoints();
-        nFaces_ += pp.size();
-
-        nFaceVerts += pp.size();
-        forAll(pp, facei)
-        {
-            nFaceVerts += pp[facei].size();
-        }
+        nFaces_  += pp.size();
     }
 
-    os_ << "POINTS " << nPoints_ << " float" << nl;
 
-    forAll(patchIDs_, i)
+    if (legacy_)
     {
-        const polyPatch& pp = patches[patchIDs_[i]];
-
-        foamVtkOutput::writeList(format(), pp.localPoints());
+        legacy::fileHeader(format(), title, vtkFileTag::POLY_DATA);
     }
-    format().flush();
-
-    os_ << "POLYGONS " << nFaces_ << ' ' << nFaceVerts << nl;
-
-    label off = 0;
-    forAll(patchIDs_, i)
+    else
     {
-        const polyPatch& pp = patches[patchIDs_[i]];
+        // XML (inline)
 
-        forAll(pp, facei)
-        {
-            const face& f = pp.localFaces()[facei];
-
-            format().write(f.size());
-            forAll(f, fi)
-            {
-                format().write(off + f[fi]);
-            }
-        }
-
-        off += pp.nPoints();
+        format()
+            .xmlHeader()
+            .xmlComment(title)
+            .beginVTKFile(vtkFileTag::POLY_DATA, "0.1");
     }
-    format().flush();
+
+    beginPiece();
+    writeMesh();
 }
 
 
@@ -129,40 +301,107 @@ Foam::foamVtkOutput::patchWriter::~patchWriter()
 
 void Foam::foamVtkOutput::patchWriter::beginCellData(label nFields)
 {
-    foamVtkOutput::legacy::cellDataHeader(os(), nFaces_, nFields);
+    if (legacy_)
+    {
+        legacy::dataHeader
+        (
+            os(),
+            vtkFileTag::CELL_DATA,
+            nFaces_,
+            nFields
+        );
+    }
+    else
+    {
+        format().tag(vtkFileTag::CELL_DATA);
+    }
 }
 
 
 void Foam::foamVtkOutput::patchWriter::endCellData()
-{}
+{
+    if (!legacy_)
+    {
+        format().endTag(vtkFileTag::CELL_DATA);
+    }
+}
 
 
 void Foam::foamVtkOutput::patchWriter::beginPointData(label nFields)
 {
-    foamVtkOutput::legacy::pointDataHeader(os(), nPoints_, nFields);
+    if (legacy_)
+    {
+        legacy::dataHeader
+        (
+            os(),
+            vtkFileTag::POINT_DATA,
+            nPoints_,
+            nFields
+        );
+    }
+    else
+    {
+        format().tag(vtkFileTag::POINT_DATA);
+    }
 }
 
 
 void Foam::foamVtkOutput::patchWriter::endPointData()
-{}
+{
+    if (!legacy_)
+    {
+        format().endTag(vtkFileTag::POINT_DATA);
+    }
+}
+
+
+void Foam::foamVtkOutput::patchWriter::writeFooter()
+{
+    if (!legacy_)
+    {
+        // slight cheat. </Piece> too
+        format().endTag(vtkFileTag::PIECE);
+
+        format().endTag(vtkFileTag::POLY_DATA)
+            .endVTKFile();
+    }
+}
 
 
 void Foam::foamVtkOutput::patchWriter::writePatchIDs()
 {
-    os_ << "patchID 1 " << nFaces_ << " float" << nl;
+    // Patch ids first
+    const uint64_t payLoad = nFaces_ * sizeof(label);
+
+    if (legacy_)
+    {
+        legacy::intField(os_, "patchID", 1, nFaces_);
+    }
+    else
+    {
+        format().openDataArray<label>("patchID")
+            .closeTag();
+    }
+
+    format().writeSize(payLoad);
 
     forAll(patchIDs_, i)
     {
         const label patchId = patchIDs_[i];
 
-        const polyPatch& pp = mesh_.boundaryMesh()[patchId];
+        const label sz = mesh_.boundaryMesh()[patchId].size();
 
-        forAll(pp, facei)
+        for (label facei = 0; facei < sz; ++facei)
         {
             format().write(patchId);
         }
     }
     format().flush();
+
+    if (!legacy_)
+    {
+        format().endDataArray();
+    }
 }
 
 
diff --git a/src/conversion/vtk/output/foamVtkPatchWriter.H b/src/conversion/vtk/output/foamVtkPatchWriter.H
index 10b73e14a9..259050c27c 100644
--- a/src/conversion/vtk/output/foamVtkPatchWriter.H
+++ b/src/conversion/vtk/output/foamVtkPatchWriter.H
@@ -59,20 +59,51 @@ namespace foamVtkOutput
 
 class patchWriter
 {
-    //- Reference to the OpenFOAM mesh (or subset)
-    const fvMesh& mesh_;
+    // Private Member Data
 
-    autoPtr<foamVtkOutput::formatter> format_;
+        //- Reference to the OpenFOAM mesh (or subset)
+        const fvMesh& mesh_;
 
-    const bool nearCellValue_;
+        //- Commonly used query
+        const bool legacy_;
 
-    const labelList patchIDs_;
+        autoPtr<foamVtkOutput::formatter> format_;
 
-    std::ofstream os_;
+        const bool nearCellValue_;
 
-    label nPoints_;
+        const labelList patchIDs_;
+
+        std::ofstream os_;
+
+        label nPoints_;
+
+        label nFaces_;
+
+
+    // Private Member Functions
+
+        //- Begin piece
+        void beginPiece();
+
+        //- Write patch points
+        void writePoints();
+
+        //- Write patch faces
+        void writePolysLegacy();
+
+        //- Write patch faces
+        void writePolys();
+
+        //- Write mesh topology
+        void writeMesh();
+
+
+        //- Disallow default bitwise copy construct
+        patchWriter(const patchWriter&) = delete;
+
+        //- Disallow default bitwise assignment
+        void operator=(const patchWriter&) = delete;
 
-    label nFaces_;
 
 public:
 
@@ -132,6 +163,10 @@ public:
         //- Write cellIDs
         void writePatchIDs();
 
+        //- Write file footer
+        void writeFooter();
+
+
         //- Write volFields
         template<class Type, template<class> class PatchField>
         void write
diff --git a/src/conversion/vtk/output/foamVtkPatchWriterTemplates.C b/src/conversion/vtk/output/foamVtkPatchWriterTemplates.C
index d9d733efbc..4c23bdc016 100644
--- a/src/conversion/vtk/output/foamVtkPatchWriterTemplates.C
+++ b/src/conversion/vtk/output/foamVtkPatchWriterTemplates.C
@@ -34,13 +34,24 @@ void Foam::foamVtkOutput::patchWriter::write
     const UPtrList<const GeometricField<Type, PatchField, volMesh>>& flds
 )
 {
+    const int nCmpt(pTraits<Type>::nComponents);
+    const uint64_t payLoad(nFaces_ * nCmpt * sizeof(float));
+
     forAll(flds, fieldi)
     {
         const auto& fld = flds[fieldi];
 
-        os_ << fld.name() << ' '
-            << int(pTraits<Type>::nComponents) << ' '
-            << nFaces_ << " float" << nl;
+        if (legacy_)
+        {
+            legacy::floatField(os_, fld.name(), nCmpt, nFaces_);
+        }
+        else
+        {
+            format().openDataArray<float, nCmpt>(fld.name())
+                .closeTag();
+        }
+
+        format().writeSize(payLoad);
 
         forAll(patchIDs_, i)
         {
@@ -57,6 +68,11 @@ void Foam::foamVtkOutput::patchWriter::write
         }
 
         format().flush();
+
+        if (!legacy_)
+        {
+            format().endDataArray();
+        }
     }
 }
 
@@ -67,13 +83,24 @@ void Foam::foamVtkOutput::patchWriter::write
     const UPtrList<const GeometricField<Type, PatchField, pointMesh>>& flds
 )
 {
+    const int nCmpt(pTraits<Type>::nComponents);
+    const uint64_t payLoad(nPoints_ * nCmpt * sizeof(float));
+
     forAll(flds, fieldi)
     {
         const auto& fld = flds[fieldi];
 
-        os_ << fld.name() << ' '
-            << int(pTraits<Type>::nComponents) << ' '
-            << nPoints_ << " float" << nl;
+        if (legacy_)
+        {
+            legacy::floatField(os_, fld.name(), nCmpt, nPoints_);
+        }
+        else
+        {
+            format().openDataArray<float, nCmpt>(fld.name())
+                .closeTag();
+        }
+
+        format().writeSize(payLoad);
 
         forAll(patchIDs_, i)
         {
@@ -81,7 +108,13 @@ void Foam::foamVtkOutput::patchWriter::write
 
             foamVtkOutput::writeList(format(), pfld.patchInternalField()());
         }
+
         format().flush();
+
+        if (!legacy_)
+        {
+            format().endDataArray();
+        }
     }
 }
 
@@ -93,15 +126,24 @@ void Foam::foamVtkOutput::patchWriter::write
     const UPtrList<const GeometricField<Type, fvPatchField, volMesh>>& flds
 )
 {
+    const int nCmpt(pTraits<Type>::nComponents);
+    const uint64_t payLoad(nPoints_ * nCmpt * sizeof(float));
+
     forAll(flds, fieldi)
     {
         const auto& fld = flds[fieldi];
 
-        os_ << fld.name() << ' '
-            << int(pTraits<Type>::nComponents) << ' '
-            << nPoints_ << " float" << nl;
+        if (legacy_)
+        {
+            legacy::floatField(os_, fld.name(), nCmpt, nPoints_);
+        }
+        else
+        {
+            format().openDataArray<float, nCmpt>(fld.name())
+                .closeTag();
+        }
 
-        DynamicList<floatScalar> fField(pTraits<Type>::nComponents*nPoints_);
+        format().writeSize(payLoad);
 
         forAll(patchIDs_, i)
         {
@@ -121,7 +163,13 @@ void Foam::foamVtkOutput::patchWriter::write
                 foamVtkOutput::writeList(format(), tfield());
             }
         }
+
         format().flush();
+
+        if (!legacy_)
+        {
+            format().endDataArray();
+        }
     }
 }
 
diff --git a/src/conversion/vtk/output/foamVtkSurfaceMeshWriter.C b/src/conversion/vtk/output/foamVtkSurfaceMeshWriter.C
index 12aab0acef..c60e18378b 100644
--- a/src/conversion/vtk/output/foamVtkSurfaceMeshWriter.C
+++ b/src/conversion/vtk/output/foamVtkSurfaceMeshWriter.C
@@ -26,6 +26,158 @@ License
 #include "foamVtkSurfaceMeshWriter.H"
 #include "foamVtkOutput.H"
 
+
+// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
+
+void Foam::foamVtkOutput::surfaceMeshWriter::beginPiece()
+{
+    if (!legacy_)
+    {
+        format()
+            .openTag(vtkFileTag::PIECE)
+            ( "NumberOfPoints", pp_.nPoints() )
+            ( "NumberOfPolys",  pp_.size() )
+            .closeTag();
+    }
+}
+
+
+void Foam::foamVtkOutput::surfaceMeshWriter::writePoints()
+{
+    // payload count
+    const uint64_t payLoad = (pp_.nPoints()*3*sizeof(float));
+
+    if (legacy_)
+    {
+        legacy::beginPoints(os_, pp_.nPoints());
+    }
+    else
+    {
+        format().tag(vtkFileTag::POINTS)
+            .openDataArray<float, 3>(vtkFileTag::POINTS)
+            .closeTag();
+    }
+
+    format().writeSize(payLoad);
+
+    foamVtkOutput::writeList(format(), pp_.localPoints());
+    format().flush();
+
+    if (!legacy_)
+    {
+        format()
+            .endDataArray()
+            .endTag(vtkFileTag::POINTS);
+    }
+}
+
+
+void Foam::foamVtkOutput::surfaceMeshWriter::writePolysLegacy()
+{
+    // connectivity count without additional storage (done internally)
+    uint64_t nConnectivity = 0;
+    forAll(pp_, facei)
+    {
+        nConnectivity += pp_[facei].size();
+    }
+
+    legacy::beginPolys(os_, pp_.size(), nConnectivity);
+
+
+    // legacy: size + connectivity together
+    // [nPts, id1, id2, ..., nPts, id1, id2, ...]
+
+    forAll(pp_, facei)
+    {
+        const face& f = pp_.localFaces()[facei];
+
+        format().write(f.size());  // The size prefix
+        foamVtkOutput::writeList(format(), f);
+    }
+
+    format().flush();
+}
+
+
+void Foam::foamVtkOutput::surfaceMeshWriter::writePolys()
+{
+    //
+    // 'connectivity'
+    //
+
+    format().tag(vtkFileTag::POLYS);
+
+    //
+    // 'connectivity'
+    //
+    {
+        // payload count
+        uint64_t payLoad = 0;
+        forAll(pp_, facei)
+        {
+            payLoad += pp_[facei].size();
+        }
+
+        format().openDataArray<label>("connectivity")
+            .closeTag();
+
+        // payload size
+        format().writeSize(payLoad * sizeof(label));
+
+        forAll(pp_, facei)
+        {
+            const face& f = pp_.localFaces()[facei];
+            foamVtkOutput::writeList(format(), f);
+        }
+
+        format().flush();
+
+        format()
+            .endDataArray();
+    }
+
+
+    //
+    // 'offsets'  (connectivity offsets)
+    //
+    {
+        format()
+            .openDataArray<label>("offsets")
+            .closeTag();
+
+        // payload size
+        format().writeSize(pp_.size() * sizeof(label));
+
+        label off = 0;
+        forAll(pp_, facei)
+        {
+            off += pp_[facei].size();
+
+            format().write(off);
+        }
+
+        format().flush();
+        format().endDataArray();
+    }
+
+    format().endTag(vtkFileTag::POLYS);
+}
+
+
+void Foam::foamVtkOutput::surfaceMeshWriter::writeMesh()
+{
+    writePoints();
+    if (legacy_)
+    {
+        writePolysLegacy();
+    }
+    else
+    {
+        writePolys();
+    }
+}
+
+
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 Foam::foamVtkOutput::surfaceMeshWriter::surfaceMeshWriter
@@ -37,46 +189,33 @@ Foam::foamVtkOutput::surfaceMeshWriter::surfaceMeshWriter
 )
 :
     pp_(pp),
+    legacy_(outOpts.legacy()),
     format_(),
     os_()
 {
     outputOptions opts(outOpts);
-    opts.legacy(true);  // Legacy only, no append
+    opts.legacy(true);  // No append supported
 
-    os_.open((baseName + (opts.legacy() ? ".vtk" : ".vtp")).c_str());
+    os_.open((baseName + (legacy_ ? ".vtk" : ".vtp")).c_str());
     format_ = opts.newFormatter(os_);
 
-    if (opts.legacy())
+    if (legacy_)
     {
-        foamVtkOutput::legacy::fileHeader(format(), name)
-            << "DATASET POLYDATA" << nl;
+        legacy::fileHeader(format(), name, vtkFileTag::POLY_DATA);
+    }
+    else
+    {
+        // XML (inline)
+
+        format()
+            .xmlHeader()
+            .xmlComment(name)
+            .beginVTKFile(vtkFileTag::POLY_DATA, "0.1");
+
     }
 
-    //------------------------------------------------------------------
-
-    // Write topology
-    label nFaceVerts = pp.size();
-
-    forAll(pp, facei)
-    {
-        nFaceVerts += pp[facei].size();
-    }
-
-    os_ << "POINTS " << pp.nPoints() << " float" << nl;
-
-    foamVtkOutput::writeList(format(), pp.localPoints());
-    format().flush();
-
-    os_ << "POLYGONS " << pp.size() << ' ' << nFaceVerts << nl;
-
-    forAll(pp, facei)
-    {
-        const face& f = pp.localFaces()[facei];
-
-        format().write(f.size());
-        foamVtkOutput::writeList(format(), f);
-    }
-    format().flush();
+    beginPiece();
+    writeMesh();
 }
 
 
@@ -90,12 +229,37 @@ Foam::foamVtkOutput::surfaceMeshWriter::~surfaceMeshWriter()
 
 void Foam::foamVtkOutput::surfaceMeshWriter::beginCellData(label nFields)
 {
-    foamVtkOutput::legacy::cellDataHeader(os(), pp_.size(), nFields);
+    if (legacy_)
+    {
+        legacy::dataHeader(os(), vtkFileTag::CELL_DATA, pp_.size(), nFields);
+    }
+    else
+    {
+        format().tag(vtkFileTag::CELL_DATA);
+    }
 }
 
 
 void Foam::foamVtkOutput::surfaceMeshWriter::endCellData()
-{}
+{
+    if (!legacy_)
+    {
+        format().endTag(vtkFileTag::CELL_DATA);
+    }
+}
+
+
+void Foam::foamVtkOutput::surfaceMeshWriter::writeFooter()
+{
+    if (!legacy_)
+    {
+        // slight cheat. </Piece> too
+        format().endTag(vtkFileTag::PIECE);
+
+        format().endTag(vtkFileTag::POLY_DATA)
+            .endVTKFile();
+    }
+}
 
 
 // ************************************************************************* //
diff --git a/src/conversion/vtk/output/foamVtkSurfaceMeshWriter.H b/src/conversion/vtk/output/foamVtkSurfaceMeshWriter.H
index 30a5f5de46..d911998dec 100644
--- a/src/conversion/vtk/output/foamVtkSurfaceMeshWriter.H
+++ b/src/conversion/vtk/output/foamVtkSurfaceMeshWriter.H
@@ -58,12 +58,41 @@ namespace foamVtkOutput
 
 class surfaceMeshWriter
 {
-    const indirectPrimitivePatch& pp_;
+    // Private Member Data
 
-    autoPtr<foamVtkOutput::formatter> format_;
+        const indirectPrimitivePatch& pp_;
 
-    std::ofstream os_;
+        //- Commonly used query
+        const bool legacy_;
 
+        autoPtr<foamVtkOutput::formatter> format_;
+
+        std::ofstream os_;
+
+
+    // Private Member Functions
+
+        //- Begin piece
+        void beginPiece();
+
+        //- Write patch points
+        void writePoints();
+
+        //- Write patch faces
+        void writePolysLegacy();
+
+        //- Write patch faces
+        void writePolys();
+
+        //- Write mesh topology
+        void writeMesh();
+
+
+        //- Disallow default bitwise copy construct
+        surfaceMeshWriter(const surfaceMeshWriter&) = delete;
+
+        //- Disallow default bitwise assignment
+        void operator=(const surfaceMeshWriter&) = delete;
 
 public:
 
@@ -95,19 +124,25 @@ public:
             return format_();
         }
 
+        //- Open write for CellData of count fields.
+        //  The parameters are only used for the legacy format.
         void beginCellData(label nFields);
 
+        //- Close write for CellData
         void endCellData();
 
+        //- Write file footer
+        void writeFooter();
 
-        //- Extract face data
+
+        //- Get face field
         template<class Type>
         tmp<Field<Type>> getFaceField
         (
             const GeometricField<Type, fvsPatchField, surfaceMesh>& sfld
         ) const;
 
-        //- Write surfaceFields
+        //- Write surface fields
         template<class Type>
         void write
         (
diff --git a/src/conversion/vtk/output/foamVtkSurfaceMeshWriterTemplates.C b/src/conversion/vtk/output/foamVtkSurfaceMeshWriterTemplates.C
index b39ea2bf53..654475aa71 100644
--- a/src/conversion/vtk/output/foamVtkSurfaceMeshWriterTemplates.C
+++ b/src/conversion/vtk/output/foamVtkSurfaceMeshWriterTemplates.C
@@ -50,7 +50,7 @@ Foam::foamVtkOutput::surfaceMeshWriter::getFaceField
         }
         else
         {
-            label localFacei = facei - patches[patchi].start();
+            const label localFacei = facei - patches[patchi].start();
             fld[i] = sfld.boundaryField()[patchi][localFacei];
         }
     }
@@ -68,18 +68,32 @@ void Foam::foamVtkOutput::surfaceMeshWriter::write
     >& sflds
 )
 {
+    const int nCmpt(pTraits<Type>::nComponents);
+    const uint64_t payLoad(pp_.size() * nCmpt * sizeof(float));
+
     forAll(sflds, fieldi)
     {
-        const GeometricField<Type, fvsPatchField, surfaceMesh>& fld =
-            sflds[fieldi];
+        const auto& fld = sflds[fieldi];
 
-        os_ << fld.name() << ' '
-            << int(pTraits<Type>::nComponents) << ' '
-            << pp_.size() << " float" << std::endl;
+        if (legacy_)
+        {
+            legacy::floatField(os(), fld.name(), nCmpt, pp_.size());
+        }
+        else
+        {
+            format().openDataArray<float, nCmpt>(fld.name())
+                .closeTag();
+        }
 
+        format().writeSize(payLoad);
         foamVtkOutput::writeList(format(), getFaceField(fld)());
 
         format().flush();
+
+        if (!legacy_)
+        {
+            format().endDataArray();
+        }
     }
 }
 
diff --git a/src/conversion/vtk/output/foamVtkWriteSurfFields.C b/src/conversion/vtk/output/foamVtkWriteSurfFields.C
index 97d85b29f2..9bc09e4864 100644
--- a/src/conversion/vtk/output/foamVtkWriteSurfFields.C
+++ b/src/conversion/vtk/output/foamVtkWriteSurfFields.C
@@ -41,47 +41,98 @@ void Foam::foamVtkOutput::writeSurfFields
 )
 {
     outputOptions opts(outOpts);
-    opts.legacy(true);  // Legacy only, no append
+    opts.append(false);  // No append supported
 
-    std::ofstream os((baseName + (opts.legacy() ? ".vtk" : ".vtp")).c_str());
+    const bool legacy_(opts.legacy());
+
+    std::ofstream os((baseName + (legacy_ ? ".vtk" : ".vtp")).c_str());
     autoPtr<foamVtkOutput::formatter> format = opts.newFormatter(os);
 
-    if (opts.legacy())
+    // Same payload size for points and vector fields!
+    const int nCmpt(3);  // vector
+    const uint64_t payLoad(mesh.nFaces() * 3 * sizeof(float));
+
+    if (legacy_)
     {
-        foamVtkOutput::legacy::fileHeader(format(), "surfaceFields")
-            << "DATASET POLYDATA" << nl;
+        legacy::fileHeader(format(), "surfaceFields", vtkFileTag::POLY_DATA);
+        legacy::beginPoints(os, mesh.nFaces());
+    }
+    else
+    {
+        // XML (inline)
+
+        format()
+            .xmlHeader()
+            .xmlComment("surfaceFields")
+            .beginVTKFile(vtkFileTag::POLY_DATA, "0.1");
+
+        // Tricky - hide in beginPiece()
+        format()
+            .openTag(vtkFileTag::PIECE)
+            ( "NumberOfPoints", mesh.nFaces() )
+            .closeTag();
+
+        format().tag(vtkFileTag::POINTS)
+            .openDataArray<float,3>(vtkFileTag::POINTS)
+            .closeTag();
     }
 
     const pointField& fc = mesh.faceCentres();
 
-    os << "POINTS " << mesh.nFaces() << " float" << nl;
-
+    format().writeSize(payLoad);
     foamVtkOutput::writeList(format(), fc);
     format().flush();
 
-    foamVtkOutput::legacy::pointDataHeader
-    (
-        os,
-        mesh.nFaces(),
-        surfVectorFields.size()
-    );
+    if (!legacy_)
+    {
+        format()
+            .endDataArray()
+            .endTag(vtkFileTag::POINTS);
+    }
 
 
+    // Fields
+    if (legacy_)
+    {
+        legacy::dataHeader
+        (
+            os,
+            vtkFileTag::POINT_DATA,
+            mesh.nFaces(),
+            surfVectorFields.size()
+        );
+    }
+    else
+    {
+        format().tag(vtkFileTag::POINT_DATA);
+    }
+
     // surfVectorFields
     forAll(surfVectorFields, fieldi)
     {
-        const surfaceVectorField& svf = surfVectorFields[fieldi];
+        const auto& fld = surfVectorFields[fieldi];
 
-        os  << svf.name() << " 3 " << mesh.nFaces() << " float" << nl;
-        for (label facei=0; facei < mesh.nInternalFaces(); ++facei)
+        if (legacy_)
         {
-            foamVtkOutput::write(format(), svf[facei]);
+            legacy::floatField(os, fld.name(), nCmpt, mesh.nFaces());
+        }
+        else
+        {
+            format().openDataArray<float, nCmpt>(fld.name())
+                .closeTag();
         }
 
-        forAll(svf.boundaryField(), patchi)
+        format().writeSize(payLoad);
+
+        for (label facei=0; facei < mesh.nInternalFaces(); ++facei)
+        {
+            foamVtkOutput::write(format(), fld[facei]);
+        }
+
+        forAll(fld.boundaryField(), patchi)
         {
             const fvPatch& pp = mesh.boundary()[patchi];
-            const fvsPatchVectorField& pf = svf.boundaryField()[patchi];
+            const auto& pf = fld.boundaryField()[patchi];
 
             if (isA<emptyFvsPatchVectorField>(pf))
             {
@@ -98,6 +149,22 @@ void Foam::foamVtkOutput::writeSurfFields
         }
 
         format().flush();
+
+        if (!legacy_)
+        {
+            format().endDataArray();
+        }
+    }
+
+    if (!legacy_)
+    {
+        format().endTag(vtkFileTag::POINT_DATA);
+
+        // slight cheat. </Piece> too
+        format().endTag(vtkFileTag::PIECE);
+
+        format().endTag(vtkFileTag::POLY_DATA)
+            .endVTKFile();
     }
 }
 
diff --git a/src/conversion/vtk/output/foamVtkWriteSurfFields.H b/src/conversion/vtk/output/foamVtkWriteSurfFields.H
index e34c11d043..80727dec54 100644
--- a/src/conversion/vtk/output/foamVtkWriteSurfFields.H
+++ b/src/conversion/vtk/output/foamVtkWriteSurfFields.H
@@ -25,7 +25,7 @@ InNamespace
     Foam::foamVtkOutput
 
 Description
-    Write a patch with its data.
+    Write surface fields as vectors
 
 SourceFiles
     foamVtkWriteSurfFields.C
diff --git a/src/fileFormats/vtk/format/foamVtkFormatter.C b/src/fileFormats/vtk/format/foamVtkFormatter.C
index bc8c4696ea..0c2ce22574 100644
--- a/src/fileFormats/vtk/format/foamVtkFormatter.C
+++ b/src/fileFormats/vtk/format/foamVtkFormatter.C
@@ -65,7 +65,7 @@ Foam::foamVtkOutput::formatter::xmlHeader()
 
 
 Foam::foamVtkOutput::formatter&
-Foam::foamVtkOutput::formatter::comment(const std::string& text)
+Foam::foamVtkOutput::formatter::xmlComment(const std::string& comment)
 {
     if (inTag_)
     {
@@ -75,7 +75,7 @@ Foam::foamVtkOutput::formatter::comment(const std::string& text)
     }
 
     indent();
-    os_ << "<!-- " << text << " -->" << nl;
+    os_ << "<!-- " << comment << " -->" << nl;
 
     return *this;
 }
diff --git a/src/fileFormats/vtk/format/foamVtkFormatter.H b/src/fileFormats/vtk/format/foamVtkFormatter.H
index 248730c726..40c7ed98d5 100644
--- a/src/fileFormats/vtk/format/foamVtkFormatter.H
+++ b/src/fileFormats/vtk/format/foamVtkFormatter.H
@@ -152,7 +152,7 @@ public:
 
         //- Write XML comment (at the current indentation level)
         //  \return formatter for chaining
-        formatter& comment(const std::string& text);
+        formatter& xmlComment(const std::string& comment);
 
 
         //- Open XML tag
diff --git a/src/fileFormats/vtk/output/foamVtkOutput.C b/src/fileFormats/vtk/output/foamVtkOutput.C
index 7c2385c07a..1f8dfdf503 100644
--- a/src/fileFormats/vtk/output/foamVtkOutput.C
+++ b/src/fileFormats/vtk/output/foamVtkOutput.C
@@ -36,15 +36,11 @@ License
 
 // * * * * * * * * * * * * * * * Static Data * * * * * * * * * * * * * * * * //
 
-const Foam::Enum<Foam::foamVtkOutput::legacy::textElemType>
-Foam::foamVtkOutput::legacy::textNames
+const Foam::Enum<Foam::vtkFileTag>
+Foam::foamVtkOutput::legacy::contentNames
 {
-    { textElemType::POINTS,            "POINTS" },
-    { textElemType::CELLS,             "CELLS" },
-    { textElemType::POLYS,             "POLYGONS" },
-    { textElemType::VERTS,             "VERTICES" },
-    { textElemType::POLY_DATA,         "POLYDATA" },
-    { textElemType::UNSTRUCTURED_GRID, "UNSTRUCTURED_GRID" },
+    { vtkFileTag::POLY_DATA,         "POLYDATA" },
+    { vtkFileTag::UNSTRUCTURED_GRID, "UNSTRUCTURED_GRID" },
 };
 
 
@@ -128,66 +124,23 @@ Foam::label Foam::foamVtkOutput::writeVtmFile
 }
 
 
-std::ostream& Foam::foamVtkOutput::legacy::fileHeader
-(
-    std::ostream& os,
-    const std::string& title,
-    const bool binary
-)
-{
-    os  << "# vtk DataFile Version 2.0" << nl
-        << title << nl
-        << (binary ? "BINARY" : "ASCII") << nl;
-
-    return os;
-}
-
-
 std::ostream& Foam::foamVtkOutput::legacy::fileHeader
 (
     foamVtkOutput::formatter& fmt,
-    const std::string& title
+    const std::string& title,
+    const std::string& contentType
 )
 {
-    return fileHeader(fmt.os(), title, isType<legacyRawFormatter>(fmt));
-}
+    std::ostream& os = fmt.os();
 
-
-std::ostream& Foam::foamVtkOutput::legacy::dataHeader
-(
-    std::ostream& os,
-    const vtkFileTag& dataTypeTag,
-    const label nEntries,
-    const label nFields
-)
-{
-    os  << dataTypeNames[dataTypeTag] << ' ' << nEntries << nl
-        << "FIELD attributes " << nFields << nl;
+    fileHeader(os, title, isType<legacyRawFormatter>(fmt));
+    if (!contentType.empty())
+    {
+        os << "DATASET " << contentType.c_str() << nl;
+    }
 
     return os;
 }
 
 
-std::ostream& Foam::foamVtkOutput::legacy::cellDataHeader
-(
-    std::ostream& os,
-    const label nEntries,
-    const label nFields
-)
-{
-    return dataHeader(os, vtkFileTag::CELL_DATA, nEntries, nFields);
-}
-
-
-std::ostream& Foam::foamVtkOutput::legacy::pointDataHeader
-(
-    std::ostream& os,
-    const label nEntries,
-    const label nFields
-)
-{
-    return dataHeader(os, vtkFileTag::POINT_DATA, nEntries, nFields);
-}
-
-
 // ************************************************************************* //
diff --git a/src/fileFormats/vtk/output/foamVtkOutput.H b/src/fileFormats/vtk/output/foamVtkOutput.H
index 5be62c87c9..f298d6ff12 100644
--- a/src/fileFormats/vtk/output/foamVtkOutput.H
+++ b/src/fileFormats/vtk/output/foamVtkOutput.H
@@ -32,7 +32,7 @@ Namespace
     Foam::foamVtkOutput::legacy
 
 Description
-    Namespace for legacy VTK output functions.
+    Namespace for legacy VTK output constants and functions.
 
 SourceFiles
     foamVtkOutput.C
@@ -65,6 +65,9 @@ namespace foamVtkOutput
     typedef formatter::headerType headerType;
 
 
+  // Constants
+
+
   // General Functions
 
     //- Return a default asciiFormatter
@@ -101,6 +104,15 @@ namespace foamVtkOutput
         const UList<Type>& lst
     );
 
+    //- Write a list of values.
+    //  The output does not include the payload size.
+    template<class Type, unsigned Size>
+    void writeList
+    (
+        foamVtkOutput::formatter& fmt,
+        const FixedList<Type, Size>& lst
+    );
+
 
     //- Write a list of values via indirect addressing.
     //  The output does not include the payload size.
@@ -120,49 +132,68 @@ namespace foamVtkOutput
 //- Some minimal additional support for writing legacy files
 namespace legacy
 {
-    //- Some standard text elements for legacy vtk files
-    enum class textElemType
-    {
-        POINTS,             //!< "POINTS"
-        CELLS,              //!< "CELLS"
-        POLYS,              //!< "POLYGONS"
-        VERTS,              //!< "VERTICES"
-        POLY_DATA,          //!< "POLYDATA"
-        UNSTRUCTURED_GRID,  //!< "UNSTRUCTURED_GRID"
-    };
 
-    //- Strings corresponding to the elements
-    extern const Foam::Enum<textElemType> textNames;
+  // Constants
 
-    //- Strings corresponding to the elements
-    extern const Foam::Enum<vtkFileTag>   dataTypeNames;
+    //- Strings corresponding to the (POLYDATA, UNSTRUCTURED_GRID) elements
+    extern const Foam::Enum<vtkFileTag> contentNames;
+
+    //- Strings corresponding to the (CELL_DATA, POINT_DATA) elements
+    extern const Foam::Enum<vtkFileTag> dataTypeNames;
 
 
   // Functions
 
     //- Emit header for legacy file.
     //  Writes "ASCII" or "BINARY" depending on specified type.
-    std::ostream& fileHeader
+    inline std::ostream& fileHeader
     (
         std::ostream& os,
         const std::string& title,
-        const bool binary = false
+        const bool binary
     );
 
-    //- Emit header for legacy file.
-    //  Writes "ASCII" or "BINARY" depending on the formatter type.
+    //- Emit header for legacy file, with "ASCII" or "BINARY" depending on
+    //  the formatter type.
+    //  Includes "DATASET" with the specified dataset type.
+    inline void fileHeader
+    (
+        foamVtkOutput::formatter& fmt,
+        const std::string& title,
+        const vtkFileTag& contentTypeTag
+    );
+
+    //- Emit header for legacy file, with "ASCII" or "BINARY" depending on
+    //  the formatter type.
+    //  If the contentType is non-empty, it is used for "DATASET" line.
     std::ostream& fileHeader
     (
         foamVtkOutput::formatter& fmt,
-        const std::string& title
+        const std::string& title,
+        const std::string& contentType
     );
 
 
-    //- Emit header for legacy CELL_DATA or POINT_DATA, corresponding to the
-    //  enumeration textElemType::CELLS or textElemType::POINTS, respectively.
+    //- Emit header for POINTS (with trailing newline).
+    inline void beginPoints(std::ostream& os, const label nPoints);
+
+    //- Emit header for POLYGONS (with trailing newline).
+    //  The nConnectivity is the sum of all connectivity points used,
+    //  but \b without additional space for the size prefixes.
+    //  The additional prefix sizes are added internally.
+    inline void beginPolys
+    (
+        std::ostream& os,
+        const label nPolys,
+        const label nConnectivity
+    );
+
+
+    //- Use the enumerations vtkFileTag::CELL_DATA, vtkFileTag::POINT_DATA,
+    //  to emit a legacy CELL_DATA, POINT_DATA element.
     //  The nEntries corresponds similarly to the number of cells or points,
     //  respectively.
-    std::ostream& dataHeader
+    inline void dataHeader
     (
         std::ostream& os,
         const vtkFileTag& dataTypeTag,
@@ -170,62 +201,36 @@ namespace legacy
         const label nFields
     );
 
-    //- Emit header for legacy CELL_DATA.
-    //  The nEntries should normally correspond to the number of cells.
-    std::ostream& cellDataHeader
+    //- Start output of float field with the specified name.
+    inline void floatField
     (
         std::ostream& os,
-        const label nEntries,
-        const label nFields
+        const word& name,
+        const label nCmpt,
+        const label nEntries
     );
 
-    //- Emit header for legacy POINT_DATA
-    //  The nEntries should normally correspond to the number of points.
-    std::ostream& pointDataHeader
+    //- Start output of int field with the specified name.
+    inline void intField
     (
         std::ostream& os,
-        const label nEntries,
-        const label nFields
+        const word& name,
+        const label nCmpt,
+        const label nEntries
     );
 
 };
 
-
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-//- Template specialization for label
-template<>
-inline void write<label>(foamVtkOutput::formatter& fmt, const label& val)
-{
-    fmt.write(val);
-}
-
-
-//- Template specialization for float
-template<>
-inline void write<float>(foamVtkOutput::formatter& fmt, const float& val)
-{
-    fmt.write(val);
-}
-
-
-//- Template specialization for double
-template<>
-inline void write<double>(foamVtkOutput::formatter& fmt, const double& val)
-{
-    fmt.write(val);
-}
-
 } // End namespace foamVtkOutput
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
 } // End namespace Foam
 
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+#include "foamVtkOutputI.H"
+
 #ifdef NoRepository
     #include "foamVtkOutputTemplates.C"
 #endif
diff --git a/src/fileFormats/vtk/output/foamVtkOutputI.H b/src/fileFormats/vtk/output/foamVtkOutputI.H
new file mode 100644
index 0000000000..192caea831
--- /dev/null
+++ b/src/fileFormats/vtk/output/foamVtkOutputI.H
@@ -0,0 +1,146 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2017 OpenCFD Ltd.
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+// * * * * * * * * * * * * * * Specializations * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace foamVtkOutput
+{
+
+//- Template specialization for label
+template<>
+inline void write<label>(foamVtkOutput::formatter& fmt, const label& val)
+{
+    fmt.write(val);
+}
+
+
+//- Template specialization for float
+template<>
+inline void write<float>(foamVtkOutput::formatter& fmt, const float& val)
+{
+    fmt.write(val);
+}
+
+
+//- Template specialization for double
+template<>
+inline void write<double>(foamVtkOutput::formatter& fmt, const double& val)
+{
+    fmt.write(val);
+}
+
+} // End namespace foamVtkOutput
+} // End namespace Foam
+
+
+// * * * * * * * * * * * * * * Global Functions  * * * * * * * * * * * * * * //
+
+inline std::ostream& Foam::foamVtkOutput::legacy::fileHeader
+(
+    std::ostream& os,
+    const std::string& title,
+    const bool binary
+)
+{
+    os  << "# vtk DataFile Version 2.0" << nl
+        << title << nl
+        << (binary ? "BINARY" : "ASCII") << nl;
+
+    return os;
+}
+
+
+inline void Foam::foamVtkOutput::legacy::fileHeader
+(
+    foamVtkOutput::formatter& fmt,
+    const std::string& title,
+    const vtkFileTag& contentTypeTag
+)
+{
+    fileHeader(fmt, title, contentNames[contentTypeTag]);
+}
+
+
+inline void Foam::foamVtkOutput::legacy::beginPoints
+(
+    std::ostream& os,
+    const label nPoints
+)
+{
+    os  << "POINTS " << nPoints << " float" << nl;
+}
+
+
+inline void Foam::foamVtkOutput::legacy::beginPolys
+(
+    std::ostream& os,
+    const label nPolys,
+    const label nConnectivity
+)
+{
+    os  << "POLYGONS " << nPolys << ' ' << (nPolys + nConnectivity) << nl;
+}
+
+
+inline void Foam::foamVtkOutput::legacy::dataHeader
+(
+    std::ostream& os,
+    const vtkFileTag& dataTypeTag,
+    const label nEntries,
+    const label nFields
+)
+{
+    os  << dataTypeNames[dataTypeTag] << ' ' << nEntries << nl
+        << "FIELD attributes " << nFields << nl;
+}
+
+
+inline void Foam::foamVtkOutput::legacy::floatField
+(
+    std::ostream& os,
+    const word& fieldName,
+    const label nCmpt,
+    const label nEntries
+)
+{
+    os  << fieldName << ' ' << nCmpt << ' ' << nEntries << " float" << nl;
+}
+
+
+inline void Foam::foamVtkOutput::legacy::intField
+(
+    std::ostream& os,
+    const word& fieldName,
+    const label nCmpt,
+    const label nEntries
+)
+{
+    os  << fieldName << ' ' << nCmpt << ' ' << nEntries << " int" << nl;
+}
+
+
+// ************************************************************************* //
diff --git a/src/fileFormats/vtk/output/foamVtkOutputTemplates.C b/src/fileFormats/vtk/output/foamVtkOutputTemplates.C
index 9738740b8e..f565602b6c 100644
--- a/src/fileFormats/vtk/output/foamVtkOutputTemplates.C
+++ b/src/fileFormats/vtk/output/foamVtkOutputTemplates.C
@@ -53,6 +53,20 @@ void Foam::foamVtkOutput::writeList
 }
 
 
+template<class Type, unsigned Size>
+void Foam::foamVtkOutput::writeList
+(
+    foamVtkOutput::formatter& fmt,
+    const FixedList<Type, Size>& lst
+)
+{
+    for (unsigned i=0; i<Size; ++i)
+    {
+        write(fmt, lst[i]);
+    }
+}
+
+
 template<class Type>
 void Foam::foamVtkOutput::writeList
 (
diff --git a/src/meshTools/output/foamVtkWriteCellSetFaces.C b/src/meshTools/output/foamVtkWriteCellSetFaces.C
index 0c9c33d55d..02d3e5a11f 100644
--- a/src/meshTools/output/foamVtkWriteCellSetFaces.C
+++ b/src/meshTools/output/foamVtkWriteCellSetFaces.C
@@ -43,14 +43,15 @@ void Foam::foamVtkOutput::writeCellSetFaces
     outputOptions opts(outOpts);
     opts.legacy(true);  // Legacy only, no append
 
-    std::ofstream os((baseName + (opts.legacy() ? ".vtk" : ".vtp")).c_str());
+    const bool legacy_(opts.legacy());
+
+    std::ofstream os((baseName + (legacy_ ? ".vtk" : ".vtp")).c_str());
 
     autoPtr<foamVtkOutput::formatter> format = opts.newFormatter(os);
 
-    if (opts.legacy())
+    if (legacy_)
     {
-        foamVtkOutput::legacy::fileHeader(format(), set.name())
-            << "DATASET POLYDATA" << nl;
+        legacy::fileHeader(format(), set.name(), vtkFileTag::POLY_DATA);
     }
 
     //-------------------------------------------------------------------------
@@ -106,30 +107,35 @@ void Foam::foamVtkOutput::writeCellSetFaces
     //-------------------------------------------------------------------------
 
     // Write points and faces as polygons
-    os << "POINTS " << pp.nPoints() << " float" << nl;
+    legacy::beginPoints(os, pp.nPoints());
 
     foamVtkOutput::writeList(format(), pp.localPoints());
     format().flush();
 
-    label count = pp.size();
+    // connectivity count without additional storage (done internally)
+    uint64_t nConnectivity = 0;
     forAll(pp, facei)
     {
-        count += pp.localFaces()[facei].size();
+        nConnectivity += pp[facei].size();
     }
-    os << "POLYGONS " << pp.size() << ' ' << count << nl;
 
+    legacy::beginPolys(os, pp.size(), nConnectivity);
+
+
+    // legacy: size + connectivity together
+    // [nPts, id1, id2, ..., nPts, id1, id2, ...]
     forAll(pp, facei)
     {
         const face& f = pp.localFaces()[facei];
 
-        format().write(f.size());
+        format().write(f.size());  // The size prefix
         foamVtkOutput::writeList(format(), f);
     }
     format().flush();
 
 
     // Write data - faceId/cellId
-    foamVtkOutput::legacy::cellDataHeader(os, pp.size(), 1);
+    legacy::dataHeader(os, vtkFileTag::CELL_DATA, pp.size(), 1);
 
     os << "cellID 1 " << pp.size() << " int" << nl;
 
diff --git a/src/meshTools/output/foamVtkWriteFaceSet.C b/src/meshTools/output/foamVtkWriteFaceSet.C
index 8d2b4bb4f6..86d45e9ae8 100644
--- a/src/meshTools/output/foamVtkWriteFaceSet.C
+++ b/src/meshTools/output/foamVtkWriteFaceSet.C
@@ -43,14 +43,15 @@ void Foam::foamVtkOutput::writeFaceSet
     outputOptions opts(outOpts);
     opts.legacy(true);  // Legacy only, no append
 
-    std::ofstream os((baseName + (opts.legacy() ? ".vtk" : ".vtp")).c_str());
+    const bool legacy_(opts.legacy());
+
+    std::ofstream os((baseName + (legacy_ ? ".vtk" : ".vtp")).c_str());
 
     autoPtr<foamVtkOutput::formatter> format = opts.newFormatter(os);
 
-    if (opts.legacy())
+    if (legacy_)
     {
-        foamVtkOutput::legacy::fileHeader(format(), set.name())
-            << "DATASET POLYDATA" << nl;
+        legacy::fileHeader(format(), set.name(), vtkFileTag::POLY_DATA);
     }
 
     //-------------------------------------------------------------------------
@@ -67,28 +68,36 @@ void Foam::foamVtkOutput::writeFaceSet
     //-------------------------------------------------------------------------
 
     // Write points and faces as polygons
-    os << "POINTS " << pp.nPoints() << " float" << nl;
+    legacy::beginPoints(os, pp.nPoints());
 
     foamVtkOutput::writeList(format(), pp.localPoints());
     format().flush();
 
-    label count = pp.size();
+    // connectivity count without additional storage (done internally)
+    uint64_t nConnectivity = 0;
     forAll(pp, facei)
     {
-        count += pp.localFaces()[facei].size();
+        nConnectivity += pp[facei].size();
     }
-    os << "POLYGONS " << pp.size() << ' ' << count << nl;
+    legacy::beginPolys(os, pp.size(), nConnectivity);
 
+
+    // legacy: size + connectivity together
+    // [nPts, id1, id2, ..., nPts, id1, id2, ...]
     forAll(pp, facei)
     {
         const face& f = pp.localFaces()[facei];
 
-        format().write(f.size());
+        format().write(f.size());  // The size prefix
         foamVtkOutput::writeList(format(), f);
     }
     format().flush();
 
+
     // Write data - faceId/cellId
+
+    legacy::dataHeader(os, vtkFileTag::CELL_DATA, pp.size(), 1);
+
     os << "faceID 1 " << pp.size() << " int" << nl;
 
     foamVtkOutput::writeList(format(), faceLabels);
diff --git a/src/meshTools/output/foamVtkWritePointSet.C b/src/meshTools/output/foamVtkWritePointSet.C
index f111ac75fe..f3a9b7e115 100644
--- a/src/meshTools/output/foamVtkWritePointSet.C
+++ b/src/meshTools/output/foamVtkWritePointSet.C
@@ -42,14 +42,15 @@ void Foam::foamVtkOutput::writePointSet
     outputOptions opts(outOpts);
     opts.legacy(true);  // Legacy only, no append
 
-    std::ofstream os((baseName + (opts.legacy() ? ".vtk" : ".vtp")).c_str());
+    const bool legacy_(opts.legacy());
+
+    std::ofstream os((baseName + (legacy_ ? ".vtk" : ".vtp")).c_str());
 
     autoPtr<foamVtkOutput::formatter> format = opts.newFormatter(os);
 
-    if (opts.legacy())
+    if (legacy_)
     {
-        foamVtkOutput::legacy::fileHeader(format(), set.name())
-            << "DATASET POLYDATA" << nl;
+        legacy::fileHeader(format(), set.name(), vtkFileTag::POLY_DATA);
     }
 
     //-------------------------------------------------------------------------
@@ -57,14 +58,13 @@ void Foam::foamVtkOutput::writePointSet
     const labelList pointLabels(set.sortedToc());
 
     // Write points
-    os << "POINTS " << pointLabels.size() << " float" << nl;
+    legacy::beginPoints(os, pointLabels.size());
 
     foamVtkOutput::writeList(format(), mesh.points(), pointLabels);
     format().flush();
 
-
     // Write data - pointID
-    foamVtkOutput::legacy::pointDataHeader(os, pointLabels.size(), 1);
+    legacy::dataHeader(os, vtkFileTag::POINT_DATA, pointLabels.size(), 1);
 
     os << "pointID 1 " << pointLabels.size() << " int" << nl;
 

From 4cbbe3fd59391485aafb8a1609cbd2f0c440bd36 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Fri, 2 Jun 2017 12:07:43 +0200
Subject: [PATCH 19/27] ENH: add VTP output support for surfMesh

- use proxy writer for triSurface writing
---
 .../surfaceMeshConvertTesting.C               |  16 +-
 src/surfMesh/Make/files                       |   2 +
 .../surfaceFormats/vtk/VTKsurfaceFormat.C     | 201 +++++++-------
 .../surfaceFormats/vtk/VTKsurfaceFormat.H     |  25 +-
 .../surfaceFormats/vtk/VTKsurfaceFormatCore.C | 129 ++++-----
 .../surfaceFormats/vtk/VTKsurfaceFormatCore.H |  25 +-
 .../surfaceFormats/vtp/VTPsurfaceFormat.C     | 251 ++++++++++++++++++
 .../surfaceFormats/vtp/VTPsurfaceFormat.H     | 132 +++++++++
 .../surfaceFormats/vtp/VTPsurfaceFormatCore.C | 149 +++++++++++
 .../surfaceFormats/vtp/VTPsurfaceFormatCore.H |  95 +++++++
 .../vtp/VTPsurfaceFormatRunTime.C             |  98 +++++++
 .../triSurface/interfaces/VTK/writeVTK.C      | 217 +++++++--------
 src/surfMesh/triSurface/triSurface.C          |  41 ++-
 src/surfMesh/triSurface/triSurface.H          | 214 +++++++--------
 14 files changed, 1185 insertions(+), 410 deletions(-)
 create mode 100644 src/surfMesh/surfaceFormats/vtp/VTPsurfaceFormat.C
 create mode 100644 src/surfMesh/surfaceFormats/vtp/VTPsurfaceFormat.H
 create mode 100644 src/surfMesh/surfaceFormats/vtp/VTPsurfaceFormatCore.C
 create mode 100644 src/surfMesh/surfaceFormats/vtp/VTPsurfaceFormatCore.H
 create mode 100644 src/surfMesh/surfaceFormats/vtp/VTPsurfaceFormatRunTime.C

diff --git a/applications/utilities/surface/surfaceMeshConvertTesting/surfaceMeshConvertTesting.C b/applications/utilities/surface/surfaceMeshConvertTesting/surfaceMeshConvertTesting.C
index 5f1c5e9a33..abdeec1c89 100644
--- a/applications/utilities/surface/surfaceMeshConvertTesting/surfaceMeshConvertTesting.C
+++ b/applications/utilities/surface/surfaceMeshConvertTesting/surfaceMeshConvertTesting.C
@@ -159,12 +159,16 @@ int main(int argc, char *argv[])
 
     if
     (
-        !MeshedSurface<face>::canRead(importName, true)
-     ||
-        (
-            !optStdout
-         && !MeshedSurface<face>::canWriteType(exportName.ext(), true)
-        )
+        !args.optionFound("triSurface")
+    &&
+         (
+            !MeshedSurface<face>::canRead(importName, true)
+         ||
+            (
+                !optStdout
+             && !MeshedSurface<face>::canWriteType(exportName.ext(), true)
+            )
+         )
     )
     {
         return 1;
diff --git a/src/surfMesh/Make/files b/src/surfMesh/Make/files
index 10d6171c20..2bf796be62 100644
--- a/src/surfMesh/Make/files
+++ b/src/surfMesh/Make/files
@@ -37,6 +37,8 @@ $(surfaceFormats)/tri/TRIsurfaceFormatCore.C
 $(surfaceFormats)/tri/TRIsurfaceFormatRunTime.C
 $(surfaceFormats)/vtk/VTKsurfaceFormatCore.C
 $(surfaceFormats)/vtk/VTKsurfaceFormatRunTime.C
+$(surfaceFormats)/vtp/VTPsurfaceFormatCore.C
+$(surfaceFormats)/vtp/VTPsurfaceFormatRunTime.C
 $(surfaceFormats)/x3d/X3DsurfaceFormatCore.C
 $(surfaceFormats)/x3d/X3DsurfaceFormatRunTime.C
 
diff --git a/src/surfMesh/surfaceFormats/vtk/VTKsurfaceFormat.C b/src/surfMesh/surfaceFormats/vtk/VTKsurfaceFormat.C
index b0a5d27114..98fed44463 100644
--- a/src/surfMesh/surfaceFormats/vtk/VTKsurfaceFormat.C
+++ b/src/surfMesh/surfaceFormats/vtk/VTKsurfaceFormat.C
@@ -28,26 +28,54 @@ License
 #include "scalarIOField.H"
 #include "faceTraits.H"
 #include "OFstream.H"
+#include "foamVtkOutput.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+// File-scope constant.
+//
+// TODO: make this run-time selectable (ASCII | BINARY)
+// - Legacy mode only
+
+static const Foam::foamVtkOutput::formatType fmtType =
+    Foam::foamVtkOutput::formatType::LEGACY_ASCII;
+    // Foam::foamVtkOutput::formatType::LEGACY_BASE64;
+
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
 template<class Face>
-void Foam::fileFormats::VTKsurfaceFormat<Face>::writeHeaderPolygons
+void Foam::fileFormats::VTKsurfaceFormat<Face>::writePolys
 (
-    Ostream& os,
-    const UList<Face>& faceLst
+    foamVtkOutput::formatter& format,
+    const UList<Face>& faces
 )
 {
-    label nNodes = 0;
-
-    forAll(faceLst, facei)
+    // connectivity count without additional storage (done internally)
+    label nConnectivity = 0;
+    for (const auto& f : faces)
     {
-        nNodes += faceLst[facei].size();
+        nConnectivity += f.size();
     }
 
-    os  << nl
-        << "POLYGONS " << faceLst.size() << ' '
-        << faceLst.size() + nNodes << nl;
+    foamVtkOutput::legacy::beginPolys
+    (
+        format.os(),
+        faces.size(),
+        nConnectivity
+    );
+
+
+    // legacy: size + connectivity together
+    // [nPts, id1, id2, ..., nPts, id1, id2, ...]
+
+    for (const Face& f : faces)
+    {
+        format.write(f.size());  // The size prefix
+        foamVtkOutput::writeList(format, f);
+    }
+
+    format.flush();
 }
 
 
@@ -115,31 +143,37 @@ bool Foam::fileFormats::VTKsurfaceFormat<Face>::read
 
     // Assume all faces in zone0 unless a region field is present
     labelList zones(faces.size(), 0);
-    if (reader.cellData().foundObject<scalarIOField>("region"))
+
+    for (auto fieldName : { "region", "STLSolidLabeling" })
     {
-        const scalarIOField& region =
-            reader.cellData().lookupObject<scalarIOField>
-            (
-                "region"
-            );
-        forAll(region, i)
+        const labelIOField* lptr =
+            reader.cellData().lookupObjectPtr<labelIOField>(fieldName);
+
+        if (lptr)
         {
-            zones[i] = label(region[i]);
-        }
-    }
-    else if (reader.cellData().foundObject<scalarIOField>("STLSolidLabeling"))
-    {
-        const scalarIOField& region =
-            reader.cellData().lookupObject<scalarIOField>
-            (
-                "STLSolidLabeling"
-            );
-        forAll(region, i)
-        {
-            zones[i] = label(region[i]);
+            label i = 0;
+            for (const auto& region : *lptr)
+            {
+                zones[i++] = label(region);
+            }
+            break;
+        }
+
+        const scalarIOField* sptr =
+            reader.cellData().lookupObjectPtr<scalarIOField>(fieldName);
+
+        if (sptr)
+        {
+            label i = 0;
+            for (const auto& region : *sptr)
+            {
+                zones[i++] = label(region);
+            }
+            break;
         }
     }
 
+
     // Create zone names
     const label nZones = max(zones)+1;
     wordList zoneNames(nZones);
@@ -240,54 +274,54 @@ void Foam::fileFormats::VTKsurfaceFormat<Face>::write
 
     const bool useFaceMap = (surf.useFaceMap() && zones.size() > 1);
 
-    OFstream os(filename);
-    if (!os.good())
+    std::ofstream os(filename.c_str());
+
+    autoPtr<foamVtkOutput::formatter> format =
+        foamVtkOutput::newFormatter(os, fmtType);
+
+    writeHeader(format(), pointLst);
+
+    if (useFaceMap)
     {
-        FatalErrorInFunction
-            << "Cannot open file for writing " << filename
-            << exit(FatalError);
-    }
-
-
-    writeHeader(os, pointLst);
-    writeHeaderPolygons(os, faceLst);
-
-    label faceIndex = 0;
-    forAll(zones, zoneI)
-    {
-        const surfZone& zone = zones[zoneI];
-
-        if (useFaceMap)
+        // connectivity count without additional storage (done internally)
+        label nConnectivity = 0;
+        for (const auto& f : faceLst)
         {
-            forAll(zone, localFacei)
+            nConnectivity += f.size();
+        }
+
+        foamVtkOutput::legacy::beginPolys
+        (
+            format().os(),
+            faceLst.size(),
+            nConnectivity
+        );
+
+        label faceIndex = 0;
+        for (const surfZone& zone : zones)
+        {
+            forAll(zone, i)
             {
                 const Face& f = faceLst[faceMap[faceIndex++]];
 
-                os << f.size();
-                forAll(f, fp)
-                {
-                    os << ' ' << f[fp];
-                }
-                os << ' ' << nl;
+                format().write(f.size());  // The size prefix
+                foamVtkOutput::writeList(format(), f);
             }
         }
-        else
-        {
-            forAll(zone, localFacei)
-            {
-                const Face& f = faceLst[faceIndex++];
 
-                os << f.size();
-                forAll(f, fp)
-                {
-                    os << ' ' << f[fp];
-                }
-                os << ' ' << nl;
-            }
-        }
+        format().flush();
+    }
+    else
+    {
+        // Easy to write polys without a faceMap
+        writePolys(format(), faceLst);
     }
 
-    writeTail(os, zones);
+    // Write regions (zones) as CellData
+    if (zones.size() > 1)
+    {
+        writeCellData(format(), zones);
+    }
 }
 
 
@@ -298,33 +332,18 @@ void Foam::fileFormats::VTKsurfaceFormat<Face>::write
     const UnsortedMeshedSurface<Face>& surf
 )
 {
-    OFstream os(filename);
-    if (!os.good())
-    {
-        FatalErrorInFunction
-            << "Cannot open file for writing " << filename
-            << exit(FatalError);
-    }
+    std::ofstream os(filename.c_str());
 
+    autoPtr<foamVtkOutput::formatter> format =
+        foamVtkOutput::newFormatter(os, fmtType);
 
-    const List<Face>& faceLst = surf.surfFaces();
+    writeHeader(format(), surf.points());
 
-    writeHeader(os, surf.points());
-    writeHeaderPolygons(os, faceLst);
+    // Easy to write polys without a faceMap
+    writePolys(format(), surf.surfFaces());
 
-    forAll(faceLst, facei)
-    {
-        const Face& f = faceLst[facei];
-
-        os << f.size();
-        forAll(f, fp)
-        {
-            os << ' ' << f[fp];
-        }
-        os << ' ' << nl;
-    }
-
-    writeTail(os, surf.zoneIds());
+    // Write regions (zones) as CellData
+    writeCellData(format(), surf.zoneIds());
 }
 
 
diff --git a/src/surfMesh/surfaceFormats/vtk/VTKsurfaceFormat.H b/src/surfMesh/surfaceFormats/vtk/VTKsurfaceFormat.H
index 437eb24921..cd0fb232a3 100644
--- a/src/surfMesh/surfaceFormats/vtk/VTKsurfaceFormat.H
+++ b/src/surfMesh/surfaceFormats/vtk/VTKsurfaceFormat.H
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
-     \\/     M anipulation  | Copyright (C) 2016 OpenCFD Ltd.
+     \\/     M anipulation  | Copyright (C) 2016-2017 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -60,8 +60,13 @@ class VTKsurfaceFormat
 {
     // Private Member Functions
 
-        //- Write header information about number of polygon points
-        static void writeHeaderPolygons(Ostream&, const UList<Face>&);
+        //- Write polygons
+        static void writePolys
+        (
+            foamVtkOutput::formatter& format,
+            const UList<Face>& faces
+        );
+
 
         //- Disallow default bitwise copy construct
         VTKsurfaceFormat(const VTKsurfaceFormat<Face>&) = delete;
@@ -75,7 +80,7 @@ public:
     // Constructors
 
         //- Construct from file name
-        VTKsurfaceFormat(const fileName&);
+        VTKsurfaceFormat(const fileName& filename);
 
 
     // Selectors
@@ -97,24 +102,24 @@ public:
 
     // Member Functions
 
-        // Write
+      // Write
 
         //- Write surface mesh components by proxy
         static void write
         (
-            const fileName&,
-            const MeshedSurfaceProxy<Face>&
+            const fileName& filename,
+            const MeshedSurfaceProxy<Face>& surf
         );
 
         //- Write UnsortedMeshedSurface, the output remains unsorted
         static void write
         (
-            const fileName&,
-            const UnsortedMeshedSurface<Face>&
+            const fileName& fileName,
+            const UnsortedMeshedSurface<Face>& surf
         );
 
         //- Read from file
-        virtual bool read(const fileName&);
+        virtual bool read(const fileName& filename);
 
         //- Write object file
         virtual void write(const fileName& name) const
diff --git a/src/surfMesh/surfaceFormats/vtk/VTKsurfaceFormatCore.C b/src/surfMesh/surfaceFormats/vtk/VTKsurfaceFormatCore.C
index 9a28648d0c..c251e1f621 100644
--- a/src/surfMesh/surfaceFormats/vtk/VTKsurfaceFormatCore.C
+++ b/src/surfMesh/surfaceFormats/vtk/VTKsurfaceFormatCore.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2017 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -25,102 +25,103 @@ License
 
 #include "VTKsurfaceFormatCore.H"
 #include "clock.H"
+#include "foamVtkOutput.H"
 
 // * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * //
 
 void Foam::fileFormats::VTKsurfaceFormatCore::writeHeader
 (
-    Ostream& os,
-    const pointField& pointLst
+    foamVtkOutput::formatter& format,
+    const pointField& pts
 )
 {
-    // Write header
-    os  << "# vtk DataFile Version 2.0" << nl
-        << "surface written " << clock::dateTime().c_str() << nl
-        << "ASCII" << nl
-        << nl
-        << "DATASET POLYDATA" << nl;
+    foamVtkOutput::legacy::fileHeader
+    (
+        format,
+        ("surface written " + clock::dateTime()),
+        vtkFileTag::POLY_DATA
+    );
 
-    // Write vertex coords
-    os  << "POINTS " << pointLst.size() << " float" << nl;
-    forAll(pointLst, ptI)
-    {
-        const point& pt = pointLst[ptI];
+    foamVtkOutput::legacy::beginPoints(format.os(), pts.size());
 
-        os  << pt.x() << ' ' << pt.y() << ' ' << pt.z() << nl;
-    }
+    foamVtkOutput::writeList(format, pts);
+    format.flush();
 }
 
 
-void Foam::fileFormats::VTKsurfaceFormatCore::writeTail
+void Foam::fileFormats::VTKsurfaceFormatCore::writeCellData
 (
-    Ostream& os,
-    const UList<surfZone>& zoneLst
+    foamVtkOutput::formatter& format,
+    const UList<surfZone>& zones
 )
 {
+    // Zone ids as CellData
+
+    // Number of faces covered by the zones
     label nFaces = 0;
-    forAll(zoneLst, zoneI)
+    for (const auto& z : zones)
     {
-        nFaces += zoneLst[zoneI].size();
+        nFaces += z.size();
     }
 
-    // Print zone numbers
-    os  << nl
-        << "CELL_DATA " << nFaces << nl
-        << "FIELD attributes 1" << nl
-        << "region 1 " << nFaces << " float" << nl;
+    foamVtkOutput::legacy::dataHeader
+    (
+        format.os(),
+        vtkFileTag::CELL_DATA,
+        nFaces,
+        1  // Only one field
+    );
 
+    foamVtkOutput::legacy::intField
+    (
+        format.os(),
+        "region",
+        1, // nComponent
+        nFaces
+    );
 
-    forAll(zoneLst, zoneI)
+    label zoneId = 0;
+    for (const surfZone& zone : zones)
     {
-        forAll(zoneLst[zoneI], localFacei)
+        forAll(zone, i)
         {
-            if (localFacei)
-            {
-                if (localFacei % 20)
-                {
-                    os << ' ';
-                }
-                else
-                {
-                    os << nl;
-                }
-            }
-            os  << zoneI + 1;
+            format.write(zoneId);
         }
-        os  << nl;
+        ++zoneId;
     }
+    format.flush();
 }
 
 
-void Foam::fileFormats::VTKsurfaceFormatCore::writeTail
+void Foam::fileFormats::VTKsurfaceFormatCore::writeCellData
 (
-    Ostream& os,
+    foamVtkOutput::formatter& format,
     const labelUList& zoneIds
 )
 {
-    // Print zone numbers
-    os  << nl
-        << "CELL_DATA " << zoneIds.size() << nl
-        << "FIELD attributes 1" << nl
-        << "region 1 " << zoneIds.size() << " float" << nl;
+    // Zone ids as CellData
 
-    forAll(zoneIds, facei)
-    {
-        if (facei)
-        {
-            if (facei % 20)
-            {
-                os << ' ';
-            }
-            else
-            {
-                os << nl;
-            }
-        }
-        os  << zoneIds[facei] + 1;
-    }
-    os  << nl;
+    // Number of faces
+    const label nFaces = zoneIds.size();
+
+    foamVtkOutput::legacy::dataHeader
+    (
+        format.os(),
+        vtkFileTag::CELL_DATA,
+        nFaces,
+        1  // Only one field
+    );
+
+    foamVtkOutput::legacy::intField
+    (
+        format.os(),
+        "region",
+        1, // nComponent
+        nFaces
+    );
+
+    foamVtkOutput::writeList(format, zoneIds);
+    format.flush();
 }
 
 
diff --git a/src/surfMesh/surfaceFormats/vtk/VTKsurfaceFormatCore.H b/src/surfMesh/surfaceFormats/vtk/VTKsurfaceFormatCore.H
index 946440ddb0..3fdde4da2b 100644
--- a/src/surfMesh/surfaceFormats/vtk/VTKsurfaceFormatCore.H
+++ b/src/surfMesh/surfaceFormats/vtk/VTKsurfaceFormatCore.H
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2017 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -36,7 +36,7 @@ SourceFiles
 #define VTKsurfaceFormatCore_H
 
 #include "MeshedSurface.H"
-#include "Ostream.H"
+#include "foamVtkFormatter.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -58,15 +58,24 @@ protected:
         //- Write header information with points
         static void writeHeader
         (
-            Ostream&,
-            const pointField&
+            foamVtkOutput::formatter& format,
+            const pointField& pts
         );
 
-        //- Write trailing information with zone information
-        static void writeTail(Ostream&, const UList<surfZone>&);
+        //- Write regions (zones) information as CellData
+        static void writeCellData
+        (
+            foamVtkOutput::formatter& format,
+            const UList<surfZone>& zones
+        );
+
+        //- Write regions (zones) information as CellData
+        static void writeCellData
+        (
+            foamVtkOutput::formatter& format,
+            const labelUList& zoneIds
+        );
 
-        //- Write trailing information with zone Ids
-        static void writeTail(Ostream&, const labelUList& zoneIds);
 };
 
 
diff --git a/src/surfMesh/surfaceFormats/vtp/VTPsurfaceFormat.C b/src/surfMesh/surfaceFormats/vtp/VTPsurfaceFormat.C
new file mode 100644
index 0000000000..8a84d1b459
--- /dev/null
+++ b/src/surfMesh/surfaceFormats/vtp/VTPsurfaceFormat.C
@@ -0,0 +1,251 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2017 OpenCFD Ltd.
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "VTPsurfaceFormat.H"
+#include "OFstream.H"
+#include "foamVtkOutput.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+// File-scope constant.
+//
+// TODO: make this run-time selectable
+// - No append mode supported
+// - Legacy mode is dispatched via 'VTKsurfaceFormat' instead
+
+static const Foam::foamVtkOutput::formatType fmtType =
+    Foam::foamVtkOutput::formatType::INLINE_ASCII;
+    // Foam::foamVtkOutput::formatType::INLINE_BASE64;
+
+
+// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
+
+template<class Face>
+void Foam::fileFormats::VTPsurfaceFormat<Face>::writePolys
+(
+    foamVtkOutput::formatter& format,
+    const UList<Face>& faces
+)
+{
+    format.tag(vtkFileTag::POLYS);
+
+    //
+    // 'connectivity'
+    //
+    {
+        uint64_t payLoad = 0;
+        for (const auto& f : faces)
+        {
+            payLoad += f.size();
+        }
+
+        format.openDataArray<label>("connectivity")
+            .closeTag();
+
+        format.writeSize(payLoad * sizeof(label));
+
+        for (const Face& f : faces)
+        {
+            foamVtkOutput::writeList(format, f);
+        }
+
+        format.flush();
+        format.endDataArray();
+    }
+
+
+    //
+    // 'offsets'  (connectivity offsets)
+    //
+    {
+        const uint64_t payLoad(faces.size() * sizeof(label));
+
+        format
+            .openDataArray<label>("offsets")
+            .closeTag();
+
+        format.writeSize(payLoad);
+
+        label off = 0;
+        for (const auto& f : faces)
+        {
+            off += f.size();
+
+            format.write(off);
+        }
+
+        format.flush();
+        format.endDataArray();
+    }
+
+    format.endTag(vtkFileTag::POLYS);
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+template<class Face>
+Foam::fileFormats::VTPsurfaceFormat<Face>::VTPsurfaceFormat()
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+template<class Face>
+void Foam::fileFormats::VTPsurfaceFormat<Face>::write
+(
+    const fileName& filename,
+    const MeshedSurfaceProxy<Face>& surf
+)
+{
+    const pointField& pointLst = surf.points();
+    const List<Face>&  faceLst = surf.surfFaces();
+    const List<label>& faceMap = surf.faceMap();
+
+    const List<surfZone>& zones =
+    (
+        surf.surfZones().empty()
+      ? surfaceFormatsCore::oneZone(faceLst)
+      : surf.surfZones()
+    );
+
+    const bool useFaceMap = (surf.useFaceMap() && zones.size() > 1);
+
+    std::ofstream os(filename.c_str(), std::ios::binary);
+
+    autoPtr<foamVtkOutput::formatter> format =
+        foamVtkOutput::newFormatter(os, fmtType);
+
+    writeHeader(format(), pointLst, faceLst.size());
+
+    if (useFaceMap)
+    {
+        format().tag(vtkFileTag::POLYS);
+
+        //
+        // 'connectivity'
+        //
+        {
+            uint64_t payLoad = 0;
+            for (const auto& f : faceLst)
+            {
+                payLoad += f.size();
+            }
+
+            format().openDataArray<label>("connectivity")
+                .closeTag();
+
+            format().writeSize(payLoad * sizeof(label));
+
+            label faceIndex = 0;
+            for (const surfZone& zone : zones)
+            {
+                forAll(zone, i)
+                {
+                    const Face& f = faceLst[faceMap[faceIndex++]];
+
+                    foamVtkOutput::writeList(format(), f);
+                }
+            }
+
+            format().flush();
+            format().endDataArray();
+        }
+
+
+        //
+        // 'offsets'  (connectivity offsets)
+        //
+        {
+            const uint64_t payLoad(faceLst.size() * sizeof(label));
+
+            format()
+                .openDataArray<label>("offsets")
+                    .closeTag();
+
+            format().writeSize(payLoad);
+
+            label off = 0, faceIndex = 0;
+            for (const surfZone& zone : zones)
+            {
+                forAll(zone, i)
+                {
+                    const Face& f = faceLst[faceMap[faceIndex++]];
+
+                    off += f.size();
+
+                    format().write(off);
+                }
+            }
+
+            format().flush();
+            format().endDataArray();
+        }
+
+        format().endTag(vtkFileTag::POLYS);
+    }
+    else
+    {
+        // Easy to write polys without a faceMap
+        writePolys(format(), faceLst);
+    }
+
+    // Write regions (zones) as CellData
+    if (zones.size() > 1)
+    {
+        writeCellData(format(), zones);
+    }
+
+    writeFooter(format());
+}
+
+
+template<class Face>
+void Foam::fileFormats::VTPsurfaceFormat<Face>::write
+(
+    const fileName& filename,
+    const UnsortedMeshedSurface<Face>& surf
+)
+{
+    std::ofstream os(filename.c_str(), std::ios::binary);
+
+    autoPtr<foamVtkOutput::formatter> format =
+        foamVtkOutput::newFormatter(os, fmtType);
+
+    const List<Face>& faceLst = surf.surfFaces();
+
+    writeHeader(format(), surf.points(), faceLst.size());
+
+    // Easy to write polys without a faceMap
+    writePolys(format(), faceLst);
+
+    // Write regions (zones) as CellData
+    writeCellData(format(), surf.zoneIds());
+
+    writeFooter(format());
+}
+
+
+// ************************************************************************* //
diff --git a/src/surfMesh/surfaceFormats/vtp/VTPsurfaceFormat.H b/src/surfMesh/surfaceFormats/vtp/VTPsurfaceFormat.H
new file mode 100644
index 0000000000..1b4b4c642a
--- /dev/null
+++ b/src/surfMesh/surfaceFormats/vtp/VTPsurfaceFormat.H
@@ -0,0 +1,132 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2017 OpenCFD Ltd.
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::fileFormats::VTPsurfaceFormat
+
+Description
+    Provide a means of writing VTP (xml) format.
+    The output is never sorted by zone.
+
+SourceFiles
+    VTPsurfaceFormat.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef VTPsurfaceFormat_H
+#define VTPsurfaceFormat_H
+
+#include "MeshedSurface.H"
+#include "MeshedSurfaceProxy.H"
+#include "UnsortedMeshedSurface.H"
+#include "VTPsurfaceFormatCore.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace fileFormats
+{
+
+/*---------------------------------------------------------------------------*\
+                      Class VTPsurfaceFormat Declaration
+\*---------------------------------------------------------------------------*/
+
+template<class Face>
+class VTPsurfaceFormat
+:
+    public MeshedSurface<Face>,
+    public VTPsurfaceFormatCore
+{
+    // Private Member Functions
+
+        //- Write polygons
+        static void writePolys
+        (
+            foamVtkOutput::formatter& format,
+            const UList<Face>& faces
+        );
+
+
+        //- Disallow default bitwise copy construct
+        VTPsurfaceFormat(const VTPsurfaceFormat<Face>&) = delete;
+
+        //- Disallow default bitwise assignment
+        void operator=(const VTPsurfaceFormat<Face>&) = delete;
+
+
+public:
+
+    // Constructors
+
+        //- Construct null
+        VTPsurfaceFormat();
+
+
+    //- Destructor
+    virtual ~VTPsurfaceFormat()
+    {}
+
+
+    // Member Functions
+
+      // Write
+
+        //- Write surface mesh components by proxy
+        static void write
+        (
+            const fileName& filename,
+            const MeshedSurfaceProxy<Face>& surf
+        );
+
+        //- Write UnsortedMeshedSurface, the output remains unsorted
+        static void write
+        (
+            const fileName& filename,
+            const UnsortedMeshedSurface<Face>& surf
+        );
+
+        //- Write object file
+        virtual void write(const fileName& name) const
+        {
+            write(name, MeshedSurfaceProxy<Face>(*this));
+        }
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace fileFormats
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#ifdef NoRepository
+    #include "VTPsurfaceFormat.C"
+#endif
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/surfMesh/surfaceFormats/vtp/VTPsurfaceFormatCore.C b/src/surfMesh/surfaceFormats/vtp/VTPsurfaceFormatCore.C
new file mode 100644
index 0000000000..332b4e1b85
--- /dev/null
+++ b/src/surfMesh/surfaceFormats/vtp/VTPsurfaceFormatCore.C
@@ -0,0 +1,149 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2017 OpenCFD Ltd.
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "VTPsurfaceFormatCore.H"
+#include "clock.H"
+#include "foamVtkOutput.H"
+
+// * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * //
+
+void Foam::fileFormats::VTPsurfaceFormatCore::writeHeader
+(
+    foamVtkOutput::formatter& format,
+    const pointField& pts,
+    const label nFaces
+)
+{
+    // XML (inline)
+
+    format
+        .xmlHeader()
+        .xmlComment("surface written " + clock::dateTime())
+        .beginVTKFile(vtkFileTag::POLY_DATA, "0.1");
+
+    // <Piece>
+    format
+        .openTag(vtkFileTag::PIECE)
+        ( "NumberOfPoints", pts.size() )
+        ( "NumberOfPolys",  nFaces )
+        .closeTag();
+
+
+    // Points
+
+    const uint64_t payLoad = (pts.size()*3* sizeof(float));
+
+    format.tag(vtkFileTag::POINTS)
+        .openDataArray<float, 3>(vtkFileTag::POINTS)
+        .closeTag();
+
+    format.writeSize(payLoad);
+    foamVtkOutput::writeList(format, pts);
+    format.flush();
+
+    format
+        .endDataArray()
+        .endTag(vtkFileTag::POINTS);
+}
+
+
+void Foam::fileFormats::VTPsurfaceFormatCore::writeFooter
+(
+    foamVtkOutput::formatter& format
+)
+{
+    // Slight cheat. </Piece> too
+    format.endTag(Foam::vtkFileTag::PIECE);
+
+    format.endTag(vtkFileTag::POLY_DATA)
+        .endVTKFile();
+}
+
+
+
+void Foam::fileFormats::VTPsurfaceFormatCore::writeCellData
+(
+    foamVtkOutput::formatter& format,
+    const UList<surfZone>& zones
+)
+{
+    // Zone ids as CellData
+
+    // Number of faces covered by the zones
+    uint64_t payLoad = 0;
+    for (const auto& z : zones)
+    {
+        payLoad += z.size();
+    }
+
+    format.tag(vtkFileTag::CELL_DATA);
+    format.openDataArray<label>("region")
+        .closeTag();
+
+    format.writeSize(payLoad * sizeof(label));
+
+    label zoneId = 0;
+    for (const surfZone& zone : zones)
+    {
+        forAll(zone, i)
+        {
+            format.write(zoneId);
+        }
+        ++zoneId;
+    }
+
+    format.flush();
+    format.endDataArray();
+
+    format.endTag(vtkFileTag::CELL_DATA);
+}
+
+
+void Foam::fileFormats::VTPsurfaceFormatCore::writeCellData
+(
+    foamVtkOutput::formatter& format,
+    const labelUList& zoneIds
+)
+{
+    // Zone ids as CellData
+
+    format.tag(vtkFileTag::CELL_DATA);
+    format.openDataArray<label>("region")
+        .closeTag();
+
+    const uint64_t payLoad(zoneIds.size() * sizeof(label));
+
+    format.writeSize(payLoad);
+    foamVtkOutput::writeList(format, zoneIds);
+
+    format.flush();
+    format.endDataArray();
+
+    format.endTag(vtkFileTag::CELL_DATA);
+
+}
+
+
+// ************************************************************************* //
diff --git a/src/surfMesh/surfaceFormats/vtp/VTPsurfaceFormatCore.H b/src/surfMesh/surfaceFormats/vtp/VTPsurfaceFormatCore.H
new file mode 100644
index 0000000000..32e03e2107
--- /dev/null
+++ b/src/surfMesh/surfaceFormats/vtp/VTPsurfaceFormatCore.H
@@ -0,0 +1,95 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2017 OpenCFD Ltd.
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::fileFormats::VTPsurfaceFormatCore
+
+Description
+    Internal class used by the VTPsurfaceFormat
+
+SourceFiles
+    VTPsurfaceFormatCore.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef VTPsurfaceFormatCore_H
+#define VTPsurfaceFormatCore_H
+
+#include "MeshedSurface.H"
+#include "foamVtkFormatter.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace fileFormats
+{
+
+/*---------------------------------------------------------------------------*\
+                    Class VTPsurfaceFormatCore Declaration
+\*---------------------------------------------------------------------------*/
+
+class VTPsurfaceFormatCore
+{
+protected:
+
+    // Protected Member Functions
+
+        //- Write file header information with points
+        static void writeHeader
+        (
+            foamVtkOutput::formatter& format,
+            const pointField& pts,
+            const label nFaces
+        );
+
+        //- Write file footer
+        static void writeFooter(foamVtkOutput::formatter& format);
+
+
+        //- Write regions (zones) information as CellData
+        static void writeCellData
+        (
+            foamVtkOutput::formatter& format,
+            const UList<surfZone>& zones
+        );
+
+        //- Write regions (zones) information as CellData
+        static void writeCellData
+        (
+            foamVtkOutput::formatter& format,
+            const labelUList& zoneIds
+        );
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace fileFormats
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/surfMesh/surfaceFormats/vtp/VTPsurfaceFormatRunTime.C b/src/surfMesh/surfaceFormats/vtp/VTPsurfaceFormatRunTime.C
new file mode 100644
index 0000000000..ab9ca19e13
--- /dev/null
+++ b/src/surfMesh/surfaceFormats/vtp/VTPsurfaceFormatRunTime.C
@@ -0,0 +1,98 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2017 OpenCFD Ltd.
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "VTPsurfaceFormat.H"
+
+#include "addToRunTimeSelectionTable.H"
+#include "addToMemberFunctionSelectionTable.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace fileFormats
+{
+// write MeshedSurfaceProxy
+addNamedTemplatedToMemberFunctionSelectionTable
+(
+    MeshedSurfaceProxy,
+    VTPsurfaceFormat,
+    face,
+    write,
+    fileExtension,
+    vtp
+);
+addNamedTemplatedToMemberFunctionSelectionTable
+(
+    MeshedSurfaceProxy,
+    VTPsurfaceFormat,
+    triFace,
+    write,
+    fileExtension,
+    vtp
+);
+addNamedTemplatedToMemberFunctionSelectionTable
+(
+    MeshedSurfaceProxy,
+    VTPsurfaceFormat,
+    labelledTri,
+    write,
+    fileExtension,
+    vtp
+);
+
+// write UnsortedMeshedSurface
+addNamedTemplatedToMemberFunctionSelectionTable
+(
+    UnsortedMeshedSurface,
+    VTPsurfaceFormat,
+    face,
+    write,
+    fileExtension,
+    vtp
+);
+addNamedTemplatedToMemberFunctionSelectionTable
+(
+    UnsortedMeshedSurface,
+    VTPsurfaceFormat,
+    triFace,
+    write,
+    fileExtension,
+    vtp
+);
+addNamedTemplatedToMemberFunctionSelectionTable
+(
+    UnsortedMeshedSurface,
+    VTPsurfaceFormat,
+    labelledTri,
+    write,
+    fileExtension,
+    vtp
+);
+
+}
+}
+
+// ************************************************************************* //
diff --git a/src/surfMesh/triSurface/interfaces/VTK/writeVTK.C b/src/surfMesh/triSurface/interfaces/VTK/writeVTK.C
index 41e33ea0c5..a9207eb219 100644
--- a/src/surfMesh/triSurface/interfaces/VTK/writeVTK.C
+++ b/src/surfMesh/triSurface/interfaces/VTK/writeVTK.C
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2017 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -24,159 +24,144 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "triSurface.H"
+#include "foamVtkOutput.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+// File-scope constant.
+//
+// TODO: make this run-time selectable (ASCII | BINARY)
+// - Legacy mode only
+
+static const Foam::foamVtkOutput::formatType fmtType =
+    Foam::foamVtkOutput::formatType::LEGACY_ASCII;
+    // Foam::foamVtkOutput::formatType::LEGACY_BASE64;
 
-namespace Foam
-{
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-void triSurface::writeVTK(const bool writeSorted, Ostream& os) const
+void Foam::triSurface::writeVTK
+(
+    const bool writeSorted,
+    std::ostream& os
+) const
 {
-    // Write header
-    os  << "# vtk DataFile Version 2.0" << nl
-        << "triSurface" << nl
-        << "ASCII" << nl
-        << "DATASET POLYDATA"
-        << nl;
+    autoPtr<foamVtkOutput::formatter> format =
+        foamVtkOutput::newFormatter(os, fmtType);
 
-    const pointField& ps = points();
+    // Header
+    foamVtkOutput::legacy::fileHeader
+    (
+        format(),
+        "triSurface",
+        vtkFileTag::POLY_DATA
+    );
 
-    os  << "POINTS " << ps.size() << " float" << nl;
+    const pointField& pts = this->points();
+    const auto& faceLst = this->surfFaces();
 
-    // Write vertex coords
-    forAll(ps, pointi)
-    {
-        if (pointi > 0 && (pointi % 10) == 0)
-        {
-            os  << nl;
-        }
-        else
-        {
-            os  << ' ';
-        }
-        os  << ps[pointi].x() << ' '
-            << ps[pointi].y() << ' '
-            << ps[pointi].z();
-    }
-    os  << nl;
+    const label nFaces = faceLst.size();
 
-    os  << "POLYGONS " << size() << ' ' << 4*size() << nl;
+    // Points
+    foamVtkOutput::legacy::beginPoints(os, pts.size());
+
+    foamVtkOutput::writeList(format(), pts);
+    format().flush();
+
+    // connectivity count (without additional storage)
+    // is simply 3 * nFaces
+
+    foamVtkOutput::legacy::beginPolys(os, nFaces, 3*nFaces);
 
     labelList faceMap;
     surfacePatchList patches(calcPatches(faceMap));
 
-    if (writeSorted)
+    const bool useFaceMap = (writeSorted && patches.size() > 1);
+
+    if (useFaceMap)
     {
         label faceIndex = 0;
-
-        forAll(patches, patchi)
+        for (const surfacePatch& patch : patches)
         {
-            // Print all faces belonging to this patch
-
-            for
-            (
-                label patchFacei = 0;
-                patchFacei < patches[patchi].size();
-                patchFacei++
-            )
+            forAll(patch, i)
             {
-                if (faceIndex > 0 && (faceIndex % 10) == 0)
-                {
-                    os  << nl;
-                }
-                else
-                {
-                    os  << ' ';
-                }
+                const Face& f = faceLst[faceMap[faceIndex++]];
 
-                const label facei = faceMap[faceIndex++];
-
-                os  << "3 "
-                    << operator[](facei)[0] << ' '
-                    << operator[](facei)[1] << ' '
-                    << operator[](facei)[2];
+                format().write(3);  // The size prefix
+                foamVtkOutput::writeList(format(), f);
             }
         }
-        os  << nl;
+        format().flush();
 
 
-        // Print region numbers
-
-        os  << "CELL_DATA " << size() << nl;
-        os  << "FIELD attributes 1" << nl;
-        os  << "region 1 " << size() << " float" << nl;
-
-        faceIndex = 0;
-
-        forAll(patches, patchi)
+        // Write regions (zones) as CellData
+        if (patches.size() > 1)
         {
-            for
+            foamVtkOutput::legacy::dataHeader
             (
-                label patchFacei = 0;
-                patchFacei < patches[patchi].size();
-                patchFacei++
-            )
+                os,
+                vtkFileTag::CELL_DATA,
+                nFaces,
+                1  // Only one field
+            );
+
+            foamVtkOutput::legacy::intField
+            (
+                os,
+                "region",
+                1, // nComponent
+                nFaces
+            );
+
+            faceIndex = 0;
+            for (const surfacePatch& patch : patches)
             {
-                if (faceIndex > 0 && (faceIndex % 10) == 0)
+                forAll(patch, i)
                 {
-                    os  << nl;
+                    const Face& f = faceLst[faceMap[faceIndex++]];
+                    format().write(f.region());
                 }
-                else
-                {
-                    os  << ' ';
-                }
-
-                const label facei = faceMap[faceIndex++];
-
-                os  << operator[](facei).region();
             }
+            format().flush();
         }
-        os  << nl;
     }
     else
     {
-        forAll(*this, facei)
-        {
-            if (facei > 0 && (facei % 10) == 0)
-            {
-                os  << nl;
-            }
-            else
-            {
-                os  << ' ';
-            }
-            os  << "3 "
-                << operator[](facei)[0] << ' '
-                << operator[](facei)[1] << ' '
-                << operator[](facei)[2];
-        }
-        os  << nl;
+        // No faceMap (unsorted)
 
-        os  << "CELL_DATA " << size() << nl;
-        os  << "FIELD attributes 1" << nl;
-        os  << "region 1 " << size() << " float" << nl;
-
-        forAll(*this, facei)
+        for (const Face& f : faceLst)
         {
-            if (facei > 0 && (facei % 10) == 0)
-            {
-                os  << nl;
-            }
-            else
-            {
-                os  << ' ';
-            }
-            os  << operator[](facei).region();
+            format().write(3);  // The size prefix
+            foamVtkOutput::writeList(format(), f);
         }
-        os  << nl;
+        format().flush();
+
+
+        // Write regions (zones) as CellData
+
+        foamVtkOutput::legacy::dataHeader
+        (
+            os,
+            vtkFileTag::CELL_DATA,
+            faceLst.size(),
+            1  // Only one field
+        );
+
+        foamVtkOutput::legacy::intField
+        (
+            os,
+            "region",
+            1, // nComponent
+            faceLst.size()
+        );
+
+        for (const Face& f : faceLst)
+        {
+            format().write(f.region());
+        }
+        format().flush();
     }
 }
 
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
 // ************************************************************************* //
diff --git a/src/surfMesh/triSurface/triSurface.C b/src/surfMesh/triSurface/triSurface.C
index fa8c7ba874..324c7913de 100644
--- a/src/surfMesh/triSurface/triSurface.C
+++ b/src/surfMesh/triSurface/triSurface.C
@@ -33,6 +33,7 @@ License
 #include "PackedBoolList.H"
 #include "surfZoneList.H"
 #include "surfaceFormatsCore.H"
+#include "MeshedSurfaceProxy.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
@@ -52,7 +53,9 @@ const Foam::wordHashSet Foam::triSurface::readTypes_
 
 const Foam::wordHashSet Foam::triSurface::writeTypes_
 {
-    "ftr", "stl", "stlb", "gts", "obj", "off", "tri", "ac", "smesh", "vtk"
+    "ftr", "stl", "stlb", "gts", "obj", "off", "tri", "ac", "smesh", "vtk",
+    // via proxy:
+    "inp", "vtp"
 };
 
 
@@ -477,8 +480,9 @@ bool Foam::triSurface::read
     {
         FatalErrorInFunction
             << "unknown file extension " << ext
-            << ". Supported extensions are '.ftr', '.stl', '.stlb', '.gts'"
-            << ", '.obj', '.ac', '.off', '.nas', '.tri' and '.vtk'"
+            << " for reading file " << name
+            << ". Supported extensions:" << nl
+            << "    " << flatOutput(readTypes_.sortedToc()) << nl
             << exit(FatalError);
 
         return false;
@@ -504,7 +508,7 @@ void Foam::triSurface::write
     }
     else if (ext == "stlb")
     {
-        ofstream outFile(name.c_str(), std::ios::binary);
+        std::ofstream outFile(name.c_str(), std::ios::binary);
 
         writeSTLBINARY(outFile);
     }
@@ -522,7 +526,27 @@ void Foam::triSurface::write
     }
     else if (ext == "vtk")
     {
-        writeVTK(sort, OFstream(name)());
+        std::ofstream outFile(name.c_str(), std::ios::binary);
+        writeVTK(sort, outFile);
+    }
+    else if
+    (
+        ext == "inp"  // STARCD
+     || ext == "vtp"  // VTK
+    )
+    {
+        labelList faceMap;
+        List<surfZone> zoneLst = this->sortedZones(faceMap);
+
+        MeshedSurfaceProxy<labelledTri> proxy
+        (
+            this->points(),
+            this->surfFaces(),
+            zoneLst,
+            faceMap
+        );
+
+        proxy.write(name, ext);
     }
     else if (ext == "tri")
     {
@@ -540,10 +564,9 @@ void Foam::triSurface::write
     {
         FatalErrorInFunction
             << "unknown file extension " << ext
-            << " for file " << name
-            << ". Supported extensions are '.ftr', '.stl', '.stlb', "
-            << "'.gts', '.obj', '.vtk'"
-            << ", '.off', '.smesh', '.ac' and '.tri'"
+            << " for writing file " << name
+            << ". Supported extensions:" << nl
+            << "    " << flatOutput(writeTypes_.sortedToc()) << nl
             << exit(FatalError);
     }
 }
diff --git a/src/surfMesh/triSurface/triSurface.H b/src/surfMesh/triSurface/triSurface.H
index fa10f87557..24f8b51837 100644
--- a/src/surfMesh/triSurface/triSurface.H
+++ b/src/surfMesh/triSurface/triSurface.H
@@ -167,7 +167,7 @@ class triSurface
         void writeOFF(const bool writeSorted, Ostream&) const;
 
         //- Write to VTK legacy format.
-        void writeVTK(const bool writeSorted, Ostream&) const;
+        void writeVTK(const bool writeSorted, std::ostream& os) const;
 
         //- Write to Ostream in TRI (AC3D) format
         //  Ac3d .tri format (unmerged triangle format)
@@ -318,143 +318,145 @@ public:
 
     // Member Functions
 
-        // Access
+      // Access
 
-            const geometricSurfacePatchList& patches() const
-            {
-                return patches_;
-            }
+        const geometricSurfacePatchList& patches() const
+        {
+            return patches_;
+        }
 
-            geometricSurfacePatchList& patches()
-            {
-                return patches_;
-            }
+        geometricSurfacePatchList& patches()
+        {
+            return patches_;
+        }
 
-            //- Return edge-face addressing sorted (for edges with more than
-            //  2 faces) according to the angle around the edge.
-            //  Orientation is anticlockwise looking from
-            //  edge.vec(localPoints())
-            const labelListList& sortedEdgeFaces() const;
+        //- Return const access to the faces
+        inline const List<labelledTri>& surfFaces() const
+        {
+            return static_cast<const List<labelledTri>&>(*this);
+        }
 
-            //- If 2 face neighbours: label of face where ordering of edge
-            //  is consistent with righthand walk.
-            //  If 1 neighbour: label of only face.
-            //  If >2 neighbours: undetermined.
-            const labelList& edgeOwner() const;
+        //- Return edge-face addressing sorted (for edges with more than
+        //  2 faces) according to the angle around the edge.
+        //  Orientation is anticlockwise looking from
+        //  edge.vec(localPoints())
+        const labelListList& sortedEdgeFaces() const;
+
+        //- If 2 face neighbours: label of face where ordering of edge
+        //  is consistent with righthand walk.
+        //  If 1 neighbour: label of only face.
+        //  If >2 neighbours: undetermined.
+        const labelList& edgeOwner() const;
 
 
-            //- Face area vectors (normals)
-            inline const vectorField& Sf() const
-            {
-                return ParentType::faceAreas();
-            }
+        //- Face area vectors (normals)
+        inline const vectorField& Sf() const
+        {
+            return ParentType::faceAreas();
+        }
 
-            //- Face area magnitudes
-            inline const scalarField& magSf() const
-            {
-                return ParentType::magFaceAreas();
-            }
+        //- Face area magnitudes
+        inline const scalarField& magSf() const
+        {
+            return ParentType::magFaceAreas();
+        }
 
-            //- Face centres
-            inline const vectorField& Cf() const
-            {
-                return ParentType::faceCentres();
-            }
+        //- Face centres
+        inline const vectorField& Cf() const
+        {
+            return ParentType::faceCentres();
+        }
 
 
-        // Interoperability with other surface mesh classes
+      // Interoperability with other surface mesh classes
 
-            //- Sort faces according to zoneIds
-            //  Returns a surfZoneList and sets faceMap to index within faces()
-            //  (i.e. map from original,unsorted to sorted)
-            List<surfZone> sortedZones(labelList& faceMap) const;
+        //- Sort faces according to zoneIds
+        //  Returns a surfZoneList and sets faceMap to index within faces()
+        //  (i.e. map from original,unsorted to sorted)
+        List<surfZone> sortedZones(labelList& faceMap) const;
 
-            //- Create a list of faces from the triFaces
-            void triFaceFaces(List<face>& plainFaceList) const;
+        //- Create a list of faces from the triFaces
+        void triFaceFaces(List<face>& plainFaceList) const;
 
 
-        // Edit
+      // Edit
 
-            //- Move points
-            virtual void movePoints(const pointField&);
+        //- Move points
+        virtual void movePoints(const pointField&);
 
-            //- Scale points. A non-positive factor is ignored
-            virtual void scalePoints(const scalar);
+        //- Scale points. A non-positive factor is ignored
+        virtual void scalePoints(const scalar);
 
-            //- Check/remove duplicate/degenerate triangles
-            void checkTriangles(const bool verbose);
+        //- Check/remove duplicate/degenerate triangles
+        void checkTriangles(const bool verbose);
 
-            //- Check triply (or more) connected edges.
-            void checkEdges(const bool verbose);
+        //- Check triply (or more) connected edges.
+        void checkEdges(const bool verbose);
 
-            //- Remove non-valid triangles
-            void cleanup(const bool verbose);
+        //- Remove non-valid triangles
+        void cleanup(const bool verbose);
 
-            //- Fill faceZone with currentZone for every face reachable
-            //  from facei without crossing edge marked in borderEdge.
-            //  Note: faceZone has to be sized nFaces before calling this fun.
-            void markZone
-            (
-                const boolList& borderEdge,
-                const label facei,
-                const label currentZone,
-                labelList& faceZone
-            ) const;
+        //- Fill faceZone with currentZone for every face reachable
+        //  from facei without crossing edge marked in borderEdge.
+        //  Note: faceZone has to be sized nFaces before calling this fun.
+        void markZone
+        (
+            const boolList& borderEdge,
+            const label facei,
+            const label currentZone,
+            labelList& faceZone
+        ) const;
 
-            //- (size and) fills faceZone with zone of face. Zone is area
-            //  reachable by edge crossing without crossing borderEdge
-            //  (bool for every edge in surface). Returns number of zones.
-            label markZones
-            (
-                const boolList& borderEdge,
-                labelList& faceZone
-            ) const;
+        //- (size and) fills faceZone with zone of face. Zone is area
+        //  reachable by edge crossing without crossing borderEdge
+        //  (bool for every edge in surface). Returns number of zones.
+        label markZones
+        (
+            const boolList& borderEdge,
+            labelList& faceZone
+        ) const;
 
-            //- 'Create' sub mesh, including only faces for which
-            //  boolList entry is true
-            //  Sets: pointMap: from new to old localPoints
-            //        faceMap: new to old faces
-            void subsetMeshMap
-            (
-                const boolList& include,
-                labelList& pointMap,
-                labelList& faceMap
-            ) const;
+        //- 'Create' sub mesh, including only faces for which
+        //  boolList entry is true
+        //  Sets: pointMap: from new to old localPoints
+        //        faceMap: new to old faces
+        void subsetMeshMap
+        (
+            const boolList& include,
+            labelList& pointMap,
+            labelList& faceMap
+        ) const;
 
-            //- Return new surface. Returns pointMap, faceMap from
-            //  subsetMeshMap
-            triSurface subsetMesh
-            (
-                const boolList& include,
-                labelList& pointMap,
-                labelList& faceMap
-            ) const;
+        //- Return new surface. Returns pointMap, faceMap from
+        //  subsetMeshMap
+        triSurface subsetMesh
+        (
+            const boolList& include,
+            labelList& pointMap,
+            labelList& faceMap
+        ) const;
 
 
-            //- Transfer stored faces to an Xfer container
-            Xfer<List<labelledTri>> xferFaces();
+        //- Transfer stored faces to an Xfer container
+        Xfer<List<labelledTri>> xferFaces();
 
-            //- Transfer stored points to an Xfer container
-            Xfer<List<point>> xferPoints();
+        //- Transfer stored points to an Xfer container
+        Xfer<List<point>> xferPoints();
 
 
-        // Write
+      // Write
 
-            //- Write to Ostream in simple FOAM format
-            void write(Ostream&) const;
+        //- Write to Ostream in simple FOAM format
+        void write(Ostream&) const;
 
-            //- Generic write routine. Chooses writer based on extension.
-            void write(const fileName&, const bool sortByRegion = false) const;
+        //- Generic write routine. Chooses writer based on extension.
+        void write(const fileName&, const bool sortByRegion = false) const;
 
-            //- Write to database
-            void write(const Time&) const;
+        //- Write to database
+        void write(const Time&) const;
 
-            //- Write to Ostream in OpenDX format
-            void writeDX(const scalarField&, Ostream&) const;
-            void writeDX(const vectorField&, Ostream&) const;
-
-            //- Write some statistics
-            void writeStats(Ostream&) const;
+        //- Write some statistics
+        void writeStats(Ostream& os) const;
 
 
     // Member operators

From edc1bd22308452f2cf3ad47dc5bf110e9969e910 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Mon, 12 Jun 2017 14:57:56 +0200
Subject: [PATCH 20/27] CONFIG: bump paraview version

---
 etc/config.csh/paraview | 2 +-
 etc/config.sh/paraview  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/etc/config.csh/paraview b/etc/config.csh/paraview
index cbc3776702..fa0cea0f49 100644
--- a/etc/config.csh/paraview
+++ b/etc/config.csh/paraview
@@ -52,7 +52,7 @@
 #------------------------------------------------------------------------------
 # USER EDITABLE PART: Changes made here may be lost with the next upgrade
 
-setenv ParaView_VERSION 5.3.0
+setenv ParaView_VERSION 5.4.0
 setenv ParaView_MAJOR detect            # Automatically determine major version
 set cmake_version=cmake-system
 
diff --git a/etc/config.sh/paraview b/etc/config.sh/paraview
index 6c66ddcc3e..b2a1cc161a 100644
--- a/etc/config.sh/paraview
+++ b/etc/config.sh/paraview
@@ -55,7 +55,7 @@
 #------------------------------------------------------------------------------
 # USER EDITABLE PART: Changes made here may be lost with the next upgrade
 
-ParaView_VERSION=5.3.0
+ParaView_VERSION=5.4.0
 ParaView_MAJOR=detect                   # Automatically determine major version
 cmake_version=cmake-system
 

From cde12ad9e574bac0edc3ffc8c067ef5e61d9d18f Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Tue, 13 Jun 2017 14:10:07 +0200
Subject: [PATCH 21/27] ENH: consolidate vtk classes into 'Foam::vtk' namespace

- elminate the foamVtkFormatter operator() in favour of xmlAttr.
  Improves readability and the purpose is clearer.
---
 .../mesh/manipulation/setSet/setSet.C         |  12 +-
 .../dataConversion/foamToVTK/foamToVTK.C      |  36 ++--
 .../foamToVTK/foamVtkLagrangianWriter.C       |  66 +++----
 .../foamToVTK/foamVtkLagrangianWriter.H       |  12 +-
 .../foamVtkLagrangianWriterTemplates.C        |   4 +-
 .../vtkPVFoam/vtkPVFoamMeshVolume.C           |  10 +-
 src/conversion/Make/files                     |   2 +-
 .../vtk/output/foamVtkInternalWriter.C        | 135 +++++++--------
 .../vtk/output/foamVtkInternalWriter.H        |  18 +-
 .../output/foamVtkInternalWriterTemplates.C   |  42 ++---
 .../vtk/output/foamVtkOutputFields.H          |  48 +++---
 .../vtk/output/foamVtkOutputFieldsTemplates.C |  85 ++++-----
 .../vtk/output/foamVtkPatchWriter.C           |  73 ++++----
 .../vtk/output/foamVtkPatchWriter.H           |  12 +-
 .../vtk/output/foamVtkPatchWriterTemplates.C  |  16 +-
 .../vtk/output/foamVtkSurfaceMeshWriter.C     |  63 ++++---
 .../vtk/output/foamVtkSurfaceMeshWriter.H     |  12 +-
 .../foamVtkSurfaceMeshWriterTemplates.C       |   6 +-
 .../vtk/output/foamVtkWriteSurfFields.C       |  38 ++--
 .../vtk/output/foamVtkWriteSurfFields.H       |   8 +-
 src/conversion/vtk/part/foamVtkMeshMaps.H     |  14 +-
 .../part/{foamVtkCells.C => foamVtuCells.C}   |  46 ++---
 .../part/{foamVtkCells.H => foamVtuCells.H}   |  49 +++---
 .../part/{foamVtkCellsI.H => foamVtuCellsI.H} |  25 +--
 src/conversion/vtk/part/foamVtuSizing.C       |  40 ++---
 src/conversion/vtk/part/foamVtuSizing.H       |  55 +++---
 src/conversion/vtk/part/foamVtuSizingI.H      |  40 ++---
 .../vtk/part/foamVtuSizingTemplates.C         |  26 ++-
 src/fileFormats/Make/files                    |   5 +-
 src/fileFormats/vtk/core/foamVtkCore.C        |  71 ++++++++
 src/fileFormats/vtk/core/foamVtkCore.H        | 163 ++++++++++++++++++
 .../vtk/{type => core}/foamVtkPTraits.C       |  18 +-
 .../vtk/{type => core}/foamVtkPTraits.H       |  22 +--
 src/fileFormats/vtk/foamVtkCore.C             |  54 ------
 src/fileFormats/vtk/foamVtkCore.H             | 109 ------------
 .../vtk/format/foamVtkAppendBase64Formatter.C |  16 +-
 .../vtk/format/foamVtkAppendBase64Formatter.H |   6 +-
 .../vtk/format/foamVtkAppendRawFormatter.C    |  34 ++--
 .../vtk/format/foamVtkAppendRawFormatter.H    |   6 +-
 .../vtk/format/foamVtkAsciiFormatter.C        |  38 ++--
 .../vtk/format/foamVtkAsciiFormatter.H        |   6 +-
 .../vtk/format/foamVtkBase64Formatter.C       |  18 +-
 .../vtk/format/foamVtkBase64Formatter.H       |   6 +-
 .../vtk/format/foamVtkBase64Layer.C           |  24 +--
 .../vtk/format/foamVtkBase64Layer.H           |   6 +-
 src/fileFormats/vtk/format/foamVtkFormatter.C |  64 ++++---
 src/fileFormats/vtk/format/foamVtkFormatter.H |  69 ++++----
 .../vtk/format/foamVtkFormatterI.H            | 127 ++++++--------
 .../vtk/format/foamVtkFormatterTemplates.C    |  28 +--
 .../vtk/format/foamVtkLegacyAsciiFormatter.C  |  20 +--
 .../vtk/format/foamVtkLegacyAsciiFormatter.H  |   8 +-
 .../vtk/format/foamVtkLegacyRawFormatter.C    |  32 ++--
 .../vtk/format/foamVtkLegacyRawFormatter.H    |   6 +-
 src/fileFormats/vtk/output/foamVtkOutput.C    |  46 ++---
 src/fileFormats/vtk/output/foamVtkOutput.H    |  46 +++--
 src/fileFormats/vtk/output/foamVtkOutputI.H   |  30 ++--
 .../vtk/output/foamVtkOutputOptions.C         |  18 +-
 .../vtk/output/foamVtkOutputOptions.H         |   6 +-
 .../vtk/output/foamVtkOutputOptionsI.H        |  26 +--
 .../vtk/output/foamVtkOutputTemplates.C       |  16 +-
 .../vtk/read/vtkUnstructuredReader.C          |  22 +--
 .../vtk/read/vtkUnstructuredReader.H          |   5 +-
 src/fileFormats/vtk/type/foamVtkFileEnums.C   |  64 -------
 src/fileFormats/vtk/type/foamVtkFileEnums.H   |  90 ----------
 src/fileFormats/vtk/type/foamVtkOutputTypes.H |  77 ---------
 .../utilities/writeVTK/writeVTK.C             |  10 +-
 .../output/foamVtkWriteCellSetFaces.C         |  16 +-
 .../output/foamVtkWriteCellSetFaces.H         |  10 +-
 src/meshTools/output/foamVtkWriteFaceSet.C    |  16 +-
 src/meshTools/output/foamVtkWriteFaceSet.H    |   8 +-
 src/meshTools/output/foamVtkWritePointSet.C   |  14 +-
 src/meshTools/output/foamVtkWritePointSet.H   |   8 +-
 .../surfaceFormats/vtk/VTKsurfaceFormat.C     |  24 +--
 .../surfaceFormats/vtk/VTKsurfaceFormat.H     |   2 +-
 .../surfaceFormats/vtk/VTKsurfaceFormatCore.C |  28 +--
 .../surfaceFormats/vtk/VTKsurfaceFormatCore.H |   6 +-
 .../surfaceFormats/vtp/VTPsurfaceFormat.C     |  36 ++--
 .../surfaceFormats/vtp/VTPsurfaceFormat.H     |   2 +-
 .../surfaceFormats/vtp/VTPsurfaceFormatCore.C |  38 ++--
 .../surfaceFormats/vtp/VTPsurfaceFormatCore.H |   8 +-
 .../triSurface/interfaces/VTK/writeVTK.C      |  36 ++--
 81 files changed, 1249 insertions(+), 1408 deletions(-)
 rename src/conversion/vtk/part/{foamVtkCells.C => foamVtuCells.C} (77%)
 rename src/conversion/vtk/part/{foamVtkCells.H => foamVtuCells.H} (90%)
 rename src/conversion/vtk/part/{foamVtkCellsI.H => foamVtuCellsI.H} (77%)
 create mode 100644 src/fileFormats/vtk/core/foamVtkCore.C
 create mode 100644 src/fileFormats/vtk/core/foamVtkCore.H
 rename src/fileFormats/vtk/{type => core}/foamVtkPTraits.C (77%)
 rename src/fileFormats/vtk/{type => core}/foamVtkPTraits.H (76%)
 delete mode 100644 src/fileFormats/vtk/foamVtkCore.C
 delete mode 100644 src/fileFormats/vtk/foamVtkCore.H
 delete mode 100644 src/fileFormats/vtk/type/foamVtkFileEnums.C
 delete mode 100644 src/fileFormats/vtk/type/foamVtkFileEnums.H
 delete mode 100644 src/fileFormats/vtk/type/foamVtkOutputTypes.H

diff --git a/applications/utilities/mesh/manipulation/setSet/setSet.C b/applications/utilities/mesh/manipulation/setSet/setSet.C
index eaa89f2fb7..8ce92fc9b7 100644
--- a/applications/utilities/mesh/manipulation/setSet/setSet.C
+++ b/applications/utilities/mesh/manipulation/setSet/setSet.C
@@ -82,33 +82,33 @@ void writeVTK
     if (isA<faceSet>(currentSet))
     {
         // Faces of set with OpenFOAM faceID as value
-        foamVtkOutput::writeFaceSet
+        vtk::writeFaceSet
         (
             mesh,
             currentSet,
             mesh.time().path()/vtkBaseName,
-            foamVtkOutput::formatType::LEGACY_BINARY
+            vtk::formatType::LEGACY_BINARY
         );
     }
     else if (isA<cellSet>(currentSet))
     {
         // External faces of cellset with OpenFOAM cellID as value
-        foamVtkOutput::writeCellSetFaces
+        vtk::writeCellSetFaces
         (
             mesh,
             currentSet,
             mesh.time().path()/vtkBaseName,
-            foamVtkOutput::formatType::LEGACY_BINARY
+            vtk::formatType::LEGACY_BINARY
         );
     }
     else if (isA<pointSet>(currentSet))
     {
-        foamVtkOutput::writePointSet
+        vtk::writePointSet
         (
             mesh,
             currentSet,
             mesh.time().path()/vtkBaseName,
-            foamVtkOutput::formatType::LEGACY_BINARY
+            vtk::formatType::LEGACY_BINARY
         );
     }
     else
diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK.C b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK.C
index b3813f22c3..cb5ab87414 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK.C
+++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK.C
@@ -242,9 +242,9 @@ labelList getSelectedPatches
 // Process args for output options
 // Default from foamVtkOutputOptions is inline ASCII xml
 //
-foamVtkOutput::outputOptions getOutputOptions(const argList& args)
+vtk::outputOptions getOutputOptions(const argList& args)
 {
-    foamVtkOutput::outputOptions opts;
+    vtk::outputOptions opts;
 
     if (args.optionFound("xml"))
     {
@@ -421,7 +421,7 @@ int main(int argc, char *argv[])
     const bool noLagrangian    = args.optionFound("noLagrangian");
     const bool nearCellValue   = args.optionFound("nearCellValue");
 
-    const foamVtkOutput::outputOptions fmtType = getOutputOptions(args);
+    const vtk::outputOptions fmtType = getOutputOptions(args);
 
     if (nearCellValue)
     {
@@ -515,7 +515,7 @@ int main(int argc, char *argv[])
     meshSubsetHelper meshRef(mesh, meshSubsetHelper::SET, cellSetName);
 
     // Collect decomposition information etc.
-    foamVtkCells foamVtkMeshCells(fmtType, decomposePoly);
+    vtk::vtuCells vtuMeshCells(fmtType, decomposePoly);
 
     Info<< "VTK mesh topology: "
         << timer.cpuTimeIncrement() << " s, "
@@ -544,7 +544,7 @@ int main(int argc, char *argv[])
         )
         {
             // Trigger change for vtk cells too
-            foamVtkMeshCells.clear();
+            vtuMeshCells.clear();
         }
 
         // If faceSet: write faceSet only (as polydata)
@@ -565,7 +565,7 @@ int main(int argc, char *argv[])
             Info<< "    faceSet   : "
                 << relativeName(runTime, outputName) << nl;
 
-            foamVtkOutput::writeFaceSet
+            vtk::writeFaceSet
             (
                 meshRef.mesh(),
                 set,
@@ -593,7 +593,7 @@ int main(int argc, char *argv[])
             Info<< "    pointSet  : "
                 << relativeName(runTime, outputName) << nl;
 
-            foamVtkOutput::writePointSet
+            vtk::writePointSet
             (
                 meshRef.mesh(),
                 set,
@@ -830,14 +830,14 @@ int main(int argc, char *argv[])
 
         if (doWriteInternal)
         {
-            if (foamVtkMeshCells.empty())
+            if (vtuMeshCells.empty())
             {
-                foamVtkMeshCells.reset(meshRef.mesh());
+                vtuMeshCells.reset(meshRef.mesh());
 
                 // Convert cellMap, addPointCellLabels to global cell ids
                 if (meshRef.useSubMesh())
                 {
-                    foamVtkMeshCells.renumberCells
+                    vtuMeshCells.renumberCells
                     (
                         meshRef.subsetter().cellMap()
                     );
@@ -855,10 +855,10 @@ int main(int argc, char *argv[])
                 << relativeName(runTime, outputName) << endl;
 
             // Write mesh
-            foamVtkOutput::internalWriter writer
+            vtk::internalWriter writer
             (
                 meshRef.baseMesh(),
-                foamVtkMeshCells,
+                vtuMeshCells,
                 outputName,
                 fmtType
             );
@@ -980,7 +980,7 @@ int main(int argc, char *argv[])
                   + timeDesc
                 );
 
-                foamVtkOutput::writeSurfFields
+                vtk::writeSurfFields
                 (
                     meshRef.mesh(),
                     outputName,
@@ -1013,7 +1013,7 @@ int main(int argc, char *argv[])
             Info<< "    Combined patches     : "
                 << relativeName(runTime, outputName) << nl;
 
-            foamVtkOutput::patchWriter writer
+            vtk::patchWriter writer
             (
                 meshRef.mesh(),
                 outputName,
@@ -1083,7 +1083,7 @@ int main(int argc, char *argv[])
                 Info<< "    Patch     : "
                     << relativeName(runTime, outputName) << nl;
 
-                foamVtkOutput::patchWriter writer
+                vtk::patchWriter writer
                 (
                     meshRef.mesh(),
                     outputName,
@@ -1194,7 +1194,7 @@ int main(int argc, char *argv[])
                     mesh.points()
                 );
 
-                foamVtkOutput::surfaceMeshWriter writer
+                vtk::surfaceMeshWriter writer
                 (
                     pp,
                     fz.name(),
@@ -1281,7 +1281,7 @@ int main(int argc, char *argv[])
                 Info<< "        tensors           :";
                 print(Info, tensorNames);
 
-                foamVtkOutput::lagrangianWriter writer
+                vtk::lagrangianWriter writer
                 (
                     meshRef.mesh(),
                     cloudName,
@@ -1314,7 +1314,7 @@ int main(int argc, char *argv[])
             }
             else
             {
-                foamVtkOutput::lagrangianWriter writer
+                vtk::lagrangianWriter writer
                 (
                     meshRef.mesh(),
                     cloudName,
diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamVtkLagrangianWriter.C b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamVtkLagrangianWriter.C
index 4101672b69..959485fb19 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamVtkLagrangianWriter.C
+++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamVtkLagrangianWriter.C
@@ -29,30 +29,30 @@ License
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
-void Foam::foamVtkOutput::lagrangianWriter::beginPiece()
+void Foam::vtk::lagrangianWriter::beginPiece()
 {
     if (!legacy_)
     {
         if (useVerts_)
         {
             format()
-                .openTag(vtkFileTag::PIECE)
-                ( "NumberOfPoints", nParcels_ )
-                ( "NumberOfVerts",  nParcels_ )
+                .openTag(vtk::fileTag::PIECE)
+                .xmlAttr(fileAttr::NUMBER_OF_POINTS, nParcels_)
+                .xmlAttr(fileAttr::NUMBER_OF_VERTS,  nParcels_)
                 .closeTag();
         }
         else
         {
             format()
-                .openTag(vtkFileTag::PIECE)
-                ( "NumberOfPoints", nParcels_ )
+                .openTag(vtk::fileTag::PIECE)
+                .xmlAttr(fileAttr::NUMBER_OF_POINTS, nParcels_)
                 .closeTag();
         }
     }
 }
 
 
-void Foam::foamVtkOutput::lagrangianWriter::writePoints()
+void Foam::vtk::lagrangianWriter::writePoints()
 {
     Cloud<passiveParticle> parcels(mesh_, cloudName_, false);
     nParcels_ = parcels.size();
@@ -67,8 +67,8 @@ void Foam::foamVtkOutput::lagrangianWriter::writePoints()
     {
         beginPiece(); // Tricky - hide in here
 
-        format().tag(vtkFileTag::POINTS)
-            .openDataArray<float,3>(vtkFileTag::POINTS)
+        format().tag(vtk::fileTag::POINTS)
+            .openDataArray<float,3>(vtk::dataArrayAttr::POINTS)
             .closeTag();
     }
 
@@ -78,7 +78,7 @@ void Foam::foamVtkOutput::lagrangianWriter::writePoints()
     {
         const point& pt = iter().position();
 
-        foamVtkOutput::write(format(), pt);
+        vtk::write(format(), pt);
     }
     format().flush();
 
@@ -86,12 +86,12 @@ void Foam::foamVtkOutput::lagrangianWriter::writePoints()
     {
         format()
             .endDataArray()
-            .endTag(vtkFileTag::POINTS);
+            .endTag(vtk::fileTag::POINTS);
     }
 }
 
 
-void Foam::foamVtkOutput::lagrangianWriter::writeVertsLegacy()
+void Foam::vtk::lagrangianWriter::writeVertsLegacy()
 {
     os_ << "VERTICES " << nParcels_ << ' ' << 2*nParcels_ << nl;
 
@@ -107,9 +107,9 @@ void Foam::foamVtkOutput::lagrangianWriter::writeVertsLegacy()
 }
 
 
-void Foam::foamVtkOutput::lagrangianWriter::writeVerts()
+void Foam::vtk::lagrangianWriter::writeVerts()
 {
-    format().tag(vtkFileTag::VERTS);
+    format().tag(vtk::fileTag::VERTS);
 
     // Same payload throughout
     const uint64_t payLoad = (nParcels_ * sizeof(label));
@@ -119,7 +119,7 @@ void Foam::foamVtkOutput::lagrangianWriter::writeVerts()
     // = linear mapping onto points
     //
     {
-        format().openDataArray<label>("connectivity")
+        format().openDataArray<label>(vtk::dataArrayAttr::CONNECTIVITY)
             .closeTag();
 
         format().writeSize(payLoad);
@@ -138,7 +138,7 @@ void Foam::foamVtkOutput::lagrangianWriter::writeVerts()
     // = linear mapping onto points (with 1 offset)
     //
     {
-        format().openDataArray<label>("offsets")
+        format().openDataArray<label>(vtk::dataArrayAttr::OFFSETS)
             .closeTag();
 
         format().writeSize(payLoad);
@@ -151,18 +151,18 @@ void Foam::foamVtkOutput::lagrangianWriter::writeVerts()
         format().endDataArray();
     }
 
-    format().endTag(vtkFileTag::VERTS);
+    format().endTag(vtk::fileTag::VERTS);
 }
 
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-Foam::foamVtkOutput::lagrangianWriter::lagrangianWriter
+Foam::vtk::lagrangianWriter::lagrangianWriter
 (
     const fvMesh& mesh,
     const word& cloudName,
     const fileName& baseName,
-    const foamVtkOutput::outputOptions outOpts,
+    const vtk::outputOptions outOpts,
     const bool dummyCloud
 )
 :
@@ -185,7 +185,7 @@ Foam::foamVtkOutput::lagrangianWriter::lagrangianWriter
 
     if (legacy_)
     {
-        legacy::fileHeader(format(), title, vtkFileTag::POLY_DATA);
+        legacy::fileHeader(format(), title, vtk::fileTag::POLY_DATA);
 
         if (dummyCloud)
         {
@@ -204,7 +204,7 @@ Foam::foamVtkOutput::lagrangianWriter::lagrangianWriter
         format()
             .xmlHeader()
             .xmlComment(title)
-            .beginVTKFile(vtkFileTag::POLY_DATA, "0.1");
+            .beginVTKFile(vtk::fileTag::POLY_DATA, "0.1");
 
         if (dummyCloud)
         {
@@ -221,19 +221,19 @@ Foam::foamVtkOutput::lagrangianWriter::lagrangianWriter
 
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
 
-Foam::foamVtkOutput::lagrangianWriter::~lagrangianWriter()
+Foam::vtk::lagrangianWriter::~lagrangianWriter()
 {}
 
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-void Foam::foamVtkOutput::lagrangianWriter::beginParcelData(label nFields)
+void Foam::vtk::lagrangianWriter::beginParcelData(label nFields)
 {
-    const vtkFileTag dataType =
+    const vtk::fileTag dataType =
     (
         useVerts_
-      ? vtkFileTag::CELL_DATA
-      : vtkFileTag::POINT_DATA
+      ? vtk::fileTag::CELL_DATA
+      : vtk::fileTag::POINT_DATA
     );
 
     if (legacy_)
@@ -247,13 +247,13 @@ void Foam::foamVtkOutput::lagrangianWriter::beginParcelData(label nFields)
 }
 
 
-void Foam::foamVtkOutput::lagrangianWriter::endParcelData()
+void Foam::vtk::lagrangianWriter::endParcelData()
 {
-    const vtkFileTag dataType =
+    const vtk::fileTag dataType =
     (
         useVerts_
-      ? vtkFileTag::CELL_DATA
-      : vtkFileTag::POINT_DATA
+      ? vtk::fileTag::CELL_DATA
+      : vtk::fileTag::POINT_DATA
     );
 
     if (!legacy_)
@@ -263,14 +263,14 @@ void Foam::foamVtkOutput::lagrangianWriter::endParcelData()
 }
 
 
-void Foam::foamVtkOutput::lagrangianWriter::writeFooter()
+void Foam::vtk::lagrangianWriter::writeFooter()
 {
     if (!legacy_)
     {
         // slight cheat. </Piece> too
-        format().endTag(vtkFileTag::PIECE);
+        format().endTag(vtk::fileTag::PIECE);
 
-        format().endTag(vtkFileTag::POLY_DATA)
+        format().endTag(vtk::fileTag::POLY_DATA)
             .endVTKFile();
     }
 }
diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamVtkLagrangianWriter.H b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamVtkLagrangianWriter.H
index 5fba971387..5457ce8c60 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamVtkLagrangianWriter.H
+++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamVtkLagrangianWriter.H
@@ -22,7 +22,7 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
-    Foam::lagrangianWriter
+    Foam::vtk::lagrangianWriter
 
 Description
     Write fields (internal).
@@ -48,7 +48,7 @@ namespace Foam
 {
 class volPointInterpolation;
 
-namespace foamVtkOutput
+namespace vtk
 {
 
 /*---------------------------------------------------------------------------*\
@@ -68,7 +68,7 @@ class lagrangianWriter
         //- Write lagrangian as cell data (verts) or point data?
         const bool useVerts_;
 
-        autoPtr<foamVtkOutput::formatter> format_;
+        autoPtr<vtk::formatter> format_;
 
         const word cloudName_;
 
@@ -109,7 +109,7 @@ public:
             const fvMesh& mesh,
             const word& cloudName,
             const fileName& baseName,
-            const foamVtkOutput::outputOptions outOpts,
+            const vtk::outputOptions outOpts,
             const bool dummyCloud = false
         );
 
@@ -125,7 +125,7 @@ public:
             return os_;
         }
 
-        inline foamVtkOutput::formatter& format()
+        inline vtk::formatter& format()
         {
             return format_();
         }
@@ -149,7 +149,7 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-} // End namespace foamVtkOutput
+} // End namespace vtk
 } // End namespace Foam
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamVtkLagrangianWriterTemplates.C b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamVtkLagrangianWriterTemplates.C
index 6695f5d10f..bc3a2fd630 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamVtkLagrangianWriterTemplates.C
+++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamVtkLagrangianWriterTemplates.C
@@ -29,7 +29,7 @@ License
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 template<class Type>
-void Foam::foamVtkOutput::lagrangianWriter::writeIOField
+void Foam::vtk::lagrangianWriter::writeIOField
 (
     const wordList& objectNames
 )
@@ -94,7 +94,7 @@ void Foam::foamVtkOutput::lagrangianWriter::writeIOField
             }
 
             format().writeSize(payLoad);
-            foamVtkOutput::writeList(format(), fld);
+            vtk::writeList(format(), fld);
         }
 
         format().flush();
diff --git a/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamMeshVolume.C b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamMeshVolume.C
index f8613a674f..18beae4583 100644
--- a/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamMeshVolume.C
+++ b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamMeshVolume.C
@@ -119,7 +119,7 @@ vtkSmartPointer<vtkUnstructuredGrid> Foam::vtkPVFoam::volumeVTKMesh
         printMemory();
     }
 
-    foamVtuSizing sizing(mesh, decompPoly);
+    vtk::vtuSizing sizing(mesh, decompPoly);
 
     auto cellTypes = vtkSmartPointer<vtkUnsignedCharArray>::New();
 
@@ -141,28 +141,28 @@ vtkSmartPointer<vtkUnstructuredGrid> Foam::vtkPVFoam::volumeVTKMesh
         (
             cells,
             sizing.nFieldCells(),
-            sizing.sizeInternal(foamVtuSizing::slotType::CELLS)
+            sizing.sizeInternal(vtk::vtuSizing::slotType::CELLS)
         );
 
     UList<vtkIdType> cellLocationsUL =
         vtkUList
         (
             cellLocations,
-            sizing.sizeInternal(foamVtuSizing::slotType::CELLS_OFFSETS)
+            sizing.sizeInternal(vtk::vtuSizing::slotType::CELLS_OFFSETS)
         );
 
     UList<vtkIdType> facesUL =
         vtkUList
         (
             faces,
-            sizing.sizeInternal(foamVtuSizing::slotType::FACES)
+            sizing.sizeInternal(vtk::vtuSizing::slotType::FACES)
         );
 
     UList<vtkIdType> faceLocationsUL =
         vtkUList
         (
             faceLocations,
-            sizing.sizeInternal(foamVtuSizing::slotType::FACES_OFFSETS)
+            sizing.sizeInternal(vtk::vtuSizing::slotType::FACES_OFFSETS)
         );
 
 
diff --git a/src/conversion/Make/files b/src/conversion/Make/files
index 30c2812624..a5b3ffea22 100644
--- a/src/conversion/Make/files
+++ b/src/conversion/Make/files
@@ -29,8 +29,8 @@ vtk/output/foamVtkPatchWriter.H
 vtk/output/foamVtkSurfaceMeshWriter.C
 vtk/output/foamVtkWriteSurfFields.C
 
-vtk/part/foamVtkCells.C
 vtk/part/foamVtkMeshMaps.C
+vtk/part/foamVtuCells.C
 vtk/part/foamVtuSizing.C
 
 LIB = $(FOAM_LIBBIN)/libconversion
diff --git a/src/conversion/vtk/output/foamVtkInternalWriter.C b/src/conversion/vtk/output/foamVtkInternalWriter.C
index 2f07228109..49bf062e82 100644
--- a/src/conversion/vtk/output/foamVtkInternalWriter.C
+++ b/src/conversion/vtk/output/foamVtkInternalWriter.C
@@ -25,47 +25,46 @@ License
 
 #include "foamVtkInternalWriter.H"
 
-
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
-void Foam::foamVtkOutput::internalWriter::beginPiece()
+void Foam::vtk::internalWriter::beginPiece()
 {
     if (!legacy_)
     {
         format()
-            .openTag(vtkFileTag::PIECE)
-            ( "NumberOfPoints", vtkCells_.nFieldPoints() )
-            ( "NumberOfCells",  vtkCells_.nFieldCells() )
+            .openTag(vtk::fileTag::PIECE)
+            .xmlAttr(vtk::fileAttr::NUMBER_OF_POINTS, vtuCells_.nFieldPoints())
+            .xmlAttr(vtk::fileAttr::NUMBER_OF_CELLS,  vtuCells_.nFieldCells())
             .closeTag();
     }
 }
 
 
-void Foam::foamVtkOutput::internalWriter::writePoints()
+void Foam::vtk::internalWriter::writePoints()
 {
     // payload size
-    const uint64_t payLoad = (vtkCells_.nFieldPoints() * 3 * sizeof(float));
+    const uint64_t payLoad = (vtuCells_.nFieldPoints() * 3 * sizeof(float));
 
     if (legacy_)
     {
-        legacy::beginPoints(os_, vtkCells_.nFieldPoints());
+        legacy::beginPoints(os_, vtuCells_.nFieldPoints());
     }
     else
     {
         format()
-            .tag(vtkFileTag::POINTS)
-            .openDataArray<float,3>(vtkFileTag::POINTS)
+            .tag(vtk::fileTag::POINTS)
+            .openDataArray<float,3>(vtk::dataArrayAttr::POINTS)
             .closeTag();
     }
 
     format().writeSize(payLoad);
 
-    foamVtkOutput::writeList(format(), mesh_.points());
-    foamVtkOutput::writeList
+    vtk::writeList(format(), mesh_.points());
+    vtk::writeList
     (
         format(),
         mesh_.cellCentres(),
-        vtkCells_.addPointCellLabels()
+        vtuCells_.addPointCellLabels()
     );
 
     format().flush();
@@ -74,25 +73,25 @@ void Foam::foamVtkOutput::internalWriter::writePoints()
     {
         format()
             .endDataArray()
-            .endTag(vtkFileTag::POINTS);
+            .endTag(vtk::fileTag::POINTS);
     }
 }
 
 
-void Foam::foamVtkOutput::internalWriter::writeCellsLegacy()
+void Foam::vtk::internalWriter::writeCellsLegacy()
 {
-    const List<uint8_t>& cellTypes = vtkCells_.cellTypes();
-    const labelList& vertLabels = vtkCells_.vertLabels();
+    const List<uint8_t>& cellTypes = vtuCells_.cellTypes();
+    const labelList& vertLabels = vtuCells_.vertLabels();
 
-    os_ << "CELLS " << vtkCells_.nFieldCells() << ' '
+    os_ << "CELLS " << vtuCells_.nFieldCells() << ' '
         << vertLabels.size() << nl;
 
-    foamVtkOutput::writeList(format(), vertLabels);
+    vtk::writeList(format(), vertLabels);
     format().flush();
 
     os_ << "CELL_TYPES " << cellTypes.size() << nl;
 
-    // No nComponents for char, so cannot use foamVtkOutput::writeList
+    // No nComponents for char, so cannot use vtk::writeList
     forAll(cellTypes, i)
     {
         format().write(cellTypes[i]);
@@ -101,22 +100,22 @@ void Foam::foamVtkOutput::internalWriter::writeCellsLegacy()
 }
 
 
-void Foam::foamVtkOutput::internalWriter::writeCells()
+void Foam::vtk::internalWriter::writeCells()
 {
-    format().tag(vtkFileTag::CELLS);
+    format().tag(vtk::fileTag::CELLS);
 
     //
     // 'connectivity'
     //
     {
-        const labelList& vertLabels = vtkCells_.vertLabels();
+        const labelList& vertLabels = vtuCells_.vertLabels();
         const uint64_t payLoad = vertLabels.size() * sizeof(label);
 
-        format().openDataArray<label>("connectivity")
+        format().openDataArray<label>(vtk::dataArrayAttr::CONNECTIVITY)
             .closeTag();
 
         format().writeSize(payLoad);
-        foamVtkOutput::writeList(format(), vertLabels);
+        vtk::writeList(format(), vertLabels);
         format().flush();
 
         format().endDataArray();
@@ -127,14 +126,14 @@ void Foam::foamVtkOutput::internalWriter::writeCells()
     // 'offsets'  (connectivity offsets)
     //
     {
-        const labelList& vertOffsets = vtkCells_.vertOffsets();
+        const labelList& vertOffsets = vtuCells_.vertOffsets();
         const uint64_t payLoad = vertOffsets.size() * sizeof(label);
 
-        format().openDataArray<label>("offsets")
+        format().openDataArray<label>(vtk::dataArrayAttr::OFFSETS)
             .closeTag();
 
         format().writeSize(payLoad);
-        foamVtkOutput::writeList(format(), vertOffsets);
+        vtk::writeList(format(), vertOffsets);
         format().flush();
 
         format().endDataArray();
@@ -145,16 +144,16 @@ void Foam::foamVtkOutput::internalWriter::writeCells()
     // 'types' (cell types)
     //
     {
-        const List<uint8_t>& cellTypes = vtkCells_.cellTypes();
+        const List<uint8_t>& cellTypes = vtuCells_.cellTypes();
         const uint64_t payLoad = cellTypes.size() * sizeof(uint8_t);
 
-        format().openDataArray<uint8_t>("types")
+        format().openDataArray<uint8_t>(vtk::dataArrayAttr::TYPES)
             .closeTag();
 
         format().writeSize(payLoad);
         forAll(cellTypes, i)
         {
-            // No nComponents for char, cannot use foamVtkOutput::writeList here
+            // No nComponents for char, cannot use vtk::writeList here
             format().write(cellTypes[i]);
         }
         format().flush();
@@ -166,9 +165,9 @@ void Foam::foamVtkOutput::internalWriter::writeCells()
     //
     // can quit here if there are NO face streams
     //
-    if (vtkCells_.faceLabels().empty())
+    if (vtuCells_.faceLabels().empty())
     {
-        format().endTag(vtkFileTag::CELLS);
+        format().endTag(vtk::fileTag::CELLS);
 
         return;
     }
@@ -180,14 +179,14 @@ void Foam::foamVtkOutput::internalWriter::writeCells()
     // 'faces' (face streams)
     //
     {
-        const labelList& faceLabels = vtkCells_.faceLabels();
+        const labelList& faceLabels = vtuCells_.faceLabels();
         const uint64_t payLoad = faceLabels.size() * sizeof(label);
 
-        format().openDataArray<label>("faces")
+        format().openDataArray<label>(vtk::dataArrayAttr::FACES)
             .closeTag();
 
         format().writeSize(payLoad);
-        foamVtkOutput::writeList(format(), faceLabels);
+        vtk::writeList(format(), faceLabels);
         format().flush();
 
         format().endDataArray();
@@ -198,24 +197,24 @@ void Foam::foamVtkOutput::internalWriter::writeCells()
     // -1 to indicate that the cell is a primitive type that does not
     // have a face stream
     {
-        const labelList& faceOffsets = vtkCells_.faceOffsets();
+        const labelList& faceOffsets = vtuCells_.faceOffsets();
         const uint64_t payLoad = faceOffsets.size() * sizeof(label);
 
-        format().openDataArray<label>("faceoffsets")
+        format().openDataArray<label>(vtk::dataArrayAttr::FACEOFFSETS)
             .closeTag();
 
         format().writeSize(payLoad);
-        foamVtkOutput::writeList(format(), faceOffsets);
+        vtk::writeList(format(), faceOffsets);
         format().flush();
 
         format().endDataArray();
     }
 
-    format().endTag(vtkFileTag::CELLS);
+    format().endTag(vtk::fileTag::CELLS);
 }
 
 
-void Foam::foamVtkOutput::internalWriter::writeMesh()
+void Foam::vtk::internalWriter::writeMesh()
 {
     writePoints();
     if (legacy_)
@@ -231,18 +230,18 @@ void Foam::foamVtkOutput::internalWriter::writeMesh()
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-Foam::foamVtkOutput::internalWriter::internalWriter
+Foam::vtk::internalWriter::internalWriter
 (
     const fvMesh& mesh,
-    const foamVtkCells& cells,
+    const vtk::vtuCells& cells,
     const fileName& baseName,
-    const foamVtkOutput::outputOptions outOpts
+    const vtk::outputOptions outOpts
 )
 :
     mesh_(mesh),
     legacy_(outOpts.legacy()),
     format_(),
-    vtkCells_(cells),
+    vtuCells_(cells),
     os_()
 {
     outputOptions opts(outOpts);
@@ -255,7 +254,7 @@ Foam::foamVtkOutput::internalWriter::internalWriter
 
     if (legacy_)
     {
-        legacy::fileHeader(format(), title, vtkFileTag::UNSTRUCTURED_GRID);
+        legacy::fileHeader(format(), title, vtk::fileTag::UNSTRUCTURED_GRID);
     }
     else
     {
@@ -264,7 +263,7 @@ Foam::foamVtkOutput::internalWriter::internalWriter
         format()
             .xmlHeader()
             .xmlComment(title)
-            .beginVTKFile(vtkFileTag::UNSTRUCTURED_GRID, "0.1");
+            .beginVTKFile(vtk::fileTag::UNSTRUCTURED_GRID, "0.1");
     }
 
     beginPiece();
@@ -274,91 +273,91 @@ Foam::foamVtkOutput::internalWriter::internalWriter
 
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
 
-Foam::foamVtkOutput::internalWriter::~internalWriter()
+Foam::vtk::internalWriter::~internalWriter()
 {}
 
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 
-void Foam::foamVtkOutput::internalWriter::beginCellData(label nFields)
+void Foam::vtk::internalWriter::beginCellData(label nFields)
 {
     if (legacy_)
     {
         legacy::dataHeader
         (
             os(),
-            vtkFileTag::CELL_DATA,
-            vtkCells_.nFieldCells(),
+            vtk::fileTag::CELL_DATA,
+            vtuCells_.nFieldCells(),
             nFields
         );
     }
     else
     {
-        format().tag(vtkFileTag::CELL_DATA);
+        format().tag(vtk::fileTag::CELL_DATA);
     }
 }
 
 
-void Foam::foamVtkOutput::internalWriter::endCellData()
+void Foam::vtk::internalWriter::endCellData()
 {
     if (!legacy_)
     {
-        format().endTag(vtkFileTag::CELL_DATA);
+        format().endTag(vtk::fileTag::CELL_DATA);
     }
 }
 
 
-void Foam::foamVtkOutput::internalWriter::beginPointData(label nFields)
+void Foam::vtk::internalWriter::beginPointData(label nFields)
 {
     if (legacy_)
     {
         legacy::dataHeader
         (
             os(),
-            vtkFileTag::POINT_DATA,
-            vtkCells_.nFieldPoints(),
+            vtk::fileTag::POINT_DATA,
+            vtuCells_.nFieldPoints(),
             nFields
         );
     }
     else
     {
-        format().tag(vtkFileTag::POINT_DATA);
+        format().tag(vtk::fileTag::POINT_DATA);
     }
 }
 
 
-void Foam::foamVtkOutput::internalWriter::endPointData()
+void Foam::vtk::internalWriter::endPointData()
 {
     if (!legacy_)
     {
-        format().endTag(vtkFileTag::POINT_DATA);
+        format().endTag(vtk::fileTag::POINT_DATA);
     }
 }
 
 
-void Foam::foamVtkOutput::internalWriter::writeFooter()
+void Foam::vtk::internalWriter::writeFooter()
 {
     if (!legacy_)
     {
         // slight cheat. </Piece> too
-        format().endTag(vtkFileTag::PIECE);
+        format().endTag(vtk::fileTag::PIECE);
 
-        format().endTag(vtkFileTag::UNSTRUCTURED_GRID)
+        format().endTag(vtk::fileTag::UNSTRUCTURED_GRID)
             .endVTKFile();
     }
 }
 
 
-void Foam::foamVtkOutput::internalWriter::writeCellIDs()
+void Foam::vtk::internalWriter::writeCellIDs()
 {
     // Cell ids first
-    const labelList& cellMap = vtkCells_.cellMap();
-    const uint64_t payLoad = vtkCells_.nFieldCells() * sizeof(label);
+    const labelList& cellMap = vtuCells_.cellMap();
+    const uint64_t payLoad = vtuCells_.nFieldCells() * sizeof(label);
 
     if (legacy_)
     {
-        os_ << "cellID 1 " << vtkCells_.nFieldCells() << " int" << nl;
+        os_ << "cellID 1 " << vtuCells_.nFieldCells() << " int" << nl;
     }
     else
     {
@@ -368,7 +367,7 @@ void Foam::foamVtkOutput::internalWriter::writeCellIDs()
 
     format().writeSize(payLoad);
 
-    foamVtkOutput::writeList(format(), cellMap);
+    vtk::writeList(format(), cellMap);
     format().flush();
 
     if (!legacy_)
diff --git a/src/conversion/vtk/output/foamVtkInternalWriter.H b/src/conversion/vtk/output/foamVtkInternalWriter.H
index 93cd54f960..2751cd6785 100644
--- a/src/conversion/vtk/output/foamVtkInternalWriter.H
+++ b/src/conversion/vtk/output/foamVtkInternalWriter.H
@@ -22,7 +22,7 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
-    Foam::foamVtkOutput::internalWriter
+    Foam::vtk::internalWriter
 
 Description
     Write fields (internal).
@@ -40,9 +40,9 @@ SourceFiles
 #include "volFields.H"
 #include "pointFields.H"
 
-#include "foamVtkCells.H"
 #include "foamVtkOutputFields.H"
 #include "foamVtkOutputOptions.H"
+#include "foamVtuCells.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -50,7 +50,7 @@ namespace Foam
 {
 class volPointInterpolation;
 
-namespace foamVtkOutput
+namespace vtk
 {
 
 /*---------------------------------------------------------------------------*\
@@ -67,10 +67,10 @@ class internalWriter
         //- Commonly used query
         const bool legacy_;
 
-        autoPtr<foamVtkOutput::formatter> format_;
+        autoPtr<vtk::formatter> format_;
 
         //- The volume cells (internalMesh)
-        const foamVtkCells& vtkCells_;
+        const vtuCells& vtuCells_;
 
         std::ofstream os_;
 
@@ -108,9 +108,9 @@ public:
         internalWriter
         (
             const fvMesh& mesh,
-            const foamVtkCells& cells,
+            const vtk::vtuCells& cells,
             const fileName& baseName,
-            const foamVtkOutput::outputOptions outOpts
+            const vtk::outputOptions outOpts
         );
 
 
@@ -125,7 +125,7 @@ public:
             return os_;
         }
 
-        inline foamVtkOutput::formatter& format()
+        inline vtk::formatter& format()
         {
             return format_();
         }
@@ -212,7 +212,7 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-} // End namespace foamVtkOutput
+} // End namespace vtk
 } // End namespace Foam
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/conversion/vtk/output/foamVtkInternalWriterTemplates.C b/src/conversion/vtk/output/foamVtkInternalWriterTemplates.C
index 0770dc0571..c316c36d14 100644
--- a/src/conversion/vtk/output/foamVtkInternalWriterTemplates.C
+++ b/src/conversion/vtk/output/foamVtkInternalWriterTemplates.C
@@ -31,12 +31,12 @@ License
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 template<class Type>
-void Foam::foamVtkOutput::internalWriter::write
+void Foam::vtk::internalWriter::write
 (
     const UPtrList<const DimensionedField<Type, volMesh>>& flds
 )
 {
-    const labelList& cellMap = vtkCells_.cellMap();
+    const labelList& cellMap = vtuCells_.cellMap();
 
     const int nCmpt(pTraits<Type>::nComponents);
     // const uint64_t payLoad(cellMap.size() * nCmpt * sizeof(float));
@@ -56,7 +56,7 @@ void Foam::foamVtkOutput::internalWriter::write
         }
 
         // writeField includes payload size
-        foamVtkOutput::writeField(format(), fld, cellMap);
+        vtk::writeField(format(), fld, cellMap);
 
         if (!legacy_)
         {
@@ -67,12 +67,12 @@ void Foam::foamVtkOutput::internalWriter::write
 
 
 template<class Type, template<class> class PatchField>
-void Foam::foamVtkOutput::internalWriter::write
+void Foam::vtk::internalWriter::write
 (
     const UPtrList<const GeometricField<Type, PatchField, volMesh>>& flds
 )
 {
-    const labelList& cellMap = vtkCells_.cellMap();
+    const labelList& cellMap = vtuCells_.cellMap();
 
     const int nCmpt(pTraits<Type>::nComponents);
     // const uint64_t payLoad(cellMap.size() * nCmpt * sizeof(float));
@@ -92,7 +92,7 @@ void Foam::foamVtkOutput::internalWriter::write
         }
 
         // writeField includes payload size
-        foamVtkOutput::writeField(format(), fld, cellMap);
+        vtk::writeField(format(), fld, cellMap);
 
         if (!legacy_)
         {
@@ -103,15 +103,15 @@ void Foam::foamVtkOutput::internalWriter::write
 
 
 template<class Type, template<class> class PatchField>
-void Foam::foamVtkOutput::internalWriter::write
+void Foam::vtk::internalWriter::write
 (
     const UPtrList<const GeometricField<Type, PatchField, pointMesh>>& flds
 )
 {
-    const labelList& addPointCellLabels = vtkCells_.addPointCellLabels();
+    const labelList& addPointCellLabels = vtuCells_.addPointCellLabels();
 
     const int nCmpt(pTraits<Type>::nComponents);
-    const int nVals(vtkCells_.nFieldPoints());
+    const int nVals(vtuCells_.nFieldPoints());
 
     // Only needed for non-legacy
     const uint64_t payLoad(nVals * nCmpt * sizeof(float));
@@ -131,12 +131,12 @@ void Foam::foamVtkOutput::internalWriter::write
         }
 
         format().writeSize(payLoad);
-        foamVtkOutput::writeList(format(), fld);
+        vtk::writeList(format(), fld);
 
         forAll(addPointCellLabels, i)
         {
             const Type val = interpolatePointToCell(fld, addPointCellLabels[i]);
-            foamVtkOutput::write(format(), val);
+            vtk::write(format(), val);
         }
 
         format().flush();
@@ -150,16 +150,16 @@ void Foam::foamVtkOutput::internalWriter::write
 
 
 template<class Type>
-void Foam::foamVtkOutput::internalWriter::write
+void Foam::vtk::internalWriter::write
 (
     const volPointInterpolation& pInterp,
     const UPtrList<const DimensionedField<Type, volMesh>>& flds
 )
 {
-    const labelList& addPointCellLabels = vtkCells_.addPointCellLabels();
+    const labelList& addPointCellLabels = vtuCells_.addPointCellLabels();
 
     const int nCmpt(pTraits<Type>::nComponents);
-    const int nVals(vtkCells_.nFieldPoints());
+    const int nVals(vtuCells_.nFieldPoints());
 
     // Only needed for non-legacy
     const uint64_t payLoad(nVals * nCmpt * sizeof(float));
@@ -180,8 +180,8 @@ void Foam::foamVtkOutput::internalWriter::write
         }
 
         format().writeSize(payLoad);
-        foamVtkOutput::writeList(format(), pfield);
-        foamVtkOutput::writeList(format(), vfield, addPointCellLabels);
+        vtk::writeList(format(), pfield);
+        vtk::writeList(format(), vfield, addPointCellLabels);
         format().flush();
 
         if (!legacy_)
@@ -193,16 +193,16 @@ void Foam::foamVtkOutput::internalWriter::write
 
 
 template<class Type, template<class> class PatchField>
-void Foam::foamVtkOutput::internalWriter::write
+void Foam::vtk::internalWriter::write
 (
     const volPointInterpolation& pInterp,
     const UPtrList<const GeometricField<Type, PatchField, volMesh>>& flds
 )
 {
-    const labelList& addPointCellLabels = vtkCells_.addPointCellLabels();
+    const labelList& addPointCellLabels = vtuCells_.addPointCellLabels();
 
     const int nCmpt(pTraits<Type>::nComponents);
-    const int nVals(vtkCells_.nFieldPoints());
+    const int nVals(vtuCells_.nFieldPoints());
 
     // Only needed for non-legacy
     const uint64_t payLoad(nVals * nCmpt * sizeof(float));
@@ -223,8 +223,8 @@ void Foam::foamVtkOutput::internalWriter::write
         }
 
         format().writeSize(payLoad);
-        foamVtkOutput::writeList(format(), pfield);
-        foamVtkOutput::writeList(format(), vfield, addPointCellLabels);
+        vtk::writeList(format(), pfield);
+        vtk::writeList(format(), vfield, addPointCellLabels);
         format().flush();
 
         if (!legacy_)
diff --git a/src/conversion/vtk/output/foamVtkOutputFields.H b/src/conversion/vtk/output/foamVtkOutputFields.H
index 52bed6d037..116aadbfeb 100644
--- a/src/conversion/vtk/output/foamVtkOutputFields.H
+++ b/src/conversion/vtk/output/foamVtkOutputFields.H
@@ -22,7 +22,7 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 InNamespace
-    Foam::foamVtkOutput
+    Foam::vtk
 
 Description
     Additional functions for writing fields in VTK format.
@@ -42,36 +42,17 @@ SourceFiles
 
 namespace Foam
 {
-namespace foamVtkOutput
+namespace vtk
 {
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-    //- Write internalField for mesh
-    //  The output includes the payload size and flush.
-    template<class Type>
-    void writeField
-    (
-        foamVtkOutput::formatter& fmt,
-        const GeometricField<Type, fvPatchField, volMesh>& fld
-    );
-
-    //- Write internalField based on the cellMap
-    //  The output includes the payload size and flush.
-    template<class Type>
-    void writeField
-    (
-        foamVtkOutput::formatter& fmt,
-        const GeometricField<Type, fvPatchField, volMesh>& fld,
-        const UList<label>& cellMap
-    );
-
     //- Write DimensionedField for mesh
     //  The output includes the payload size and flush.
     template<class Type>
     void writeField
     (
-        foamVtkOutput::formatter& fmt,
+        vtk::formatter& fmt,
         const DimensionedField<Type, volMesh>& fld
     );
 
@@ -80,15 +61,34 @@ namespace foamVtkOutput
     template<class Type>
     void writeField
     (
-        foamVtkOutput::formatter& fmt,
+        vtk::formatter& fmt,
         const DimensionedField<Type, volMesh>& fld,
         const UList<label>& cellMap
     );
 
+    //- Write internalField for mesh
+    //  The output includes the payload size and flush.
+    template<class Type>
+    void writeField
+    (
+        vtk::formatter& fmt,
+        const GeometricField<Type, fvPatchField, volMesh>& fld
+    );
+
+    //- Write internalField based on the cellMap
+    //  The output includes the payload size and flush.
+    template<class Type>
+    void writeField
+    (
+        vtk::formatter& fmt,
+        const GeometricField<Type, fvPatchField, volMesh>& fld,
+        const UList<label>& cellMap
+    );
+
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-} // End namespace foamVtkOutput
+} // End namespace vtk
 } // End namespace Foam
 
 
diff --git a/src/conversion/vtk/output/foamVtkOutputFieldsTemplates.C b/src/conversion/vtk/output/foamVtkOutputFieldsTemplates.C
index 74ea384864..b462922416 100644
--- a/src/conversion/vtk/output/foamVtkOutputFieldsTemplates.C
+++ b/src/conversion/vtk/output/foamVtkOutputFieldsTemplates.C
@@ -25,49 +25,11 @@ License
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-template<class Type>
-void Foam::foamVtkOutput::writeField
-(
-    foamVtkOutput::formatter& fmt,
-    const GeometricField<Type, fvPatchField, volMesh>& fld
-)
-{
-    const uint64_t payLoad =
-    (
-        fld.size() * pTraits<Type>::nComponents * sizeof(float)
-    );
-
-    fmt.writeSize(payLoad);
-    writeList(fmt, fld.internalField());
-
-    fmt.flush();
-}
-
 
 template<class Type>
-void Foam::foamVtkOutput::writeField
+void Foam::vtk::writeField
 (
-    foamVtkOutput::formatter& fmt,
-    const GeometricField<Type, fvPatchField, volMesh>& fld,
-    const UList<label>& cellMap
-)
-{
-    const uint64_t payLoad =
-    (
-        cellMap.size() * pTraits<Type>::nComponents * sizeof(float)
-    );
-
-    fmt.writeSize(payLoad);
-    writeList(fmt, fld.internalField(), cellMap);
-
-    fmt.flush();
-}
-
-
-template<class Type>
-void Foam::foamVtkOutput::writeField
-(
-    foamVtkOutput::formatter& fmt,
+    vtk::formatter& fmt,
     const DimensionedField<Type, volMesh>& fld
 )
 {
@@ -84,9 +46,9 @@ void Foam::foamVtkOutput::writeField
 
 
 template<class Type>
-void Foam::foamVtkOutput::writeField
+void Foam::vtk::writeField
 (
-    foamVtkOutput::formatter& fmt,
+    vtk::formatter& fmt,
     const DimensionedField<Type, volMesh>& fld,
     const UList<label>& cellMap
 )
@@ -103,4 +65,43 @@ void Foam::foamVtkOutput::writeField
 }
 
 
+template<class Type>
+void Foam::vtk::writeField
+(
+    vtk::formatter& fmt,
+    const GeometricField<Type, fvPatchField, volMesh>& fld
+)
+{
+    const uint64_t payLoad =
+    (
+        fld.size() * pTraits<Type>::nComponents * sizeof(float)
+    );
+
+    fmt.writeSize(payLoad);
+    writeList(fmt, fld.internalField());
+
+    fmt.flush();
+}
+
+
+template<class Type>
+void Foam::vtk::writeField
+(
+    vtk::formatter& fmt,
+    const GeometricField<Type, fvPatchField, volMesh>& fld,
+    const UList<label>& cellMap
+)
+{
+    const uint64_t payLoad =
+    (
+        cellMap.size() * pTraits<Type>::nComponents * sizeof(float)
+    );
+
+    fmt.writeSize(payLoad);
+    writeList(fmt, fld.internalField(), cellMap);
+
+    fmt.flush();
+}
+
+
 // ************************************************************************* //
diff --git a/src/conversion/vtk/output/foamVtkPatchWriter.C b/src/conversion/vtk/output/foamVtkPatchWriter.C
index f52a0c9a0f..ebaef3ce86 100644
--- a/src/conversion/vtk/output/foamVtkPatchWriter.C
+++ b/src/conversion/vtk/output/foamVtkPatchWriter.C
@@ -29,25 +29,24 @@ License
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
-void Foam::foamVtkOutput::patchWriter::beginPiece()
+void Foam::vtk::patchWriter::beginPiece()
 {
     if (!legacy_)
     {
         format()
-            .openTag(vtkFileTag::PIECE)
-            ( "NumberOfPoints", nPoints_ )
-            ( "NumberOfPolys",  nFaces_ )
+            .openTag(vtk::fileTag::PIECE)
+            .xmlAttr(vtk::fileAttr::NUMBER_OF_POINTS, nPoints_)
+            .xmlAttr(vtk::fileAttr::NUMBER_OF_POLYS,  nFaces_)
             .closeTag();
     }
 }
 
 
-void Foam::foamVtkOutput::patchWriter::writePoints()
+void Foam::vtk::patchWriter::writePoints()
 {
     const polyBoundaryMesh& patches = mesh_.boundaryMesh();
 
-    // payload count
-    const uint64_t payLoad = (nPoints_*3* sizeof(float));
+    const uint64_t payLoad = (nPoints_*3*sizeof(float));
 
     if (legacy_)
     {
@@ -55,8 +54,8 @@ void Foam::foamVtkOutput::patchWriter::writePoints()
     }
     else
     {
-        format().tag(vtkFileTag::POINTS)
-            .openDataArray<float, 3>(vtkFileTag::POINTS)
+        format().tag(vtk::fileTag::POINTS)
+            .openDataArray<float, 3>(vtk::dataArrayAttr::POINTS)
             .closeTag();
     }
 
@@ -66,7 +65,7 @@ void Foam::foamVtkOutput::patchWriter::writePoints()
     {
         const polyPatch& pp = patches[patchIDs_[i]];
 
-        foamVtkOutput::writeList(format(), pp.localPoints());
+        vtk::writeList(format(), pp.localPoints());
     }
     format().flush();
 
@@ -74,12 +73,12 @@ void Foam::foamVtkOutput::patchWriter::writePoints()
     {
         format()
             .endDataArray()
-            .endTag(vtkFileTag::POINTS);
+            .endTag(vtk::fileTag::POINTS);
     }
 }
 
 
-void Foam::foamVtkOutput::patchWriter::writePolysLegacy()
+void Foam::vtk::patchWriter::writePolysLegacy()
 {
     const polyBoundaryMesh& patches = mesh_.boundaryMesh();
 
@@ -123,7 +122,7 @@ void Foam::foamVtkOutput::patchWriter::writePolysLegacy()
 }
 
 
-void Foam::foamVtkOutput::patchWriter::writePolys()
+void Foam::vtk::patchWriter::writePolys()
 {
     const polyBoundaryMesh& patches = mesh_.boundaryMesh();
 
@@ -131,7 +130,7 @@ void Foam::foamVtkOutput::patchWriter::writePolys()
     // 'connectivity'
     //
 
-    format().tag(vtkFileTag::POLYS);
+    format().tag(vtk::fileTag::POLYS);
 
     //
     // 'connectivity'
@@ -150,7 +149,7 @@ void Foam::foamVtkOutput::patchWriter::writePolys()
             }
         }
 
-        format().openDataArray<label>("connectivity")
+        format().openDataArray<label>(vtk::dataArrayAttr::CONNECTIVITY)
             .closeTag();
 
         // payload size
@@ -185,7 +184,7 @@ void Foam::foamVtkOutput::patchWriter::writePolys()
     //
     {
         format()
-            .openDataArray<label>("offsets")
+            .openDataArray<label>(vtk::dataArrayAttr::OFFSETS)
             .closeTag();
 
         // payload size
@@ -208,11 +207,11 @@ void Foam::foamVtkOutput::patchWriter::writePolys()
         format().endDataArray();
     }
 
-    format().endTag(vtkFileTag::POLYS);
+    format().endTag(vtk::fileTag::POLYS);
 }
 
 
-void Foam::foamVtkOutput::patchWriter::writeMesh()
+void Foam::vtk::patchWriter::writeMesh()
 {
     writePoints();
     if (legacy_)
@@ -228,11 +227,11 @@ void Foam::foamVtkOutput::patchWriter::writeMesh()
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-Foam::foamVtkOutput::patchWriter::patchWriter
+Foam::vtk::patchWriter::patchWriter
 (
     const fvMesh& mesh,
     const fileName& baseName,
-    const foamVtkOutput::outputOptions outOpts,
+    const vtk::outputOptions outOpts,
     const bool nearCellValue,
     const labelList& patchIDs
 )
@@ -274,7 +273,7 @@ Foam::foamVtkOutput::patchWriter::patchWriter
 
     if (legacy_)
     {
-        legacy::fileHeader(format(), title, vtkFileTag::POLY_DATA);
+        legacy::fileHeader(format(), title, vtk::fileTag::POLY_DATA);
     }
     else
     {
@@ -283,7 +282,7 @@ Foam::foamVtkOutput::patchWriter::patchWriter
         format()
             .xmlHeader()
             .xmlComment(title)
-            .beginVTKFile(vtkFileTag::POLY_DATA, "0.1");
+            .beginVTKFile(vtk::fileTag::POLY_DATA, "0.1");
     }
 
     beginPiece();
@@ -293,82 +292,82 @@ Foam::foamVtkOutput::patchWriter::patchWriter
 
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
 
-Foam::foamVtkOutput::patchWriter::~patchWriter()
+Foam::vtk::patchWriter::~patchWriter()
 {}
 
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-void Foam::foamVtkOutput::patchWriter::beginCellData(label nFields)
+void Foam::vtk::patchWriter::beginCellData(label nFields)
 {
     if (legacy_)
     {
         legacy::dataHeader
         (
             os(),
-            vtkFileTag::CELL_DATA,
+            vtk::fileTag::CELL_DATA,
             nFaces_,
             nFields
         );
     }
     else
     {
-        format().tag(vtkFileTag::CELL_DATA);
+        format().tag(vtk::fileTag::CELL_DATA);
     }
 }
 
 
-void Foam::foamVtkOutput::patchWriter::endCellData()
+void Foam::vtk::patchWriter::endCellData()
 {
     if (!legacy_)
     {
-        format().endTag(vtkFileTag::CELL_DATA);
+        format().endTag(vtk::fileTag::CELL_DATA);
     }
 }
 
 
-void Foam::foamVtkOutput::patchWriter::beginPointData(label nFields)
+void Foam::vtk::patchWriter::beginPointData(label nFields)
 {
     if (legacy_)
     {
         legacy::dataHeader
         (
             os(),
-            vtkFileTag::POINT_DATA,
+            vtk::fileTag::POINT_DATA,
             nPoints_,
             nFields
         );
     }
     else
     {
-        format().tag(vtkFileTag::POINT_DATA);
+        format().tag(vtk::fileTag::POINT_DATA);
     }
 }
 
 
-void Foam::foamVtkOutput::patchWriter::endPointData()
+void Foam::vtk::patchWriter::endPointData()
 {
     if (!legacy_)
     {
-        format().endTag(vtkFileTag::POINT_DATA);
+        format().endTag(vtk::fileTag::POINT_DATA);
     }
 }
 
 
-void Foam::foamVtkOutput::patchWriter::writeFooter()
+void Foam::vtk::patchWriter::writeFooter()
 {
     if (!legacy_)
     {
         // slight cheat. </Piece> too
-        format().endTag(vtkFileTag::PIECE);
+        format().endTag(vtk::fileTag::PIECE);
 
-        format().endTag(vtkFileTag::POLY_DATA)
+        format().endTag(vtk::fileTag::POLY_DATA)
             .endVTKFile();
     }
 }
 
 
-void Foam::foamVtkOutput::patchWriter::writePatchIDs()
+void Foam::vtk::patchWriter::writePatchIDs()
 {
     // Patch ids first
     const uint64_t payLoad = nFaces_ * sizeof(label);
diff --git a/src/conversion/vtk/output/foamVtkPatchWriter.H b/src/conversion/vtk/output/foamVtkPatchWriter.H
index 259050c27c..76b21ea436 100644
--- a/src/conversion/vtk/output/foamVtkPatchWriter.H
+++ b/src/conversion/vtk/output/foamVtkPatchWriter.H
@@ -22,7 +22,7 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
-    Foam::foamVtkOutput::patchWriter
+    Foam::vtk::patchWriter
 
 Description
     Write patch fields
@@ -50,7 +50,7 @@ namespace Foam
 {
 class volPointInterpolation;
 
-namespace foamVtkOutput
+namespace vtk
 {
 
 /*---------------------------------------------------------------------------*\
@@ -67,7 +67,7 @@ class patchWriter
         //- Commonly used query
         const bool legacy_;
 
-        autoPtr<foamVtkOutput::formatter> format_;
+        autoPtr<vtk::formatter> format_;
 
         const bool nearCellValue_;
 
@@ -114,7 +114,7 @@ public:
         (
             const fvMesh& mesh,
             const fileName& baseName,
-            const foamVtkOutput::outputOptions outOpts,
+            const vtk::outputOptions outOpts,
             const bool nearCellValue,
             const labelList& patchIDs
         );
@@ -131,7 +131,7 @@ public:
             return os_;
         }
 
-        inline foamVtkOutput::formatter& format()
+        inline vtk::formatter& format()
         {
             return format_();
         }
@@ -202,7 +202,7 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-} // End namespace foamVtkOutput
+} // End namespace vtk
 } // End namespace Foam
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/conversion/vtk/output/foamVtkPatchWriterTemplates.C b/src/conversion/vtk/output/foamVtkPatchWriterTemplates.C
index 4c23bdc016..58fbadffb6 100644
--- a/src/conversion/vtk/output/foamVtkPatchWriterTemplates.C
+++ b/src/conversion/vtk/output/foamVtkPatchWriterTemplates.C
@@ -29,7 +29,7 @@ License
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 template<class Type, template<class> class PatchField>
-void Foam::foamVtkOutput::patchWriter::write
+void Foam::vtk::patchWriter::write
 (
     const UPtrList<const GeometricField<Type, PatchField, volMesh>>& flds
 )
@@ -59,11 +59,11 @@ void Foam::foamVtkOutput::patchWriter::write
 
             if (nearCellValue_)
             {
-                foamVtkOutput::writeList(format(), pfld.patchInternalField()());
+                vtk::writeList(format(), pfld.patchInternalField()());
             }
             else
             {
-                foamVtkOutput::writeList(format(), pfld);
+                vtk::writeList(format(), pfld);
             }
         }
 
@@ -78,7 +78,7 @@ void Foam::foamVtkOutput::patchWriter::write
 
 
 template<class Type, template<class> class PatchField>
-void Foam::foamVtkOutput::patchWriter::write
+void Foam::vtk::patchWriter::write
 (
     const UPtrList<const GeometricField<Type, PatchField, pointMesh>>& flds
 )
@@ -106,7 +106,7 @@ void Foam::foamVtkOutput::patchWriter::write
         {
             const auto& pfld = fld.boundaryField()[patchIDs_[i]];
 
-            foamVtkOutput::writeList(format(), pfld.patchInternalField()());
+            vtk::writeList(format(), pfld.patchInternalField()());
         }
 
         format().flush();
@@ -120,7 +120,7 @@ void Foam::foamVtkOutput::patchWriter::write
 
 
 template<class Type>
-void Foam::foamVtkOutput::patchWriter::write
+void Foam::vtk::patchWriter::write
 (
     const PrimitivePatchInterpolation<primitivePatch>& pInter,
     const UPtrList<const GeometricField<Type, fvPatchField, volMesh>>& flds
@@ -154,13 +154,13 @@ void Foam::foamVtkOutput::patchWriter::write
                 auto tfield =
                     pInter.faceToPointInterpolate(pfld.patchInternalField()());
 
-                foamVtkOutput::writeList(format(), tfield());
+                vtk::writeList(format(), tfield());
             }
             else
             {
                 auto tfield = pInter.faceToPointInterpolate(pfld);
 
-                foamVtkOutput::writeList(format(), tfield());
+                vtk::writeList(format(), tfield());
             }
         }
 
diff --git a/src/conversion/vtk/output/foamVtkSurfaceMeshWriter.C b/src/conversion/vtk/output/foamVtkSurfaceMeshWriter.C
index c60e18378b..df54f039cd 100644
--- a/src/conversion/vtk/output/foamVtkSurfaceMeshWriter.C
+++ b/src/conversion/vtk/output/foamVtkSurfaceMeshWriter.C
@@ -29,22 +29,21 @@ License
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
-void Foam::foamVtkOutput::surfaceMeshWriter::beginPiece()
+void Foam::vtk::surfaceMeshWriter::beginPiece()
 {
     if (!legacy_)
     {
         format()
-            .openTag(vtkFileTag::PIECE)
-            ( "NumberOfPoints", pp_.nPoints() )
-            ( "NumberOfPolys",  pp_.size() )
+            .openTag(vtk::fileTag::PIECE)
+            .xmlAttr(vtk::fileAttr::NUMBER_OF_POINTS, pp_.nPoints())
+            .xmlAttr(vtk::fileAttr::NUMBER_OF_POLYS,  pp_.size())
             .closeTag();
     }
 }
 
 
-void Foam::foamVtkOutput::surfaceMeshWriter::writePoints()
+void Foam::vtk::surfaceMeshWriter::writePoints()
 {
-    // payload count
     const uint64_t payLoad = (pp_.nPoints()*3*sizeof(float));
 
     if (legacy_)
@@ -53,26 +52,26 @@ void Foam::foamVtkOutput::surfaceMeshWriter::writePoints()
     }
     else
     {
-        format().tag(vtkFileTag::POINTS)
-            .openDataArray<float, 3>(vtkFileTag::POINTS)
+        format().tag(vtk::fileTag::POINTS)
+            .openDataArray<float, 3>(vtk::dataArrayAttr::POINTS)
             .closeTag();
     }
 
     format().writeSize(payLoad);
 
-    foamVtkOutput::writeList(format(), pp_.localPoints());
+    vtk::writeList(format(), pp_.localPoints());
     format().flush();
 
     if (!legacy_)
     {
         format()
             .endDataArray()
-            .endTag(vtkFileTag::POINTS);
+            .endTag(vtk::fileTag::POINTS);
     }
 }
 
 
-void Foam::foamVtkOutput::surfaceMeshWriter::writePolysLegacy()
+void Foam::vtk::surfaceMeshWriter::writePolysLegacy()
 {
     // connectivity count without additional storage (done internally)
     uint64_t nConnectivity = 0;
@@ -92,20 +91,20 @@ void Foam::foamVtkOutput::surfaceMeshWriter::writePolysLegacy()
         const face& f = pp_.localFaces()[facei];
 
         format().write(f.size());  // The size prefix
-        foamVtkOutput::writeList(format(), f);
+        vtk::writeList(format(), f);
     }
 
     format().flush();
 }
 
 
-void Foam::foamVtkOutput::surfaceMeshWriter::writePolys()
+void Foam::vtk::surfaceMeshWriter::writePolys()
 {
     //
     // 'connectivity'
     //
 
-    format().tag(vtkFileTag::POLYS);
+    format().tag(vtk::fileTag::POLYS);
 
     //
     // 'connectivity'
@@ -118,7 +117,7 @@ void Foam::foamVtkOutput::surfaceMeshWriter::writePolys()
             payLoad += pp_[facei].size();
         }
 
-        format().openDataArray<label>("connectivity")
+        format().openDataArray<label>(vtk::dataArrayAttr::CONNECTIVITY)
             .closeTag();
 
         // payload size
@@ -127,7 +126,7 @@ void Foam::foamVtkOutput::surfaceMeshWriter::writePolys()
         forAll(pp_, facei)
         {
             const face& f = pp_.localFaces()[facei];
-            foamVtkOutput::writeList(format(), f);
+            vtk::writeList(format(), f);
         }
 
         format().flush();
@@ -142,7 +141,7 @@ void Foam::foamVtkOutput::surfaceMeshWriter::writePolys()
     //
     {
         format()
-            .openDataArray<label>("offsets")
+            .openDataArray<label>(vtk::dataArrayAttr::OFFSETS)
             .closeTag();
 
         // payload size
@@ -160,11 +159,11 @@ void Foam::foamVtkOutput::surfaceMeshWriter::writePolys()
         format().endDataArray();
     }
 
-    format().endTag(vtkFileTag::POLYS);
+    format().endTag(vtk::fileTag::POLYS);
 }
 
 
-void Foam::foamVtkOutput::surfaceMeshWriter::writeMesh()
+void Foam::vtk::surfaceMeshWriter::writeMesh()
 {
     writePoints();
     if (legacy_)
@@ -180,12 +179,12 @@ void Foam::foamVtkOutput::surfaceMeshWriter::writeMesh()
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-Foam::foamVtkOutput::surfaceMeshWriter::surfaceMeshWriter
+Foam::vtk::surfaceMeshWriter::surfaceMeshWriter
 (
     const indirectPrimitivePatch& pp,
     const word& name,
     const fileName& baseName,
-    const foamVtkOutput::outputOptions outOpts
+    const vtk::outputOptions outOpts
 )
 :
     pp_(pp),
@@ -201,7 +200,7 @@ Foam::foamVtkOutput::surfaceMeshWriter::surfaceMeshWriter
 
     if (legacy_)
     {
-        legacy::fileHeader(format(), name, vtkFileTag::POLY_DATA);
+        legacy::fileHeader(format(), name, vtk::fileTag::POLY_DATA);
     }
     else
     {
@@ -210,7 +209,7 @@ Foam::foamVtkOutput::surfaceMeshWriter::surfaceMeshWriter
         format()
             .xmlHeader()
             .xmlComment(name)
-            .beginVTKFile(vtkFileTag::POLY_DATA, "0.1");
+            .beginVTKFile(vtk::fileTag::POLY_DATA, "0.1");
 
     }
 
@@ -221,42 +220,42 @@ Foam::foamVtkOutput::surfaceMeshWriter::surfaceMeshWriter
 
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
 
-Foam::foamVtkOutput::surfaceMeshWriter::~surfaceMeshWriter()
+Foam::vtk::surfaceMeshWriter::~surfaceMeshWriter()
 {}
 
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-void Foam::foamVtkOutput::surfaceMeshWriter::beginCellData(label nFields)
+void Foam::vtk::surfaceMeshWriter::beginCellData(label nFields)
 {
     if (legacy_)
     {
-        legacy::dataHeader(os(), vtkFileTag::CELL_DATA, pp_.size(), nFields);
+        legacy::dataHeader(os(), vtk::fileTag::CELL_DATA, pp_.size(), nFields);
     }
     else
     {
-        format().tag(vtkFileTag::CELL_DATA);
+        format().tag(vtk::fileTag::CELL_DATA);
     }
 }
 
 
-void Foam::foamVtkOutput::surfaceMeshWriter::endCellData()
+void Foam::vtk::surfaceMeshWriter::endCellData()
 {
     if (!legacy_)
     {
-        format().endTag(vtkFileTag::CELL_DATA);
+        format().endTag(vtk::fileTag::CELL_DATA);
     }
 }
 
 
-void Foam::foamVtkOutput::surfaceMeshWriter::writeFooter()
+void Foam::vtk::surfaceMeshWriter::writeFooter()
 {
     if (!legacy_)
     {
         // slight cheat. </Piece> too
-        format().endTag(vtkFileTag::PIECE);
+        format().endTag(vtk::fileTag::PIECE);
 
-        format().endTag(vtkFileTag::POLY_DATA)
+        format().endTag(vtk::fileTag::POLY_DATA)
             .endVTKFile();
     }
 }
diff --git a/src/conversion/vtk/output/foamVtkSurfaceMeshWriter.H b/src/conversion/vtk/output/foamVtkSurfaceMeshWriter.H
index d911998dec..9b174a0dec 100644
--- a/src/conversion/vtk/output/foamVtkSurfaceMeshWriter.H
+++ b/src/conversion/vtk/output/foamVtkSurfaceMeshWriter.H
@@ -22,7 +22,7 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
-    Foam::foamVtkOutput::surfaceMeshWriter
+    Foam::vtk::surfaceMeshWriter
 
 Description
     Write faces with fields
@@ -49,7 +49,7 @@ namespace Foam
 {
 class volPointInterpolation;
 
-namespace foamVtkOutput
+namespace vtk
 {
 
 /*---------------------------------------------------------------------------*\
@@ -65,7 +65,7 @@ class surfaceMeshWriter
         //- Commonly used query
         const bool legacy_;
 
-        autoPtr<foamVtkOutput::formatter> format_;
+        autoPtr<vtk::formatter> format_;
 
         std::ofstream os_;
 
@@ -104,7 +104,7 @@ public:
             const indirectPrimitivePatch& pp,
             const word& name,
             const fileName& baseName,
-            const foamVtkOutput::outputOptions outOpts
+            const vtk::outputOptions outOpts
         );
 
 
@@ -119,7 +119,7 @@ public:
             return os_;
         }
 
-        inline foamVtkOutput::formatter& format()
+        inline vtk::formatter& format()
         {
             return format_();
         }
@@ -156,7 +156,7 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-} // End namespace foamVtkOutput
+} // End namespace vtk
 } // End namespace Foam
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/conversion/vtk/output/foamVtkSurfaceMeshWriterTemplates.C b/src/conversion/vtk/output/foamVtkSurfaceMeshWriterTemplates.C
index 654475aa71..cdad74b7d0 100644
--- a/src/conversion/vtk/output/foamVtkSurfaceMeshWriterTemplates.C
+++ b/src/conversion/vtk/output/foamVtkSurfaceMeshWriterTemplates.C
@@ -29,7 +29,7 @@ License
 
 template<class Type>
 Foam::tmp<Foam::Field<Type>>
-Foam::foamVtkOutput::surfaceMeshWriter::getFaceField
+Foam::vtk::surfaceMeshWriter::getFaceField
 (
     const GeometricField<Type, fvsPatchField, surfaceMesh>& sfld
 ) const
@@ -60,7 +60,7 @@ Foam::foamVtkOutput::surfaceMeshWriter::getFaceField
 
 
 template<class Type>
-void Foam::foamVtkOutput::surfaceMeshWriter::write
+void Foam::vtk::surfaceMeshWriter::write
 (
     const UPtrList
     <
@@ -86,7 +86,7 @@ void Foam::foamVtkOutput::surfaceMeshWriter::write
         }
 
         format().writeSize(payLoad);
-        foamVtkOutput::writeList(format(), getFaceField(fld)());
+        vtk::writeList(format(), getFaceField(fld)());
 
         format().flush();
 
diff --git a/src/conversion/vtk/output/foamVtkWriteSurfFields.C b/src/conversion/vtk/output/foamVtkWriteSurfFields.C
index 9bc09e4864..40c99456a1 100644
--- a/src/conversion/vtk/output/foamVtkWriteSurfFields.C
+++ b/src/conversion/vtk/output/foamVtkWriteSurfFields.C
@@ -32,11 +32,11 @@ License
 
 // * * * * * * * * * * * * * * * Global Functions  * * * * * * * * * * * * * //
 
-void Foam::foamVtkOutput::writeSurfFields
+void Foam::vtk::writeSurfFields
 (
     const fvMesh& mesh,
     const fileName& baseName,
-    const foamVtkOutput::outputOptions outOpts,
+    const vtk::outputOptions outOpts,
     const UPtrList<const surfaceVectorField>& surfVectorFields
 )
 {
@@ -46,7 +46,7 @@ void Foam::foamVtkOutput::writeSurfFields
     const bool legacy_(opts.legacy());
 
     std::ofstream os((baseName + (legacy_ ? ".vtk" : ".vtp")).c_str());
-    autoPtr<foamVtkOutput::formatter> format = opts.newFormatter(os);
+    autoPtr<vtk::formatter> format = opts.newFormatter(os);
 
     // Same payload size for points and vector fields!
     const int nCmpt(3);  // vector
@@ -54,7 +54,7 @@ void Foam::foamVtkOutput::writeSurfFields
 
     if (legacy_)
     {
-        legacy::fileHeader(format(), "surfaceFields", vtkFileTag::POLY_DATA);
+        legacy::fileHeader(format(), "surfaceFields", vtk::fileTag::POLY_DATA);
         legacy::beginPoints(os, mesh.nFaces());
     }
     else
@@ -64,30 +64,30 @@ void Foam::foamVtkOutput::writeSurfFields
         format()
             .xmlHeader()
             .xmlComment("surfaceFields")
-            .beginVTKFile(vtkFileTag::POLY_DATA, "0.1");
+            .beginVTKFile(vtk::fileTag::POLY_DATA, "0.1");
 
         // Tricky - hide in beginPiece()
         format()
-            .openTag(vtkFileTag::PIECE)
-            ( "NumberOfPoints", mesh.nFaces() )
+            .openTag(vtk::fileTag::PIECE)
+            .xmlAttr(vtk::fileAttr::NUMBER_OF_POINTS, mesh.nFaces())
             .closeTag();
 
-        format().tag(vtkFileTag::POINTS)
-            .openDataArray<float,3>(vtkFileTag::POINTS)
+        format().tag(vtk::fileTag::POINTS)
+            .openDataArray<float,3>(vtk::dataArrayAttr::POINTS)
             .closeTag();
     }
 
     const pointField& fc = mesh.faceCentres();
 
     format().writeSize(payLoad);
-    foamVtkOutput::writeList(format(), fc);
+    vtk::writeList(format(), fc);
     format().flush();
 
     if (!legacy_)
     {
         format()
             .endDataArray()
-            .endTag(vtkFileTag::POINTS);
+            .endTag(vtk::fileTag::POINTS);
     }
 
 
@@ -97,14 +97,14 @@ void Foam::foamVtkOutput::writeSurfFields
         legacy::dataHeader
         (
             os,
-            vtkFileTag::POINT_DATA,
+            vtk::fileTag::POINT_DATA,
             mesh.nFaces(),
             surfVectorFields.size()
         );
     }
     else
     {
-        format().tag(vtkFileTag::POINT_DATA);
+        format().tag(vtk::fileTag::POINT_DATA);
     }
 
     // surfVectorFields
@@ -126,7 +126,7 @@ void Foam::foamVtkOutput::writeSurfFields
 
         for (label facei=0; facei < mesh.nInternalFaces(); ++facei)
         {
-            foamVtkOutput::write(format(), fld[facei]);
+            vtk::write(format(), fld[facei]);
         }
 
         forAll(fld.boundaryField(), patchi)
@@ -139,12 +139,12 @@ void Foam::foamVtkOutput::writeSurfFields
                 // Note: loop over polypatch size, not fvpatch size.
                 forAll(pp.patch(), i)
                 {
-                    foamVtkOutput::write(format(), vector::zero);
+                    vtk::write(format(), vector::zero);
                 }
             }
             else
             {
-                foamVtkOutput::writeList(format(), pf);
+                vtk::writeList(format(), pf);
             }
         }
 
@@ -158,12 +158,12 @@ void Foam::foamVtkOutput::writeSurfFields
 
     if (!legacy_)
     {
-        format().endTag(vtkFileTag::POINT_DATA);
+        format().endTag(vtk::fileTag::POINT_DATA);
 
         // slight cheat. </Piece> too
-        format().endTag(vtkFileTag::PIECE);
+        format().endTag(vtk::fileTag::PIECE);
 
-        format().endTag(vtkFileTag::POLY_DATA)
+        format().endTag(vtk::fileTag::POLY_DATA)
             .endVTKFile();
     }
 }
diff --git a/src/conversion/vtk/output/foamVtkWriteSurfFields.H b/src/conversion/vtk/output/foamVtkWriteSurfFields.H
index 80727dec54..ff7e77b00f 100644
--- a/src/conversion/vtk/output/foamVtkWriteSurfFields.H
+++ b/src/conversion/vtk/output/foamVtkWriteSurfFields.H
@@ -22,7 +22,7 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 InNamespace
-    Foam::foamVtkOutput
+    Foam::vtk
 
 Description
     Write surface fields as vectors
@@ -44,7 +44,7 @@ SourceFiles
 
 namespace Foam
 {
-namespace foamVtkOutput
+namespace vtk
 {
 
 //- Write surface vector fields
@@ -52,11 +52,11 @@ void writeSurfFields
 (
     const fvMesh& mesh,
     const fileName& baseName,
-    const foamVtkOutput::outputOptions outOpts,
+    const vtk::outputOptions outOpts,
     const UPtrList<const surfaceVectorField>& surfVectorFields
 );
 
-} // End namespace foamVtkOutput
+} // End namespace vtk
 } // End namespace Foam
 
 
diff --git a/src/conversion/vtk/part/foamVtkMeshMaps.H b/src/conversion/vtk/part/foamVtkMeshMaps.H
index 63390ef34b..737f02a2ed 100644
--- a/src/conversion/vtk/part/foamVtkMeshMaps.H
+++ b/src/conversion/vtk/part/foamVtkMeshMaps.H
@@ -26,6 +26,8 @@ Class
 
 Description
     Bookkeeping for mesh subsetting and/or polyhedral cell decomposition.
+    Although the main use case is for handling vtk meshes, it is not specific
+    to VTK alone.
 
     The cellMap is a local-to-global lookup for normal and decomposed cells.
     The pointMap is an optional local-to-global lookup for point ids.
@@ -101,17 +103,19 @@ public:
         //- Clear
         inline void clear();
 
-        //- Renumber cell ids to account for subset meshes
+        //- Renumber cell ids (cellMap and additionalIds) to account for
+        //  subset meshes
         void renumberCells(const UList<label>& mapping);
 
-        //- Renumber point ids to account for subset meshes
+        //- Renumber point ids (pointMap) to account for subset meshes
         void renumberPoints(const UList<label>& mapping);
 
 
         //- Original cell ids for all cells (regular and decomposed).
-        //  A regular mesh comprising only primitive cell types, this will just
-        //  be an identity list. However, for subsetted meshes and decomposed
-        //  cells this becomes a useful means of mapping from the original mesh.
+        //  For a regular mesh comprising only primitive cell types, this
+        //  will simply be an identity list. However, for subsetted meshes
+        //  and decomposed cells this becomes a useful means of mapping from
+        //  the original mesh.
         inline DynamicList<label>& cellMap();
 
         //- Point labels for subsetted meshes
diff --git a/src/conversion/vtk/part/foamVtkCells.C b/src/conversion/vtk/part/foamVtuCells.C
similarity index 77%
rename from src/conversion/vtk/part/foamVtkCells.C
rename to src/conversion/vtk/part/foamVtuCells.C
index 8b9faf7142..962fa9b0ee 100644
--- a/src/conversion/vtk/part/foamVtkCells.C
+++ b/src/conversion/vtk/part/foamVtuCells.C
@@ -24,18 +24,18 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "polyMesh.H"
-#include "foamVtkCells.H"
+#include "foamVtuCells.H"
 #include "foamVtkOutputOptions.H"
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-Foam::foamVtkCells::foamVtkCells
+Foam::vtk::vtuCells::vtuCells
 (
     const contentType output,
     const bool decompose
 )
 :
-    foamVtuSizing(),
+    vtk::vtuSizing(),
     output_(output),
     decomposeRequest_(decompose),
     cellTypes_(),
@@ -47,26 +47,26 @@ Foam::foamVtkCells::foamVtkCells
 {}
 
 
-Foam::foamVtkCells::foamVtkCells
+Foam::vtk::vtuCells::vtuCells
 (
     const polyMesh& mesh,
     const contentType output,
     const bool decompose
 )
 :
-    foamVtkCells(output, decompose)
+    vtuCells(output, decompose)
 {
     reset(mesh);
 }
 
 
-Foam::foamVtkCells::foamVtkCells
+Foam::vtk::vtuCells::vtuCells
 (
-    const foamVtkOutput::outputOptions outOpts,
+    const vtk::outputOptions outOpts,
     const bool decompose
 )
 :
-    foamVtkCells
+    vtuCells
     (
         (outOpts.legacy() ? contentType::LEGACY : contentType::XML),
         decompose
@@ -74,14 +74,14 @@ Foam::foamVtkCells::foamVtkCells
 {}
 
 
-Foam::foamVtkCells::foamVtkCells
+Foam::vtk::vtuCells::vtuCells
 (
     const polyMesh& mesh,
-    const foamVtkOutput::outputOptions outOpts,
+    const vtk::outputOptions outOpts,
     const bool decompose
 )
 :
-    foamVtkCells(outOpts, decompose)
+    vtuCells(outOpts, decompose)
 {
     reset(mesh);
 }
@@ -89,15 +89,15 @@ Foam::foamVtkCells::foamVtkCells
 
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
 
-Foam::foamVtkCells::~foamVtkCells()
+Foam::vtk::vtuCells::~vtuCells()
 {}
 
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-void Foam::foamVtkCells::clear()
+void Foam::vtk::vtuCells::clear()
 {
-    foamVtuSizing::clear();
+    vtuSizing::clear();
     cellTypes_.clear();
     vertLabels_.clear();
     vertOffset_.clear();
@@ -108,15 +108,15 @@ void Foam::foamVtkCells::clear()
 }
 
 
-void Foam::foamVtkCells::reset(const polyMesh& mesh)
+void Foam::vtk::vtuCells::reset(const polyMesh& mesh)
 {
-    foamVtuSizing::reset(mesh, decomposeRequest_);
+    vtuSizing::reset(mesh, decomposeRequest_);
 
     cellTypes_.setSize(nFieldCells());
-    vertLabels_.setSize(slotSize(output_, slotType::CELLS));
-    vertOffset_.setSize(slotSize(output_, slotType::CELLS_OFFSETS));
-    faceLabels_.setSize(slotSize(output_, slotType::FACES));
-    faceOffset_.setSize(slotSize(output_, slotType::FACES_OFFSETS));
+    vertLabels_.setSize(sizeOf(output_, slotType::CELLS));
+    vertOffset_.setSize(sizeOf(output_, slotType::CELLS_OFFSETS));
+    faceLabels_.setSize(sizeOf(output_, slotType::FACES));
+    faceOffset_.setSize(sizeOf(output_, slotType::FACES_OFFSETS));
 
     switch (output_)
     {
@@ -157,7 +157,7 @@ void Foam::foamVtkCells::reset(const polyMesh& mesh)
 }
 
 
-void Foam::foamVtkCells::reset
+void Foam::vtk::vtuCells::reset
 (
     const polyMesh& mesh,
     const enum contentType output,
@@ -171,13 +171,13 @@ void Foam::foamVtkCells::reset
 }
 
 
-void Foam::foamVtkCells::renumberCells(const UList<label>& mapping)
+void Foam::vtk::vtuCells::renumberCells(const UList<label>& mapping)
 {
     maps_.renumberCells(mapping);
 }
 
 
-void Foam::foamVtkCells::renumberPoints(const UList<label>& mapping)
+void Foam::vtk::vtuCells::renumberPoints(const UList<label>& mapping)
 {
     maps_.renumberPoints(mapping);
 }
diff --git a/src/conversion/vtk/part/foamVtkCells.H b/src/conversion/vtk/part/foamVtuCells.H
similarity index 90%
rename from src/conversion/vtk/part/foamVtkCells.H
rename to src/conversion/vtk/part/foamVtuCells.H
index 5ad70cda51..6c4c71c524 100644
--- a/src/conversion/vtk/part/foamVtkCells.H
+++ b/src/conversion/vtk/part/foamVtuCells.H
@@ -22,7 +22,7 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
-    Foam::foamVtkCells
+    Foam::vtk::vtuCells
 
 Description
     A deep-copy description of an OpenFOAM volume mesh in data structures
@@ -36,20 +36,20 @@ Description
     related to the xml format, but not entirely.
 
 SeeAlso
-    Foam::foamVtuSizing
+    Foam::vtk::vtuSizing
 
 SourceFiles
-    foamVtkCells.C
-    foamVtkCellsI.H
+    foamVtuCells.C
+    foamVtuCellsI.H
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef foamVtkCells_H
-#define foamVtkCells_H
+#ifndef foamVtuCells_H
+#define foamVtuCells_H
 
+#include "foamVtkCore.H"
 #include "foamVtkMeshMaps.H"
 #include "foamVtuSizing.H"
-#include "foamVtkCore.H"
 #include "DynamicList.H"
 #include "labelList.H"
 
@@ -61,22 +61,20 @@ namespace Foam
 // Forward declaration of classes
 class polyMesh;
 
-namespace foamVtkOutput
+namespace vtk
 {
+// Forward declaration of classes
     class outputOptions;
-}
-
 
 /*---------------------------------------------------------------------------*\
-                        Class foamVtkCells Declaration
+                     Class Foam::vtk::vtuCells Declaration
 \*---------------------------------------------------------------------------*/
 
-class foamVtkCells
+class vtuCells
 :
-    public fileFormats::foamVtkCore,
-    public foamVtuSizing
+    public vtuSizing
 {
-    // Private data
+    // Private Member Data
 
       // Requested output types
 
@@ -111,10 +109,10 @@ class foamVtkCells
     // Private Member Functions
 
         //- Disallow default bitwise copy construct
-        foamVtkCells(const foamVtkCells&) = delete;
+        vtuCells(const vtuCells&) = delete;
 
         //- Disallow default bitwise assignment
-        void operator=(const foamVtkCells&) = delete;
+        void operator=(const vtuCells&) = delete;
 
 
 public:
@@ -123,7 +121,7 @@ public:
 
         //- Construct from components.
         //  Optionally with polyhedral decomposition.
-        foamVtkCells
+        vtuCells
         (
             const enum contentType output = contentType::XML,
             const bool decompose = false
@@ -131,7 +129,7 @@ public:
 
         //- Construct from components and create the output information
         //  immediately
-        foamVtkCells
+        vtuCells
         (
             const polyMesh& mesh,
             const enum contentType output = contentType::XML,
@@ -140,24 +138,24 @@ public:
 
         //- Construct from components.
         //  Optionally with polyhedral decomposition.
-        foamVtkCells
+        vtuCells
         (
-            const foamVtkOutput::outputOptions outOpts,
+            const vtk::outputOptions outOpts,
             const bool decompose = false
         );
 
         //- Construct from components and create the output information
         //  immediately
-        foamVtkCells
+        vtuCells
         (
             const polyMesh& mesh,
-            const foamVtkOutput::outputOptions outOpts,
+            const vtk::outputOptions outOpts,
             const bool decompose = false
         );
 
 
     //- Destructor
-    ~foamVtkCells();
+    ~vtuCells();
 
 
     // Member Functions
@@ -230,11 +228,12 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+} // End namespace vtk
 } // End namespace Foam
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#include "foamVtkCellsI.H"
+#include "foamVtuCellsI.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/conversion/vtk/part/foamVtkCellsI.H b/src/conversion/vtk/part/foamVtuCellsI.H
similarity index 77%
rename from src/conversion/vtk/part/foamVtkCellsI.H
rename to src/conversion/vtk/part/foamVtuCellsI.H
index abf935fc80..49cbe18717 100644
--- a/src/conversion/vtk/part/foamVtkCellsI.H
+++ b/src/conversion/vtk/part/foamVtuCellsI.H
@@ -23,79 +23,80 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "foamVtkCells.H"
+#include "foamVtuCells.H"
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 
-inline enum Foam::foamVtkCells::contentType Foam::foamVtkCells::content() const
+inline enum Foam::vtk::vtuCells::contentType
+Foam::vtk::vtuCells::content() const
 {
     return output_;
 }
 
 
-inline bool Foam::foamVtkCells::decomposeRequested() const
+inline bool Foam::vtk::vtuCells::decomposeRequested() const
 {
     return decomposeRequest_;
 }
 
 
-inline bool Foam::foamVtkCells::empty() const
+inline bool Foam::vtk::vtuCells::empty() const
 {
     return cellTypes_.empty();
 }
 
 
-inline Foam::label Foam::foamVtkCells::size() const
+inline Foam::label Foam::vtk::vtuCells::size() const
 {
     return cellTypes_.size();
 }
 
 
 inline const Foam::List<uint8_t>&
-Foam::foamVtkCells::cellTypes() const
+Foam::vtk::vtuCells::cellTypes() const
 {
     return cellTypes_;
 }
 
 
 inline const Foam::labelList&
-Foam::foamVtkCells::vertLabels() const
+Foam::vtk::vtuCells::vertLabels() const
 {
     return vertLabels_;
 }
 
 
 inline const Foam::labelList&
-Foam::foamVtkCells::vertOffsets() const
+Foam::vtk::vtuCells::vertOffsets() const
 {
     return vertOffset_;
 }
 
 
 inline const Foam::labelList&
-Foam::foamVtkCells::faceLabels() const
+Foam::vtk::vtuCells::faceLabels() const
 {
     return faceLabels_;
 }
 
 
 inline const Foam::labelList&
-Foam::foamVtkCells::faceOffsets() const
+Foam::vtk::vtuCells::faceOffsets() const
 {
     return faceOffset_;
 }
 
 
 inline const Foam::labelList&
-Foam::foamVtkCells::addPointCellLabels() const
+Foam::vtk::vtuCells::addPointCellLabels() const
 {
     return maps_.additionalIds();
 }
 
 
 inline const Foam::labelList&
-Foam::foamVtkCells::cellMap() const
+Foam::vtk::vtuCells::cellMap() const
 {
     return maps_.cellMap();
 }
diff --git a/src/conversion/vtk/part/foamVtuSizing.C b/src/conversion/vtk/part/foamVtuSizing.C
index a9f0451f02..15c4429380 100644
--- a/src/conversion/vtk/part/foamVtuSizing.C
+++ b/src/conversion/vtk/part/foamVtuSizing.C
@@ -29,12 +29,12 @@ License
 #include "cellShape.H"
 #include "cellModeller.H"
 
-// only used in this file
+// Only used in this file
 #include "foamVtuSizingTemplates.C"
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
-void Foam::foamVtuSizing::presizeMaps(foamVtkMeshMaps& maps) const
+void Foam::vtk::vtuSizing::presizeMaps(foamVtkMeshMaps& maps) const
 {
     maps.cellMap().setSize(this->nFieldCells());
     maps.additionalIds().setSize(this->nAddPoints());
@@ -43,7 +43,7 @@ void Foam::foamVtuSizing::presizeMaps(foamVtkMeshMaps& maps) const
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-Foam::foamVtuSizing::foamVtuSizing
+Foam::vtk::vtuSizing::vtuSizing
 (
     const polyMesh& mesh,
     const bool decompose
@@ -54,7 +54,7 @@ Foam::foamVtuSizing::foamVtuSizing
 }
 
 
-Foam::foamVtuSizing::foamVtuSizing()
+Foam::vtk::vtuSizing::vtuSizing()
 {
     clear();
 }
@@ -62,13 +62,13 @@ Foam::foamVtuSizing::foamVtuSizing()
 
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
 
-Foam::foamVtuSizing::~foamVtuSizing()
+Foam::vtk::vtuSizing::~vtuSizing()
 {}
 
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-void Foam::foamVtuSizing::reset
+void Foam::vtk::vtuSizing::reset
 (
     const polyMesh& mesh,
     const bool decompose
@@ -160,7 +160,7 @@ void Foam::foamVtuSizing::reset
 
             const labelList& cFaces = mesh.cells()[celli];
 
-            // Unique node ids used (only needed for XML)
+            // Unique node ids used (XML/INTERNAL, not needed for LEGACY)
             hashUniqId.clear();
 
             // Face stream sizing:
@@ -189,7 +189,7 @@ void Foam::foamVtuSizing::reset
 }
 
 
-Foam::label Foam::foamVtuSizing::slotSize
+Foam::label Foam::vtk::vtuSizing::sizeOf
 (
     const enum contentType output,
     const enum slotType slot
@@ -269,7 +269,7 @@ Foam::label Foam::foamVtuSizing::slotSize
 }
 
 
-void Foam::foamVtuSizing::populateLegacy
+void Foam::vtk::vtuSizing::populateLegacy
 (
     const polyMesh& mesh,
     UList<uint8_t>& cellTypes,
@@ -298,7 +298,7 @@ void Foam::foamVtuSizing::populateLegacy
 }
 
 
-void Foam::foamVtuSizing::populateXml
+void Foam::vtk::vtuSizing::populateXml
 (
     const polyMesh& mesh,
     UList<uint8_t>& cellTypes,
@@ -327,7 +327,7 @@ void Foam::foamVtuSizing::populateXml
 }
 
 
-void Foam::foamVtuSizing::populateInternal
+void Foam::vtk::vtuSizing::populateInternal
 (
     const polyMesh& mesh,
     UList<uint8_t>& cellTypes,
@@ -356,7 +356,7 @@ void Foam::foamVtuSizing::populateInternal
 }
 
 
-void Foam::foamVtuSizing::populateInternal
+void Foam::vtk::vtuSizing::populateInternal
 (
     const polyMesh& mesh,
     UList<uint8_t>& cellTypes,
@@ -385,7 +385,7 @@ void Foam::foamVtuSizing::populateInternal
 }
 
 
-void Foam::foamVtuSizing::populateInternal
+void Foam::vtk::vtuSizing::populateInternal
 (
     const polyMesh& mesh,
     UList<uint8_t>& cellTypes,
@@ -414,7 +414,7 @@ void Foam::foamVtuSizing::populateInternal
 }
 
 
-void Foam::foamVtuSizing::populateInternal
+void Foam::vtk::vtuSizing::populateInternal
 (
     const polyMesh& mesh,
     UList<uint8_t>& cellTypes,
@@ -442,7 +442,7 @@ void Foam::foamVtuSizing::populateInternal
 }
 
 
-void Foam::foamVtuSizing::populateInternal
+void Foam::vtk::vtuSizing::populateInternal
 (
     const polyMesh& mesh,
     UList<uint8_t>& cellTypes,
@@ -470,7 +470,7 @@ void Foam::foamVtuSizing::populateInternal
 }
 
 
-void Foam::foamVtuSizing::populateInternal
+void Foam::vtk::vtuSizing::populateInternal
 (
     const polyMesh& mesh,
     UList<uint8_t>& cellTypes,
@@ -498,7 +498,7 @@ void Foam::foamVtuSizing::populateInternal
 }
 
 
-void Foam::foamVtuSizing::clear()
+void Foam::vtk::vtuSizing::clear()
 {
     decompose_   = false;
     nCells_      = 0;
@@ -515,7 +515,7 @@ void Foam::foamVtuSizing::clear()
 }
 
 
-void Foam::foamVtuSizing::info(Ostream& os) const
+void Foam::vtk::vtuSizing::info(Ostream& os) const
 {
     os  << "nFieldCells:" << nFieldCells();
     if (nAddCells_)
@@ -551,7 +551,7 @@ void Foam::foamVtuSizing::info(Ostream& os) const
 
 // * * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * //
 
-bool Foam::foamVtuSizing::operator==(const foamVtuSizing& rhs) const
+bool Foam::vtk::vtuSizing::operator==(const vtuSizing& rhs) const
 {
     return
     (
@@ -569,7 +569,7 @@ bool Foam::foamVtuSizing::operator==(const foamVtuSizing& rhs) const
 }
 
 
-bool Foam::foamVtuSizing::operator!=(const foamVtuSizing& rhs) const
+bool Foam::vtk::vtuSizing::operator!=(const vtuSizing& rhs) const
 {
     return !operator==(rhs);
 }
diff --git a/src/conversion/vtk/part/foamVtuSizing.H b/src/conversion/vtk/part/foamVtuSizing.H
index a5b1d98be6..a14209807a 100644
--- a/src/conversion/vtk/part/foamVtuSizing.H
+++ b/src/conversion/vtk/part/foamVtuSizing.H
@@ -22,7 +22,7 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
-    Foam::foamVtuSizing
+    Foam::vtk::vtuSizing
 
 Description
     Sizing descriptions and routines for transcribing an OpenFOAM volume mesh
@@ -97,32 +97,36 @@ namespace Foam
 // Forward declaration of classes
 class polyMesh;
 
+namespace vtk
+{
+
 /*---------------------------------------------------------------------------*\
-                        Class foamVtuSizing Declaration
+                    Class Foam::vtk::vtuSizing Declaration
 \*---------------------------------------------------------------------------*/
 
-class foamVtuSizing
+class vtuSizing
 {
 public:
 
     // Public data
 
-        //- Types of content that the storage may represent
-        enum contentType
-        {
-            LEGACY,     //!< Legacy VTK content
-            XML,        //!< XML (VTU) content
-            INTERNAL    //!< Internal vtkUnstructuredGrid content
-        };
+    //- Types of content that the storage may represent
+    enum contentType
+    {
+        LEGACY,     //!< Legacy VTK content
+        XML,        //!< XML (VTU) content
+        INTERNAL    //!< Internal vtkUnstructuredGrid content
+    };
+
+    //- The possible storage 'slots' that can be used
+    enum slotType
+    {
+        CELLS,         //!< Cell connectivity (ALL)
+        CELLS_OFFSETS, //!< End-offsets (XML) or locations (INTERNAL) for cells
+        FACES,         //!< Face-stream (XML, INTERNAL)
+        FACES_OFFSETS  //!< End-offsets (XML) or locations (INTERNAL) for faces
+    };
 
-        //- The storage 'slots' required
-        enum slotType
-        {
-            CELLS,         //!< Cell connectivity (ALL)
-            CELLS_OFFSETS, //!< Begin (XML) or end (INTERNAL) offsets into cells
-            FACES,         //!< Face-stream (XML, INTERNAL)
-            FACES_OFFSETS  //!< Begin (XML) or end (INTERNAL) offsets into faces
-        };
 
 private:
 
@@ -173,7 +177,7 @@ private:
         static void populateArrays
         (
             const polyMesh& mesh,
-            const foamVtuSizing& sizing,
+            const vtk::vtuSizing& sizing,
             UList<uint8_t>& cellTypes,
             UList<LabelType>& vertLabels,
             UList<LabelType>& vertOffset,
@@ -191,15 +195,15 @@ public:
     // Constructors
 
         //- Construct null.
-        foamVtuSizing();
+        vtuSizing();
 
         //- Construct sizes by analyzing the mesh,
         //  optionally with polyhedral decomposition.
-        foamVtuSizing(const polyMesh& mesh, const bool decompose=false);
+        vtuSizing(const polyMesh& mesh, const bool decompose=false);
 
 
     //- Destructor
-    ~foamVtuSizing();
+    ~vtuSizing();
 
 
     // Member Functions
@@ -257,7 +261,7 @@ public:
       // Derived sizes
 
         //- Return the required size for the storage slot
-        label slotSize
+        label sizeOf
         (
             const enum contentType output,
             const enum slotType slot
@@ -385,16 +389,17 @@ public:
       // Member Operators
 
         //- Test equality
-        bool operator==(const foamVtuSizing& rhs) const;
+        bool operator==(const vtuSizing& rhs) const;
 
         //- Test inequality
-        bool operator!=(const foamVtuSizing& rhs) const;
+        bool operator!=(const vtuSizing& rhs) const;
 
 };
 
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+} // End namespace vtk
 } // End namespace Foam
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/conversion/vtk/part/foamVtuSizingI.H b/src/conversion/vtk/part/foamVtuSizingI.H
index 25bee49abc..6777ce7e7a 100644
--- a/src/conversion/vtk/part/foamVtuSizingI.H
+++ b/src/conversion/vtk/part/foamVtuSizingI.H
@@ -27,108 +27,108 @@ License
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-inline bool Foam::foamVtuSizing::decompose() const
+inline bool Foam::vtk::vtuSizing::decompose() const
 {
     return decompose_;
 }
 
 
-inline Foam::label Foam::foamVtuSizing::nCells() const
+inline Foam::label Foam::vtk::vtuSizing::nCells() const
 {
     return nCells_;
 }
 
 
-inline Foam::label Foam::foamVtuSizing::nPoints() const
+inline Foam::label Foam::vtk::vtuSizing::nPoints() const
 {
     return nPoints_;
 }
 
 
-inline Foam::label Foam::foamVtuSizing::nVertLabels() const
+inline Foam::label Foam::vtk::vtuSizing::nVertLabels() const
 {
     return nVertLabels_;
 }
 
 
-inline Foam::label Foam::foamVtuSizing::nFaceLabels() const
+inline Foam::label Foam::vtk::vtuSizing::nFaceLabels() const
 {
     return nFaceLabels_;
 }
 
 
-inline Foam::label Foam::foamVtuSizing::nCellsPoly() const
+inline Foam::label Foam::vtk::vtuSizing::nCellsPoly() const
 {
     return nCellsPoly_;
 }
 
 
-inline Foam::label Foam::foamVtuSizing::nVertPoly() const
+inline Foam::label Foam::vtk::vtuSizing::nVertPoly() const
 {
     return nVertPoly_;
 }
 
 
-inline Foam::label Foam::foamVtuSizing::nAddCells() const
+inline Foam::label Foam::vtk::vtuSizing::nAddCells() const
 {
     return nAddCells_;
 }
 
 
-inline Foam::label Foam::foamVtuSizing::nAddPoints() const
+inline Foam::label Foam::vtk::vtuSizing::nAddPoints() const
 {
     return nAddPoints_;
 }
 
 
-inline Foam::label Foam::foamVtuSizing::nAddVerts() const
+inline Foam::label Foam::vtk::vtuSizing::nAddVerts() const
 {
     return nAddVerts_;
 }
 
 
-inline Foam::label Foam::foamVtuSizing::nFieldCells() const
+inline Foam::label Foam::vtk::vtuSizing::nFieldCells() const
 {
     return nCells_ + nAddCells_;
 }
 
 
-inline Foam::label Foam::foamVtuSizing::nFieldPoints() const
+inline Foam::label Foam::vtk::vtuSizing::nFieldPoints() const
 {
     return nPoints_ + nAddPoints_;
 }
 
 
-inline Foam::label Foam::foamVtuSizing::sizeLegacy() const
+inline Foam::label Foam::vtk::vtuSizing::sizeLegacy() const
 {
-    return slotSize(contentType::LEGACY, slotType::CELLS);
+    return sizeOf(contentType::LEGACY, slotType::CELLS);
 }
 
 
-inline Foam::label Foam::foamVtuSizing::sizeLegacy
+inline Foam::label Foam::vtk::vtuSizing::sizeLegacy
 (
     const enum slotType slot
 ) const
 {
-    return slotSize(contentType::LEGACY, slot);
+    return sizeOf(contentType::LEGACY, slot);
 }
 
 
-inline Foam::label Foam::foamVtuSizing::sizeXml
+inline Foam::label Foam::vtk::vtuSizing::sizeXml
 (
     const enum slotType slot
 ) const
 {
-    return slotSize(contentType::XML, slot);
+    return sizeOf(contentType::XML, slot);
 }
 
 
-inline Foam::label Foam::foamVtuSizing::sizeInternal
+inline Foam::label Foam::vtk::vtuSizing::sizeInternal
 (
     const enum slotType slot
 ) const
 {
-    return slotSize(contentType::INTERNAL, slot);
+    return sizeOf(contentType::INTERNAL, slot);
 }
 
 
diff --git a/src/conversion/vtk/part/foamVtuSizingTemplates.C b/src/conversion/vtk/part/foamVtuSizingTemplates.C
index a30f88de85..0c4ffe44ac 100644
--- a/src/conversion/vtk/part/foamVtuSizingTemplates.C
+++ b/src/conversion/vtk/part/foamVtuSizingTemplates.C
@@ -32,10 +32,10 @@ License
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
 template<class LabelType, class LabelType2>
-void Foam::foamVtuSizing::populateArrays
+void Foam::vtk::vtuSizing::populateArrays
 (
     const polyMesh& mesh,
-    const foamVtuSizing& sizing,
+    const vtk::vtuSizing& sizing,
     UList<uint8_t>& cellTypes,
     UList<LabelType>& vertLabels,
     UList<LabelType>& vertOffset,
@@ -46,8 +46,6 @@ void Foam::foamVtuSizing::populateArrays
     UList<LabelType2>& addPointsIds
 )
 {
-    using vtkTypes = fileFormats::foamVtkCore::vtkTypes;
-
     // STAGE 1: Verify storage sizes
 
     if (cellTypes.size() != sizing.nFieldCells())
@@ -275,7 +273,7 @@ void Foam::foamVtuSizing::populateArrays
 
         if (model == tet)
         {
-            cellTypes[celli] = vtkTypes::VTK_TETRA;
+            cellTypes[celli] = vtk::cellType::VTK_TETRA;
             if (vertOffset.size())
             {
                 vertOffset[celli] = shape.size();
@@ -292,7 +290,7 @@ void Foam::foamVtuSizing::populateArrays
         }
         else if (model == pyr)
         {
-            cellTypes[celli] = vtkTypes::VTK_PYRAMID;
+            cellTypes[celli] = vtk::cellType::VTK_PYRAMID;
             if (vertOffset.size())
             {
                 vertOffset[celli] = shape.size();
@@ -309,7 +307,7 @@ void Foam::foamVtuSizing::populateArrays
         }
         else if (model == hex)
         {
-            cellTypes[celli] = vtkTypes::VTK_HEXAHEDRON;
+            cellTypes[celli] = vtk::cellType::VTK_HEXAHEDRON;
             if (vertOffset.size())
             {
                 vertOffset[celli] = shape.size();
@@ -326,7 +324,7 @@ void Foam::foamVtuSizing::populateArrays
         }
         else if (model == prism)
         {
-            cellTypes[celli] = vtkTypes::VTK_WEDGE;
+            cellTypes[celli] = vtk::cellType::VTK_WEDGE;
             if (vertOffset.size())
             {
                 vertOffset[celli] = shape.size();
@@ -347,7 +345,7 @@ void Foam::foamVtuSizing::populateArrays
         else if (model == tetWedge && sizing.decompose())
         {
             // Treat as squeezed prism
-            cellTypes[celli] = vtkTypes::VTK_WEDGE;
+            cellTypes[celli] = vtk::cellType::VTK_WEDGE;
             if (vertOffset.size())
             {
                 vertOffset[celli] = 6;
@@ -367,7 +365,7 @@ void Foam::foamVtuSizing::populateArrays
         else if (model == wedge && sizing.decompose())
         {
             // Treat as squeezed hex
-            cellTypes[celli] = vtkTypes::VTK_HEXAHEDRON;
+            cellTypes[celli] = vtk::cellType::VTK_HEXAHEDRON;
             if (vertOffset.size())
             {
                 vertOffset[celli] = 8;
@@ -443,7 +441,7 @@ void Foam::foamVtuSizing::populateArrays
                     }
                     cellMap[celLoc] = celli;
 
-                    cellTypes[celLoc] = vtkTypes::VTK_PYRAMID;
+                    cellTypes[celLoc] = vtk::cellType::VTK_PYRAMID;
                     if (vertOffset.size())
                     {
                         vertOffset[celLoc] = nShapePoints;
@@ -494,7 +492,7 @@ void Foam::foamVtuSizing::populateArrays
                     }
                     cellMap[celLoc] = celli;
 
-                    cellTypes[celLoc] = vtkTypes::VTK_TETRA;
+                    cellTypes[celLoc] = vtk::cellType::VTK_TETRA;
                     if (vertOffset.size())
                     {
                         vertOffset[celLoc] = nShapePoints;
@@ -504,7 +502,7 @@ void Foam::foamVtuSizing::populateArrays
                         vertLabels[vrtLoc++] = nShapePoints;
                     }
 
-                    cellTypes[celLoc] = vtkTypes::VTK_TETRA;
+                    cellTypes[celLoc] = vtk::cellType::VTK_TETRA;
 
                     // See note above about the orientation.
                     if (isOwner)
@@ -530,7 +528,7 @@ void Foam::foamVtuSizing::populateArrays
 
             // face-stream
             //   [nFaces, nFace0Pts, id1, id2, ..., nFace1Pts, id1, id2, ...]
-            cellTypes[celli] = vtkTypes::VTK_POLYHEDRON;
+            cellTypes[celli] = vtk::cellType::VTK_POLYHEDRON;
             const labelList& cFaces = mesh.cells()[celli];
 
             const label startLabel = faceIndexer;
diff --git a/src/fileFormats/Make/files b/src/fileFormats/Make/files
index c2024986a3..1dd9b3469a 100644
--- a/src/fileFormats/Make/files
+++ b/src/fileFormats/Make/files
@@ -14,7 +14,8 @@ stl/STLCore.C
 stl/STLReader.C
 stl/STLReaderASCII.L
 
-vtk/foamVtkCore.C
+vtk/core/foamVtkCore.C
+vtk/core/foamVtkPTraits.C
 vtk/format/foamVtkFormatter.C
 vtk/format/foamVtkAsciiFormatter.C
 vtk/format/foamVtkBase64Formatter.C
@@ -26,8 +27,6 @@ vtk/format/foamVtkLegacyRawFormatter.C
 vtk/output/foamVtkOutput.C
 vtk/output/foamVtkOutputOptions.C
 vtk/read/vtkUnstructuredReader.C
-vtk/type/foamVtkFileEnums.C
-vtk/type/foamVtkPTraits.C
 
 coordSet/coordSet.C
 
diff --git a/src/fileFormats/vtk/core/foamVtkCore.C b/src/fileFormats/vtk/core/foamVtkCore.C
new file mode 100644
index 0000000000..be0cffa033
--- /dev/null
+++ b/src/fileFormats/vtk/core/foamVtkCore.C
@@ -0,0 +1,71 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2017 OpenCFD Ltd.
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "foamVtkCore.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+const Foam::Enum<Foam::vtk::fileTag> Foam::vtk::fileTagNames
+{
+    { fileTag::VTK_FILE, "VTKFile" },
+    { fileTag::DATA_ARRAY, "DataArray" },
+    { fileTag::PIECE, "Piece" },
+    { fileTag::DATA_SET, "DataSet" },
+    { fileTag::POINTS, "Points" },
+    { fileTag::CELLS, "Cells" },
+    { fileTag::POLYS, "Polys" },
+    { fileTag::VERTS, "Verts" },
+    { fileTag::LINES, "Lines" },
+    { fileTag::CELL_DATA, "CellData" },
+    { fileTag::POINT_DATA, "PointData" },
+    { fileTag::POLY_DATA, "PolyData" },
+    { fileTag::UNSTRUCTURED_GRID, "UnstructuredGrid" },
+};
+
+
+const Foam::Enum<Foam::vtk::fileAttr> Foam::vtk::fileAttrNames
+{
+    { fileAttr::OFFSET, "offset" },
+    { fileAttr::NUMBER_OF_COMPONENTS, "NumberOfComponents" },
+    { fileAttr::NUMBER_OF_POINTS, "NumberOfPoints" },
+    { fileAttr::NUMBER_OF_CELLS, "NumberOfCells" },
+    { fileAttr::NUMBER_OF_POLYS, "NumberOfPolys" },
+    { fileAttr::NUMBER_OF_VERTS, "NumberOfVerts" },
+    { fileAttr::NUMBER_OF_LINES, "NumberOfLines" },
+};
+
+
+const Foam::Enum<Foam::vtk::dataArrayAttr> Foam::vtk::dataArrayAttrNames
+{
+    { dataArrayAttr::POINTS, "Points" },
+    { dataArrayAttr::OFFSETS, "offsets" },
+    { dataArrayAttr::CONNECTIVITY, "connectivity" },
+    { dataArrayAttr::TYPES, "types" },
+    { dataArrayAttr::FACES, "faces" },
+    { dataArrayAttr::FACEOFFSETS, "faceoffsets" },
+};
+
+
+// ************************************************************************* //
diff --git a/src/fileFormats/vtk/core/foamVtkCore.H b/src/fileFormats/vtk/core/foamVtkCore.H
new file mode 100644
index 0000000000..d209d60c93
--- /dev/null
+++ b/src/fileFormats/vtk/core/foamVtkCore.H
@@ -0,0 +1,163 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2016-2017 OpenCFD Ltd.
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Namespace
+    Foam::vtk
+
+Description
+    Namespace for handling VTK input/output.
+
+SourceFiles
+    foamVtkCore.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef foamVtkCore_H
+#define foamVtkCore_H
+
+#include "Enum.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace vtk
+{
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+  // Enumerations
+
+    //- The context when outputting a VTK file (XML or legacy).
+    enum OutputContext
+    {
+        INLINE,     //<! Generate header and inline data
+        HEADER,     //<! Generate header only
+        APPEND      //<! Generate append-data
+    };
+
+
+    //- The output format type for file contents.
+    //  Upper bits for output type, lower bits for the format itself.
+    enum class formatType
+    {
+        /** XML inline ASCII, using the asciiFormatter */
+        INLINE_ASCII  = 0,
+        /** XML inline base64, using the base64Formatter */
+        INLINE_BASE64 = 0x01,
+        /** XML append base64, using the appendBase64Formatter */
+        APPEND_BASE64 = 0x11,
+        /** XML append raw binary, using the appendRawFormatter */
+        APPEND_BINARY = 0x12,
+        /** Legacy ASCII, using the legacyAsciiFormatter */
+        LEGACY_ASCII  = 0x20,
+        /** Legacy raw binary, using the legacyRawFormatter */
+        LEGACY_BINARY = 0x22,
+    };
+
+    //- Equivalent to enumeration in "vtkCellType.h"
+    enum cellType
+    {
+        VTK_EMPTY_CELL       = 0,
+        VTK_VERTEX           = 1,
+        VTK_POLY_VERTEX      = 2,
+        VTK_LINE             = 3,
+        VTK_POLY_LINE        = 4,
+        VTK_TRIANGLE         = 5,
+        VTK_TRIANGLE_STRIP   = 6,
+        VTK_POLYGON          = 7,
+        VTK_PIXEL            = 8,
+        VTK_QUAD             = 9,
+        VTK_TETRA            = 10,
+        VTK_VOXEL            = 11,
+        VTK_HEXAHEDRON       = 12,
+        VTK_WEDGE            = 13,
+        VTK_PYRAMID          = 14,
+        VTK_PENTAGONAL_PRISM = 15,
+        VTK_HEXAGONAL_PRISM  = 16,
+        VTK_POLYHEDRON       = 42
+    };
+
+
+    //- Some common XML tags for vtk files
+    enum class fileTag
+    {
+        VTK_FILE,               //!< "VTKFile"
+        DATA_ARRAY,             //!< "DataArray"
+        PIECE,                  //!< "Piece"
+        DATA_SET,               //!< "DataSet"
+        POINTS,                 //!< "Points"
+        CELLS,                  //!< "Cells"
+        POLYS,                  //!< "Polys"
+        VERTS,                  //!< "Verts"
+        LINES,                  //!< "Lines"
+        CELL_DATA,              //!< "CellData"
+        POINT_DATA,             //!< "PointData"
+        POLY_DATA,              //!< "PolyData"
+        UNSTRUCTURED_GRID,      //!< "UnstructuredGrid"
+    };
+
+    //- Strings corresponding to the vtk xml tags
+    extern const Foam::Enum<fileTag> fileTagNames;
+
+    //- Some common XML attributes for vtk files
+    enum class fileAttr
+    {
+        OFFSET,                 //!< "offset"
+        NUMBER_OF_COMPONENTS,   //!< "NumberOfComponents"
+        NUMBER_OF_POINTS,       //!< "NumberOfPoints"
+        NUMBER_OF_CELLS,        //!< "NumberOfCells"
+        NUMBER_OF_POLYS,        //!< "NumberOfPolys"
+        NUMBER_OF_VERTS,        //!< "NumberOfVerts"
+        NUMBER_OF_LINES,        //!< "NumberOfLines"
+    };
+
+    //- Strings corresponding to the vtk xml attributes
+    extern const Foam::Enum<fileAttr> fileAttrNames;
+
+    //- Some common names for XML data arrays
+    enum class dataArrayAttr
+    {
+        POINTS,                 //!< "Points"
+        OFFSETS,                //!< "offsets"
+        CONNECTIVITY,           //!< "connectivity"
+        TYPES,                  //!< "types"
+        FACES,                  //!< "faces"
+        FACEOFFSETS,            //!< "faceoffsets"
+    };
+
+    //- Strings corresponding to the vtk xml attributes
+    extern const Foam::Enum<dataArrayAttr> dataArrayAttrNames;
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace vtk
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/fileFormats/vtk/type/foamVtkPTraits.C b/src/fileFormats/vtk/core/foamVtkPTraits.C
similarity index 77%
rename from src/fileFormats/vtk/type/foamVtkPTraits.C
rename to src/fileFormats/vtk/core/foamVtkPTraits.C
index feb5e909c2..0cc5ca04e4 100644
--- a/src/fileFormats/vtk/type/foamVtkPTraits.C
+++ b/src/fileFormats/vtk/core/foamVtkPTraits.C
@@ -30,40 +30,40 @@ License
 
 template<>
 const char* const
-Foam::foamVtkPTraits<uint8_t>::typeName = "UInt8";
+Foam::vtkPTraits<uint8_t>::typeName = "UInt8";
 
 template<>
 const char * const
-Foam::foamVtkPTraits<int32_t>::typeName = "Int32";
+Foam::vtkPTraits<int32_t>::typeName = "Int32";
 
 template<>
 const char * const
-Foam::foamVtkPTraits<uint32_t>::typeName = "UInt32";
+Foam::vtkPTraits<uint32_t>::typeName = "UInt32";
 
 template<>
 const char * const
-Foam::foamVtkPTraits<int64_t>::typeName = "Int64";
+Foam::vtkPTraits<int64_t>::typeName = "Int64";
 
 template<>
 const char * const
-Foam::foamVtkPTraits<uint64_t>::typeName = "UInt64";
+Foam::vtkPTraits<uint64_t>::typeName = "UInt64";
 
 template<>
 const char * const
-Foam::foamVtkPTraits<float>::typeName = "Float32";
+Foam::vtkPTraits<float>::typeName = "Float32";
 
 template<>
 const char * const
-Foam::foamVtkPTraits<double>::typeName = "Float64";
+Foam::vtkPTraits<double>::typeName = "Float64";
 
 #ifdef WM_LITTLE_ENDIAN
 template<>
 const char* const
-Foam::foamVtkPTraits<Foam::endian>::typeName = "LittleEndian";
+Foam::vtkPTraits<Foam::endian>::typeName = "LittleEndian";
 #else
 template<>
 const char* const
-Foam::foamVtkPTraits<Foam::endian>::typeName = "BigEndian";
+Foam::vtkPTraits<Foam::endian>::typeName = "BigEndian";
 #endif
 
 
diff --git a/src/fileFormats/vtk/type/foamVtkPTraits.H b/src/fileFormats/vtk/core/foamVtkPTraits.H
similarity index 76%
rename from src/fileFormats/vtk/type/foamVtkPTraits.H
rename to src/fileFormats/vtk/core/foamVtkPTraits.H
index ff77c03b8d..ac8df06646 100644
--- a/src/fileFormats/vtk/type/foamVtkPTraits.H
+++ b/src/fileFormats/vtk/core/foamVtkPTraits.H
@@ -22,7 +22,7 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
-    Foam::foamVtkPTraits
+    Foam::vtkPTraits
 
 Description
     Names for VTK primitive types.
@@ -43,11 +43,11 @@ namespace Foam
 class endian;
 
 /*---------------------------------------------------------------------------*\
-                         Class foamVtkPTraits Declaration
+                         Class vtkPTraits Declaration
 \*---------------------------------------------------------------------------*/
 
 template<class PrimitiveType>
-class foamVtkPTraits
+class vtkPTraits
 {
 public:
 
@@ -58,28 +58,28 @@ public:
 
 
 template<>
-const char* const foamVtkPTraits<uint8_t>::typeName;  // UInt8
+const char* const vtkPTraits<uint8_t>::typeName;  // UInt8
 
 template<>
-const char* const foamVtkPTraits<int32_t>::typeName;  // Int32
+const char* const vtkPTraits<int32_t>::typeName;  // Int32
 
 template<>
-const char* const foamVtkPTraits<uint32_t>::typeName; // UInt32
+const char* const vtkPTraits<uint32_t>::typeName; // UInt32
 
 template<>
-const char* const foamVtkPTraits<int64_t>::typeName;  // Int64
+const char* const vtkPTraits<int64_t>::typeName;  // Int64
 
 template<>
-const char* const foamVtkPTraits<uint64_t>::typeName; // UInt64
+const char* const vtkPTraits<uint64_t>::typeName; // UInt64
 
 template<>
-const char* const foamVtkPTraits<float>::typeName;    // Float32
+const char* const vtkPTraits<float>::typeName;    // Float32
 
 template<>
-const char* const foamVtkPTraits<double>::typeName;   // Float64
+const char* const vtkPTraits<double>::typeName;   // Float64
 
 template<>
-const char* const foamVtkPTraits<Foam::endian>::typeName; // (Big|Little)Endian
+const char* const vtkPTraits<Foam::endian>::typeName; // (Big|Little)Endian
 
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/fileFormats/vtk/foamVtkCore.C b/src/fileFormats/vtk/foamVtkCore.C
deleted file mode 100644
index 2450c02b7b..0000000000
--- a/src/fileFormats/vtk/foamVtkCore.C
+++ /dev/null
@@ -1,54 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2016 OpenCFD Ltd.
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-License
-    This file is part of OpenFOAM.
-
-    OpenFOAM is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "foamVtkCore.H"
-
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
-
-Foam::fileFormats::foamVtkCore::foamVtkCore()
-{}
-
-
-// * * * * * * * * * * *  Protected Member Functions * * * * * * * * * * * * //
-
-
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-
-/*
-Foam::fileName Foam::fileFormats::foamVtkCore::vtkFileName
-(
-    const fileName& base,
-    const enum fileExt ext
-)
-{
-    return base + '.' + fileExtensions_[ext];
-}
-*/
-
-
-// ************************************************************************* //
diff --git a/src/fileFormats/vtk/foamVtkCore.H b/src/fileFormats/vtk/foamVtkCore.H
deleted file mode 100644
index adcdc00871..0000000000
--- a/src/fileFormats/vtk/foamVtkCore.H
+++ /dev/null
@@ -1,109 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2016 OpenCFD Ltd.
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-License
-    This file is part of OpenFOAM.
-
-    OpenFOAM is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
-
-Class
-    Foam::foamVtkCore
-
-Description
-    Core routines for dealing with VTK files.
-
-SourceFiles
-    foamVtkCore.C
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef foamVtkCore_H
-#define foamVtkCore_H
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-namespace fileFormats
-{
-
-/*---------------------------------------------------------------------------*\
-                  Class fileFormats::foamVtkCore Declaration
-\*---------------------------------------------------------------------------*/
-
-class foamVtkCore
-{
-public:
-
-    // Public Data, Declarations
-
-        //- The context when outputting a VTK file (XML or legacy).
-        enum OutputContext
-        {
-            INLINE,     //<! Generate header and inline data
-            HEADER,     //<! Generate header only
-            APPEND      //<! Generate append-data
-        };
-
-
-        //- Equivalent to enumeration in "vtkCellType.h"
-        enum vtkTypes
-        {
-            VTK_EMPTY_CELL       = 0,
-            VTK_VERTEX           = 1,
-            VTK_POLY_VERTEX      = 2,
-            VTK_LINE             = 3,
-            VTK_POLY_LINE        = 4,
-            VTK_TRIANGLE         = 5,
-            VTK_TRIANGLE_STRIP   = 6,
-            VTK_POLYGON          = 7,
-            VTK_PIXEL            = 8,
-            VTK_QUAD             = 9,
-            VTK_TETRA            = 10,
-            VTK_VOXEL            = 11,
-            VTK_HEXAHEDRON       = 12,
-            VTK_WEDGE            = 13,
-            VTK_PYRAMID          = 14,
-            VTK_PENTAGONAL_PRISM = 15,
-            VTK_HEXAGONAL_PRISM  = 16,
-            VTK_POLYHEDRON       = 42
-        };
-
-
-protected:
-
-    // Constructors
-
-        //- Construct null
-        foamVtkCore();
-
-};
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace fileFormats
-
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/fileFormats/vtk/format/foamVtkAppendBase64Formatter.C b/src/fileFormats/vtk/format/foamVtkAppendBase64Formatter.C
index f54edcabea..5527e5c35a 100644
--- a/src/fileFormats/vtk/format/foamVtkAppendBase64Formatter.C
+++ b/src/fileFormats/vtk/format/foamVtkAppendBase64Formatter.C
@@ -28,15 +28,15 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-const char* Foam::foamVtkOutput::appendBase64Formatter::name_ = "append";
+const char* Foam::vtk::appendBase64Formatter::name_ = "append";
 
-const Foam::foamVtkOutput::outputOptions
-Foam::foamVtkOutput::appendBase64Formatter::opts_(formatType::APPEND_BASE64);
+const Foam::vtk::outputOptions
+Foam::vtk::appendBase64Formatter::opts_(formatType::APPEND_BASE64);
 
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-Foam::foamVtkOutput::appendBase64Formatter::appendBase64Formatter
+Foam::vtk::appendBase64Formatter::appendBase64Formatter
 (
     std::ostream& os
 )
@@ -47,7 +47,7 @@ Foam::foamVtkOutput::appendBase64Formatter::appendBase64Formatter
 
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
 
-Foam::foamVtkOutput::appendBase64Formatter::~appendBase64Formatter()
+Foam::vtk::appendBase64Formatter::~appendBase64Formatter()
 {
     base64Layer::close();
 }
@@ -55,14 +55,14 @@ Foam::foamVtkOutput::appendBase64Formatter::~appendBase64Formatter()
 
 // * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
 
-const Foam::foamVtkOutput::outputOptions&
-Foam::foamVtkOutput::appendBase64Formatter::opts() const
+const Foam::vtk::outputOptions&
+Foam::vtk::appendBase64Formatter::opts() const
 {
     return opts_;
 }
 
 
-const char* Foam::foamVtkOutput::appendBase64Formatter::name() const
+const char* Foam::vtk::appendBase64Formatter::name() const
 {
     return name_;
 }
diff --git a/src/fileFormats/vtk/format/foamVtkAppendBase64Formatter.H b/src/fileFormats/vtk/format/foamVtkAppendBase64Formatter.H
index 0a0dff20e3..2df2e8ce50 100644
--- a/src/fileFormats/vtk/format/foamVtkAppendBase64Formatter.H
+++ b/src/fileFormats/vtk/format/foamVtkAppendBase64Formatter.H
@@ -22,7 +22,7 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
-    Foam::foamVtkOutput::appendBase64Formatter
+    Foam::vtk::appendBase64Formatter
 
 Description
     Appended base-64 encoded binary output.
@@ -42,7 +42,7 @@ SourceFiles
 
 namespace Foam
 {
-namespace foamVtkOutput
+namespace vtk
 {
 
 /*---------------------------------------------------------------------------*\
@@ -92,7 +92,7 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-} // End namespace foamVtkOutput
+} // End namespace vtk
 } // End namespace Foam
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/fileFormats/vtk/format/foamVtkAppendRawFormatter.C b/src/fileFormats/vtk/format/foamVtkAppendRawFormatter.C
index 40effed271..0ff9e5c4cd 100644
--- a/src/fileFormats/vtk/format/foamVtkAppendRawFormatter.C
+++ b/src/fileFormats/vtk/format/foamVtkAppendRawFormatter.C
@@ -28,16 +28,16 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-const char* Foam::foamVtkOutput::appendRawFormatter::name_     = "append";
-const char* Foam::foamVtkOutput::appendRawFormatter::encoding_ = "raw";
+const char* Foam::vtk::appendRawFormatter::name_     = "append";
+const char* Foam::vtk::appendRawFormatter::encoding_ = "raw";
 
-const Foam::foamVtkOutput::outputOptions
-Foam::foamVtkOutput::appendRawFormatter::opts_(formatType::APPEND_BINARY);
+const Foam::vtk::outputOptions
+Foam::vtk::appendRawFormatter::opts_(formatType::APPEND_BINARY);
 
 
 // * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * //
 
-void Foam::foamVtkOutput::appendRawFormatter::write
+void Foam::vtk::appendRawFormatter::write
 (
     const char* s,
     std::streamsize n
@@ -49,7 +49,7 @@ void Foam::foamVtkOutput::appendRawFormatter::write
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-Foam::foamVtkOutput::appendRawFormatter::appendRawFormatter(std::ostream& os)
+Foam::vtk::appendRawFormatter::appendRawFormatter(std::ostream& os)
 :
     formatter(os)
 {}
@@ -57,58 +57,58 @@ Foam::foamVtkOutput::appendRawFormatter::appendRawFormatter(std::ostream& os)
 
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
 
-Foam::foamVtkOutput::appendRawFormatter::~appendRawFormatter()
+Foam::vtk::appendRawFormatter::~appendRawFormatter()
 {}
 
 
 // * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
 
-const Foam::foamVtkOutput::outputOptions&
-Foam::foamVtkOutput::appendRawFormatter::opts() const
+const Foam::vtk::outputOptions&
+Foam::vtk::appendRawFormatter::opts() const
 {
     return opts_;
 }
 
 
-const char* Foam::foamVtkOutput::appendRawFormatter::name() const
+const char* Foam::vtk::appendRawFormatter::name() const
 {
     return name_;
 }
 
 
-const char* Foam::foamVtkOutput::appendRawFormatter::encoding() const
+const char* Foam::vtk::appendRawFormatter::encoding() const
 {
     return encoding_;
 }
 
 
-void Foam::foamVtkOutput::appendRawFormatter::writeSize(const uint64_t nBytes)
+void Foam::vtk::appendRawFormatter::writeSize(const uint64_t nBytes)
 {
     write(reinterpret_cast<const char*>(&nBytes), sizeof(uint64_t));
 }
 
 
-void Foam::foamVtkOutput::appendRawFormatter::write(const uint8_t val)
+void Foam::vtk::appendRawFormatter::write(const uint8_t val)
 {
     write(reinterpret_cast<const char*>(&val), sizeof(uint8_t));
 }
 
 
-void Foam::foamVtkOutput::appendRawFormatter::write(const label val)
+void Foam::vtk::appendRawFormatter::write(const label val)
 {
     // std::cerr<<"label:" << sizeof(val) << "=" << val << '\n';
     write(reinterpret_cast<const char*>(&val), sizeof(label));
 }
 
 
-void Foam::foamVtkOutput::appendRawFormatter::write(const float val)
+void Foam::vtk::appendRawFormatter::write(const float val)
 {
     // std::cerr<<"float:" << sizeof(val) << "=" << val << '\n';
     write(reinterpret_cast<const char*>(&val), sizeof(float));
 }
 
 
-void Foam::foamVtkOutput::appendRawFormatter::write(const double val)
+void Foam::vtk::appendRawFormatter::write(const double val)
 {
     // std::cerr<<"double as float=" << val << '\n';
     float copy(val);
@@ -116,7 +116,7 @@ void Foam::foamVtkOutput::appendRawFormatter::write(const double val)
 }
 
 
-void Foam::foamVtkOutput::appendRawFormatter::flush()
+void Foam::vtk::appendRawFormatter::flush()
 {/*nop*/}
 
 
diff --git a/src/fileFormats/vtk/format/foamVtkAppendRawFormatter.H b/src/fileFormats/vtk/format/foamVtkAppendRawFormatter.H
index aca458b05e..758fa8d93d 100644
--- a/src/fileFormats/vtk/format/foamVtkAppendRawFormatter.H
+++ b/src/fileFormats/vtk/format/foamVtkAppendRawFormatter.H
@@ -22,7 +22,7 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
-    Foam::foamVtkOutput::appendRawFormatter
+    Foam::vtk::appendRawFormatter
 
 Description
     Appended raw binary output.
@@ -41,7 +41,7 @@ SourceFiles
 
 namespace Foam
 {
-namespace foamVtkOutput
+namespace vtk
 {
 
 /*---------------------------------------------------------------------------*\
@@ -115,7 +115,7 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-} // End namespace foamVtkOutput
+} // End namespace vtk
 } // End namespace Foam
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/fileFormats/vtk/format/foamVtkAsciiFormatter.C b/src/fileFormats/vtk/format/foamVtkAsciiFormatter.C
index 7b05aafaf8..1bcbc3b84c 100644
--- a/src/fileFormats/vtk/format/foamVtkAsciiFormatter.C
+++ b/src/fileFormats/vtk/format/foamVtkAsciiFormatter.C
@@ -28,15 +28,15 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-const char* Foam::foamVtkOutput::asciiFormatter::name_ = "ascii";
+const char* Foam::vtk::asciiFormatter::name_ = "ascii";
 
-const Foam::foamVtkOutput::outputOptions
-Foam::foamVtkOutput::asciiFormatter::opts_(formatType::INLINE_ASCII);
+const Foam::vtk::outputOptions
+Foam::vtk::asciiFormatter::opts_(formatType::INLINE_ASCII);
 
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
-inline void Foam::foamVtkOutput::asciiFormatter::next()
+inline void Foam::vtk::asciiFormatter::next()
 {
     if (pos_ == 6)
     {
@@ -51,7 +51,7 @@ inline void Foam::foamVtkOutput::asciiFormatter::next()
 }
 
 
-inline void Foam::foamVtkOutput::asciiFormatter::done()
+inline void Foam::vtk::asciiFormatter::done()
 {
     if (pos_)
     {
@@ -63,14 +63,14 @@ inline void Foam::foamVtkOutput::asciiFormatter::done()
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-Foam::foamVtkOutput::asciiFormatter::asciiFormatter(std::ostream& os)
+Foam::vtk::asciiFormatter::asciiFormatter(std::ostream& os)
 :
     formatter(os),
     pos_(0)
 {}
 
 
-Foam::foamVtkOutput::asciiFormatter::asciiFormatter
+Foam::vtk::asciiFormatter::asciiFormatter
 (
     std::ostream& os,
     unsigned precision
@@ -85,7 +85,7 @@ Foam::foamVtkOutput::asciiFormatter::asciiFormatter
 
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
 
-Foam::foamVtkOutput::asciiFormatter::~asciiFormatter()
+Foam::vtk::asciiFormatter::~asciiFormatter()
 {
     done();
 }
@@ -93,65 +93,65 @@ Foam::foamVtkOutput::asciiFormatter::~asciiFormatter()
 
 // * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
 
-const Foam::foamVtkOutput::outputOptions&
-Foam::foamVtkOutput::asciiFormatter::opts() const
+const Foam::vtk::outputOptions&
+Foam::vtk::asciiFormatter::opts() const
 {
     return opts_;
 }
 
 
-const char* Foam::foamVtkOutput::asciiFormatter::name() const
+const char* Foam::vtk::asciiFormatter::name() const
 {
     return name_;
 }
 
 
-const char* Foam::foamVtkOutput::asciiFormatter::encoding() const
+const char* Foam::vtk::asciiFormatter::encoding() const
 {
     return name_;
 }
 
 
-void Foam::foamVtkOutput::asciiFormatter::writeSize(const uint64_t ignored)
+void Foam::vtk::asciiFormatter::writeSize(const uint64_t ignored)
 {/*nop*/}
 
 
-void Foam::foamVtkOutput::asciiFormatter::write(const uint8_t val)
+void Foam::vtk::asciiFormatter::write(const uint8_t val)
 {
     next();
     os()<< int(val);
 }
 
 
-void Foam::foamVtkOutput::asciiFormatter::write(const label val)
+void Foam::vtk::asciiFormatter::write(const label val)
 {
     next();
     os()<< val;
 }
 
 
-void Foam::foamVtkOutput::asciiFormatter::write(const float val)
+void Foam::vtk::asciiFormatter::write(const float val)
 {
     next();
     os()<< val;
 }
 
 
-void Foam::foamVtkOutput::asciiFormatter::write(const double val)
+void Foam::vtk::asciiFormatter::write(const double val)
 {
     next();
     os()<< float(val);
 }
 
 
-void Foam::foamVtkOutput::asciiFormatter::flush()
+void Foam::vtk::asciiFormatter::flush()
 {
     done();
 }
 
 
 std::size_t
-Foam::foamVtkOutput::asciiFormatter::encodedLength(std::size_t ignored) const
+Foam::vtk::asciiFormatter::encodedLength(std::size_t ignored) const
 {
     return 0;
 }
diff --git a/src/fileFormats/vtk/format/foamVtkAsciiFormatter.H b/src/fileFormats/vtk/format/foamVtkAsciiFormatter.H
index c50281779e..bbedc55e91 100644
--- a/src/fileFormats/vtk/format/foamVtkAsciiFormatter.H
+++ b/src/fileFormats/vtk/format/foamVtkAsciiFormatter.H
@@ -22,7 +22,7 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
-    Foam::foamVtkOutput::asciiFormatter
+    Foam::vtk::asciiFormatter
 
 Description
     Inline ASCII output.
@@ -43,7 +43,7 @@ SourceFiles
 
 namespace Foam
 {
-namespace foamVtkOutput
+namespace vtk
 {
 
 /*---------------------------------------------------------------------------*\
@@ -125,7 +125,7 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-} // End namespace foamVtkOutput
+} // End namespace vtk
 } // End namespace Foam
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/fileFormats/vtk/format/foamVtkBase64Formatter.C b/src/fileFormats/vtk/format/foamVtkBase64Formatter.C
index a4ebc925fe..3e8d86be95 100644
--- a/src/fileFormats/vtk/format/foamVtkBase64Formatter.C
+++ b/src/fileFormats/vtk/format/foamVtkBase64Formatter.C
@@ -28,15 +28,15 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-const char* Foam::foamVtkOutput::base64Formatter::name_ = "binary";
+const char* Foam::vtk::base64Formatter::name_ = "binary";
 
-const Foam::foamVtkOutput::outputOptions
-Foam::foamVtkOutput::base64Formatter::opts_(formatType::INLINE_BASE64);
+const Foam::vtk::outputOptions
+Foam::vtk::base64Formatter::opts_(formatType::INLINE_BASE64);
 
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-Foam::foamVtkOutput::base64Formatter::base64Formatter(std::ostream& os)
+Foam::vtk::base64Formatter::base64Formatter(std::ostream& os)
 :
     foamVtkBase64Layer(os)
 {}
@@ -44,7 +44,7 @@ Foam::foamVtkOutput::base64Formatter::base64Formatter(std::ostream& os)
 
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
 
-Foam::foamVtkOutput::base64Formatter::~base64Formatter()
+Foam::vtk::base64Formatter::~base64Formatter()
 {
     if (base64Layer::close())
     {
@@ -55,20 +55,20 @@ Foam::foamVtkOutput::base64Formatter::~base64Formatter()
 
 // * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
 
-const Foam::foamVtkOutput::outputOptions&
-Foam::foamVtkOutput::base64Formatter::opts() const
+const Foam::vtk::outputOptions&
+Foam::vtk::base64Formatter::opts() const
 {
     return opts_;
 }
 
 
-const char* Foam::foamVtkOutput::base64Formatter::name() const
+const char* Foam::vtk::base64Formatter::name() const
 {
     return name_;
 }
 
 
-void Foam::foamVtkOutput::base64Formatter::flush()
+void Foam::vtk::base64Formatter::flush()
 {
     if (base64Layer::close())
     {
diff --git a/src/fileFormats/vtk/format/foamVtkBase64Formatter.H b/src/fileFormats/vtk/format/foamVtkBase64Formatter.H
index edf64797ed..df27f23087 100644
--- a/src/fileFormats/vtk/format/foamVtkBase64Formatter.H
+++ b/src/fileFormats/vtk/format/foamVtkBase64Formatter.H
@@ -22,7 +22,7 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
-    Foam::foamVtkOutput::base64Formatter
+    Foam::vtk::base64Formatter
 
 Description
     Inline base-64 encoded binary output.
@@ -40,7 +40,7 @@ Description
 
 namespace Foam
 {
-namespace foamVtkOutput
+namespace vtk
 {
 
 /*---------------------------------------------------------------------------*\
@@ -95,7 +95,7 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-} // End namespace foamVtkOutput
+} // End namespace vtk
 } // End namespace Foam
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/fileFormats/vtk/format/foamVtkBase64Layer.C b/src/fileFormats/vtk/format/foamVtkBase64Layer.C
index 32d2d81642..500a8dce9c 100644
--- a/src/fileFormats/vtk/format/foamVtkBase64Layer.C
+++ b/src/fileFormats/vtk/format/foamVtkBase64Layer.C
@@ -27,12 +27,12 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-const char* Foam::foamVtkOutput::foamVtkBase64Layer::encoding_ = "base64";
+const char* Foam::vtk::foamVtkBase64Layer::encoding_ = "base64";
 
 
 // * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * //
 
-void Foam::foamVtkOutput::foamVtkBase64Layer::write
+void Foam::vtk::foamVtkBase64Layer::write
 (
     const char* s,
     std::streamsize n
@@ -44,7 +44,7 @@ void Foam::foamVtkOutput::foamVtkBase64Layer::write
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-Foam::foamVtkOutput::foamVtkBase64Layer::foamVtkBase64Layer(std::ostream& os)
+Foam::vtk::foamVtkBase64Layer::foamVtkBase64Layer(std::ostream& os)
 :
     formatter(os),
     base64Layer(os)
@@ -53,7 +53,7 @@ Foam::foamVtkOutput::foamVtkBase64Layer::foamVtkBase64Layer(std::ostream& os)
 
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
 
-Foam::foamVtkOutput::foamVtkBase64Layer::~foamVtkBase64Layer()
+Foam::vtk::foamVtkBase64Layer::~foamVtkBase64Layer()
 {
     base64Layer::close();
 }
@@ -61,39 +61,39 @@ Foam::foamVtkOutput::foamVtkBase64Layer::~foamVtkBase64Layer()
 
 // * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
 
-const char* Foam::foamVtkOutput::foamVtkBase64Layer::encoding() const
+const char* Foam::vtk::foamVtkBase64Layer::encoding() const
 {
     return encoding_;
 }
 
 
-void Foam::foamVtkOutput::foamVtkBase64Layer::writeSize(const uint64_t nBytes)
+void Foam::vtk::foamVtkBase64Layer::writeSize(const uint64_t nBytes)
 {
     write(reinterpret_cast<const char*>(&nBytes), sizeof(uint64_t));
 }
 
 
-void Foam::foamVtkOutput::foamVtkBase64Layer::write(const uint8_t val)
+void Foam::vtk::foamVtkBase64Layer::write(const uint8_t val)
 {
     base64Layer::add(val);
 }
 
 
-void Foam::foamVtkOutput::foamVtkBase64Layer::write(const label val)
+void Foam::vtk::foamVtkBase64Layer::write(const label val)
 {
     // std::cerr<<"label:" << sizeof(val) << "=" << val << '\n';
     write(reinterpret_cast<const char*>(&val), sizeof(label));
 }
 
 
-void Foam::foamVtkOutput::foamVtkBase64Layer::write(const float val)
+void Foam::vtk::foamVtkBase64Layer::write(const float val)
 {
     // std::cerr<<"float:" << sizeof(val) << "=" << val << '\n';
     write(reinterpret_cast<const char*>(&val), sizeof(float));
 }
 
 
-void Foam::foamVtkOutput::foamVtkBase64Layer::write(const double val)
+void Foam::vtk::foamVtkBase64Layer::write(const double val)
 {
     // std::cerr<<"double as float=" << val << '\n';
     float copy(val);
@@ -101,13 +101,13 @@ void Foam::foamVtkOutput::foamVtkBase64Layer::write(const double val)
 }
 
 
-void Foam::foamVtkOutput::foamVtkBase64Layer::flush()
+void Foam::vtk::foamVtkBase64Layer::flush()
 {
     base64Layer::close();
 }
 
 
-std::size_t Foam::foamVtkOutput::foamVtkBase64Layer::encodedLength
+std::size_t Foam::vtk::foamVtkBase64Layer::encodedLength
 (
     std::size_t n
 ) const
diff --git a/src/fileFormats/vtk/format/foamVtkBase64Layer.H b/src/fileFormats/vtk/format/foamVtkBase64Layer.H
index 09b978017b..6bfa3652d4 100644
--- a/src/fileFormats/vtk/format/foamVtkBase64Layer.H
+++ b/src/fileFormats/vtk/format/foamVtkBase64Layer.H
@@ -22,7 +22,7 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
-    Foam::foamVtkOutput::foamVtkBase64Layer
+    Foam::vtk::foamVtkBase64Layer
 
 Description
     Base-64 encoded output layer - normally only used indirectly by formatters.
@@ -39,7 +39,7 @@ Description
 
 namespace Foam
 {
-namespace foamVtkOutput
+namespace vtk
 {
 
 /*---------------------------------------------------------------------------*\
@@ -108,7 +108,7 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-} // End namespace foamVtkOutput
+} // End namespace vtk
 } // End namespace Foam
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/fileFormats/vtk/format/foamVtkFormatter.C b/src/fileFormats/vtk/format/foamVtkFormatter.C
index 0c2ce22574..2bb49322d3 100644
--- a/src/fileFormats/vtk/format/foamVtkFormatter.C
+++ b/src/fileFormats/vtk/format/foamVtkFormatter.C
@@ -26,19 +26,19 @@ License
 
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
 
-Foam::foamVtkOutput::formatter::~formatter()
+Foam::vtk::formatter::~formatter()
 {}
 
 
 // * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
 
-std::size_t Foam::foamVtkOutput::formatter::encodedLength(std::size_t n) const
+std::size_t Foam::vtk::formatter::encodedLength(std::size_t n) const
 {
     return n;
 }
 
 
-void Foam::foamVtkOutput::formatter::indent()
+void Foam::vtk::formatter::indent()
 {
     label n = xmlTags_.size() * 2;
     while (n--)
@@ -48,8 +48,8 @@ void Foam::foamVtkOutput::formatter::indent()
 }
 
 
-Foam::foamVtkOutput::formatter&
-Foam::foamVtkOutput::formatter::xmlHeader()
+Foam::vtk::formatter&
+Foam::vtk::formatter::xmlHeader()
 {
     if (inTag_)
     {
@@ -64,8 +64,8 @@ Foam::foamVtkOutput::formatter::xmlHeader()
 }
 
 
-Foam::foamVtkOutput::formatter&
-Foam::foamVtkOutput::formatter::xmlComment(const std::string& comment)
+Foam::vtk::formatter&
+Foam::vtk::formatter::xmlComment(const std::string& comment)
 {
     if (inTag_)
     {
@@ -81,8 +81,8 @@ Foam::foamVtkOutput::formatter::xmlComment(const std::string& comment)
 }
 
 
-Foam::foamVtkOutput::formatter&
-Foam::foamVtkOutput::formatter::openTag(const word& tagName)
+Foam::vtk::formatter&
+Foam::vtk::formatter::openTag(const word& tagName)
 {
     if (inTag_)
     {
@@ -102,8 +102,8 @@ Foam::foamVtkOutput::formatter::openTag(const word& tagName)
 }
 
 
-Foam::foamVtkOutput::formatter&
-Foam::foamVtkOutput::formatter::closeTag(const bool isEmpty)
+Foam::vtk::formatter&
+Foam::vtk::formatter::closeTag(const bool isEmpty)
 {
     if (!inTag_)
     {
@@ -126,8 +126,8 @@ Foam::foamVtkOutput::formatter::closeTag(const bool isEmpty)
 }
 
 
-Foam::foamVtkOutput::formatter&
-Foam::foamVtkOutput::formatter::endTag(const word& tagName)
+Foam::vtk::formatter&
+Foam::vtk::formatter::endTag(const word& tagName)
 {
     const word curr = xmlTags_.pop();
     indent();
@@ -140,11 +140,11 @@ Foam::foamVtkOutput::formatter::endTag(const word& tagName)
             << endl;
     }
 
-    // verify inTag_
+    // verify expected end tag
     if (!tagName.empty() && tagName != curr)
     {
         WarningInFunction
-            << "expected to end xml-tag '" << tagName
+            << "expecting to end xml-tag '" << tagName
             << "' but found '" << curr << "' instead"
             << endl;
     }
@@ -157,19 +157,19 @@ Foam::foamVtkOutput::formatter::endTag(const word& tagName)
 }
 
 
-Foam::foamVtkOutput::formatter&
-Foam::foamVtkOutput::formatter::beginVTKFile
+Foam::vtk::formatter&
+Foam::vtk::formatter::beginVTKFile
 (
     const word& contentType,
     const word& contentVersion,
     const bool leaveOpen
 )
 {
-    openTag(vtkFileTag::VTK_FILE);
+    openTag(vtk::fileTag::VTK_FILE);
     xmlAttr("type",        contentType);
     xmlAttr("version",     contentVersion);
-    xmlAttr("byte_order",  foamVtkPTraits<Foam::endian>::typeName);
-    xmlAttr("header_type", foamVtkPTraits<headerType>::typeName);
+    xmlAttr("byte_order",  vtkPTraits<Foam::endian>::typeName);
+    xmlAttr("header_type", vtkPTraits<headerType>::typeName);
     closeTag();
 
     openTag(contentType);
@@ -182,8 +182,15 @@ Foam::foamVtkOutput::formatter::beginVTKFile
 }
 
 
-Foam::foamVtkOutput::formatter&
-Foam::foamVtkOutput::formatter::beginAppendedData()
+Foam::vtk::formatter&
+Foam::vtk::formatter::endVTKFile()
+{
+    return endTag(vtk::fileTag::VTK_FILE);
+}
+
+
+Foam::vtk::formatter&
+Foam::vtk::formatter::beginAppendedData()
 {
     openTag("AppendedData");
     xmlAttr("encoding", encoding());
@@ -194,8 +201,17 @@ Foam::foamVtkOutput::formatter::beginAppendedData()
 }
 
 
-Foam::foamVtkOutput::formatter&
-Foam::foamVtkOutput::formatter::xmlAttr
+Foam::vtk::formatter&
+Foam::vtk::formatter::endAppendedData()
+{
+    flush();     // flush any pending encoded content
+    os_ << nl;   // ensure clear separation from content.
+    return endTag("AppendedData");
+}
+
+
+Foam::vtk::formatter&
+Foam::vtk::formatter::xmlAttr
 (
     const word& k,
     const std::string& v,
diff --git a/src/fileFormats/vtk/format/foamVtkFormatter.H b/src/fileFormats/vtk/format/foamVtkFormatter.H
index 40c7ed98d5..abe6e2972d 100644
--- a/src/fileFormats/vtk/format/foamVtkFormatter.H
+++ b/src/fileFormats/vtk/format/foamVtkFormatter.H
@@ -22,12 +22,12 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
-    Foam::foamVtkOutput::formatter
+    Foam::vtk::formatter
 
 Description
     Abstract class for a VTK output stream formatter.
 
-    Includes very simple support for writing XML tags.
+    Includes very simple support for writing XML elements.
 
 SourceFiles
     foamVtkFormatter.C
@@ -44,9 +44,8 @@ SourceFiles
 #include "word.H"
 #include "UList.H"
 #include "LIFOStack.H"
-#include "foamVtkFileEnums.H"
+#include "foamVtkCore.H"
 #include "foamVtkPTraits.H"
-#include "foamVtkOutputTypes.H"
 
 #include <iostream>
 
@@ -54,7 +53,7 @@ SourceFiles
 
 namespace Foam
 {
-namespace foamVtkOutput
+namespace vtk
 {
 
 class outputOptions;
@@ -77,13 +76,15 @@ class formatter
         mutable bool inTag_;
 
 
-        //- Write XML attribute
+    // Private Member Functions
+
+        //- Write XML attribute key/value pair
         template<class Type>
-        formatter& xmlAttribute
+        formatter& writeAttribute
         (
             const word& k,
             const Type& v,
-            const char quote
+            const char quote = '\''
         );
 
 
@@ -161,7 +162,7 @@ public:
 
         //- Open XML tag
         //  \return formatter for chaining
-        inline formatter& openTag(const vtkFileTag& tagEnum);
+        inline formatter& openTag(const vtk::fileTag& tagEnum);
 
         //- Close XML tag, optional as an empty container.
         //  Always adds a trailing newline.
@@ -176,7 +177,7 @@ public:
         //- End XML tag with sanity check
         //  Always adds a trailing newline.
         //  \return formatter for chaining
-        inline formatter& endTag(const vtkFileTag& tagEnum);
+        inline formatter& endTag(const vtk::fileTag& tagEnum);
 
         //- Write XML tag without any attributes. Combines openTag/closeTag.
         //  \return formatter for chaining
@@ -184,7 +185,7 @@ public:
 
         //- Write XML tag without any attributes. Combines openTag/closeTag.
         //  \return formatter for chaining
-        inline formatter& tag(const vtkFileTag& tagEnum);
+        inline formatter& tag(const vtk::fileTag& tagEnum);
 
         //- Add a "VTKFile" XML tag for contentType, followed by a tag for
         //  the contentType itself. Optionally leave the contentType tag
@@ -203,7 +204,7 @@ public:
         //  \return formatter for chaining
         inline formatter& beginVTKFile
         (
-            const vtkFileTag& contentType,
+            const vtk::fileTag& contentType,
             const word& contentVersion,
             const bool leaveOpen = false
         );
@@ -222,7 +223,7 @@ public:
         //- Open "DataArray" XML tag
         //  \return formatter for chaining
         template<class Type, int nComp=0>
-        formatter& openDataArray(const vtkFileTag& tagEnum);
+        formatter& openDataArray(const vtk::dataArrayAttr& attrEnum);
 
 
         //- Insert a single "PDataArray" XML entry tag.
@@ -238,11 +239,11 @@ public:
 
         //- End "AppendedData" XML tag
         //  \return formatter for chaining
-        inline formatter& endAppendedData();
+        formatter& endAppendedData();
 
         //- End "VTKFile" XML tag
         //  \return formatter for chaining
-        inline formatter& endVTKFile();
+        formatter& endVTKFile();
 
 
         //- Write XML attribute
@@ -290,35 +291,39 @@ public:
             const char quote = '\''
         );
 
-
-    // Member Operators
+        //- Write XML attribute
+        //  \return formatter for chaining
+        inline formatter& xmlAttr
+        (
+            const vtk::fileAttr& attrEnum,
+            const int32_t v,
+            const char quote = '\''
+        );
 
         //- Write XML attribute
         //  \return formatter for chaining
-        inline formatter& operator()(const word& k, const std::string& v);
+        inline formatter& xmlAttr
+        (
+            const vtk::fileAttr& attrEnum,
+            const int64_t v,
+            const char quote = '\''
+        );
 
         //- Write XML attribute
         //  \return formatter for chaining
-        inline formatter& operator()(const word& k, const int32_t v);
-
-        //- Write XML attribute
-        //  \return formatter for chaining
-        inline formatter& operator()(const word& k, const int64_t v);
-
-        //- Write XML attribute
-        //  \return formatter for chaining
-        inline formatter& operator()(const word& k, const uint64_t v);
-
-        //- Write XML attribute
-        //  \return formatter for chaining
-        inline formatter& operator()(const word& k, const scalar v);
+        inline formatter& xmlAttr
+        (
+            const vtk::fileAttr& attrEnum,
+            const uint64_t v,
+            const char quote = '\''
+        );
 
 };
 
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-} // End namespace foamVtkOutput
+} // End namespace vtk
 } // End namespace Foam
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/fileFormats/vtk/format/foamVtkFormatterI.H b/src/fileFormats/vtk/format/foamVtkFormatterI.H
index 39e1e5a013..58e050bf54 100644
--- a/src/fileFormats/vtk/format/foamVtkFormatterI.H
+++ b/src/fileFormats/vtk/format/foamVtkFormatterI.H
@@ -25,7 +25,7 @@ License
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-inline Foam::foamVtkOutput::formatter::formatter(std::ostream& os)
+inline Foam::vtk::formatter::formatter(std::ostream& os)
 :
     os_(os),
     xmlTags_(),
@@ -35,28 +35,28 @@ inline Foam::foamVtkOutput::formatter::formatter(std::ostream& os)
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-inline std::ostream& Foam::foamVtkOutput::formatter::os()
+inline std::ostream& Foam::vtk::formatter::os()
 {
     return os_;
 }
 
 
-inline Foam::foamVtkOutput::formatter&
-Foam::foamVtkOutput::formatter::openTag(const vtkFileTag& tagEnum)
+inline Foam::vtk::formatter&
+Foam::vtk::formatter::openTag(const vtk::fileTag& tagEnum)
 {
-    return openTag(vtkFileTagNames[tagEnum]);
+    return openTag(vtk::fileTagNames[tagEnum]);
 }
 
 
-inline Foam::foamVtkOutput::formatter&
-Foam::foamVtkOutput::formatter::endTag(const vtkFileTag& tagEnum)
+inline Foam::vtk::formatter&
+Foam::vtk::formatter::endTag(const vtk::fileTag& tagEnum)
 {
-    return endTag(vtkFileTagNames[tagEnum]);
+    return endTag(vtk::fileTagNames[tagEnum]);
 }
 
 
-inline Foam::foamVtkOutput::formatter&
-Foam::foamVtkOutput::formatter::tag(const word& tagName)
+inline Foam::vtk::formatter&
+Foam::vtk::formatter::tag(const word& tagName)
 {
     openTag(tagName);
     closeTag();
@@ -65,135 +65,118 @@ Foam::foamVtkOutput::formatter::tag(const word& tagName)
 }
 
 
-inline Foam::foamVtkOutput::formatter&
-Foam::foamVtkOutput::formatter::tag(const vtkFileTag& tagEnum)
+inline Foam::vtk::formatter&
+Foam::vtk::formatter::tag(const vtk::fileTag& tagEnum)
 {
-    return tag(vtkFileTagNames[tagEnum]);
+    return tag(vtk::fileTagNames[tagEnum]);
 }
 
 
-inline Foam::foamVtkOutput::formatter&
-Foam::foamVtkOutput::formatter::beginVTKFile
+inline Foam::vtk::formatter&
+Foam::vtk::formatter::beginVTKFile
 (
-    const vtkFileTag& contentType,
+    const vtk::fileTag& contentType,
     const word& contentVersion,
     const bool leaveOpen
 )
 {
     return beginVTKFile
     (
-        vtkFileTagNames[contentType],
+        vtk::fileTagNames[contentType],
         contentVersion,
         leaveOpen
     );
 }
 
 
-inline Foam::foamVtkOutput::formatter&
-Foam::foamVtkOutput::formatter::endDataArray()
+inline Foam::vtk::formatter&
+Foam::vtk::formatter::endDataArray()
 {
     return endTag("DataArray");
 }
 
 
-inline Foam::foamVtkOutput::formatter&
-Foam::foamVtkOutput::formatter::endAppendedData()
-{
-    flush();     // flush any pending encoded content
-    os_ << '\n'; // clear separation from content.
-    return endTag("AppendedData");
-}
-
-
-inline Foam::foamVtkOutput::formatter&
-Foam::foamVtkOutput::formatter::endVTKFile()
-{
-    return endTag(vtkFileTag::VTK_FILE);
-}
-
-
-inline Foam::foamVtkOutput::formatter&
-Foam::foamVtkOutput::formatter::xmlAttr
+inline Foam::vtk::formatter&
+Foam::vtk::formatter::xmlAttr
 (
     const word& k,
     const int32_t v,
     const char quote
 )
 {
-    return xmlAttribute(k, v, quote);
+    return writeAttribute(k, v, quote);
 }
 
 
-inline Foam::foamVtkOutput::formatter&
-Foam::foamVtkOutput::formatter::xmlAttr
+inline Foam::vtk::formatter&
+Foam::vtk::formatter::xmlAttr
 (
     const word& k,
     const int64_t v,
     const char quote
 )
 {
-    return xmlAttribute(k, v, quote);
+    return writeAttribute(k, v, quote);
 }
 
 
-inline Foam::foamVtkOutput::formatter&
-Foam::foamVtkOutput::formatter::xmlAttr
+inline Foam::vtk::formatter&
+Foam::vtk::formatter::xmlAttr
 (
     const word& k,
     const uint64_t v,
     const char quote
 )
 {
-    return xmlAttribute(k, v, quote);
+    return writeAttribute(k, v, quote);
 }
 
 
-inline Foam::foamVtkOutput::formatter&
-Foam::foamVtkOutput::formatter::xmlAttr
+inline Foam::vtk::formatter&
+Foam::vtk::formatter::xmlAttr
 (
     const word& k,
     const scalar v,
     const char quote
 )
 {
-    return xmlAttribute(k, v, quote);
+    return writeAttribute(k, v, quote);
 }
 
 
-// * * * * * * * * * * * * * * Member Operators * * * * * * * * * * * * * * //
-
-inline Foam::foamVtkOutput::formatter&
-Foam::foamVtkOutput::formatter::operator()(const word& k, const std::string& v)
+inline Foam::vtk::formatter&
+Foam::vtk::formatter::xmlAttr
+(
+    const vtk::fileAttr& attrEnum,
+    const int32_t v,
+    const char quote
+)
 {
-    return xmlAttr(k, v);
+    return xmlAttr(vtk::fileAttrNames[attrEnum], v, quote);
 }
 
 
-inline Foam::foamVtkOutput::formatter&
-Foam::foamVtkOutput::formatter::operator()(const word& k, const int32_t v)
+inline Foam::vtk::formatter&
+Foam::vtk::formatter::xmlAttr
+(
+    const vtk::fileAttr& attrEnum,
+    const int64_t v,
+    const char quote
+)
 {
-    return xmlAttr(k, v);
+    return xmlAttr(vtk::fileAttrNames[attrEnum], v, quote);
 }
 
 
-inline Foam::foamVtkOutput::formatter&
-Foam::foamVtkOutput::formatter::operator()(const word& k, const int64_t v)
+inline Foam::vtk::formatter&
+Foam::vtk::formatter::xmlAttr
+(
+    const vtk::fileAttr& attrEnum,
+    const uint64_t v,
+    const char quote
+)
 {
-    return xmlAttr(k, v);
-}
-
-
-inline Foam::foamVtkOutput::formatter&
-Foam::foamVtkOutput::formatter::operator()(const word& k, const uint64_t v)
-{
-    return xmlAttr(k, v);
-}
-
-
-inline Foam::foamVtkOutput::formatter&
-Foam::foamVtkOutput::formatter::operator()(const word& k, const scalar v)
-{
-    return xmlAttr(k, v);
+    return xmlAttr(vtk::fileAttrNames[attrEnum], v, quote);
 }
 
 
diff --git a/src/fileFormats/vtk/format/foamVtkFormatterTemplates.C b/src/fileFormats/vtk/format/foamVtkFormatterTemplates.C
index 79e3b7a239..87f4f9131b 100644
--- a/src/fileFormats/vtk/format/foamVtkFormatterTemplates.C
+++ b/src/fileFormats/vtk/format/foamVtkFormatterTemplates.C
@@ -27,8 +27,8 @@ License
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 template<class Type>
-Foam::foamVtkOutput::formatter&
-Foam::foamVtkOutput::formatter::xmlAttribute
+Foam::vtk::formatter&
+Foam::vtk::formatter::writeAttribute
 (
     const word& k,
     const Type& v,
@@ -49,18 +49,18 @@ Foam::foamVtkOutput::formatter::xmlAttribute
 
 
 template<class Type, int nComp>
-Foam::foamVtkOutput::formatter&
-Foam::foamVtkOutput::formatter::openDataArray
+Foam::vtk::formatter&
+Foam::vtk::formatter::openDataArray
 (
     const word& dataName
 )
 {
     openTag("DataArray");
-    xmlAttr("type", foamVtkPTraits<Type>::typeName);
+    xmlAttr("type", vtkPTraits<Type>::typeName);
     xmlAttr("Name", dataName);
     if (nComp > 1)
     {
-        xmlAttr("NumberOfComponents", nComp);
+        xmlAttr(fileAttr::NUMBER_OF_COMPONENTS, nComp);
     }
     xmlAttr("format", name());
 
@@ -69,32 +69,32 @@ Foam::foamVtkOutput::formatter::openDataArray
 
 
 template<class Type, int nComp>
-Foam::foamVtkOutput::formatter&
-Foam::foamVtkOutput::formatter::openDataArray
+Foam::vtk::formatter&
+Foam::vtk::formatter::openDataArray
 (
-    const vtkFileTag& tagEnum
+    const vtk::dataArrayAttr& attrEnum
 )
 {
-    return openDataArray<Type, nComp>(vtkFileTagNames[tagEnum]);
+    return openDataArray<Type, nComp>(vtk::dataArrayAttrNames[attrEnum]);
 }
 
 
 template<class Type, int nComp>
-Foam::foamVtkOutput::formatter&
-Foam::foamVtkOutput::formatter::PDataArray
+Foam::vtk::formatter&
+Foam::vtk::formatter::PDataArray
 (
     const word& dataName
 )
 {
     openTag("PDataArray");
-    xmlAttr("type", foamVtkPTraits<Type>::typeName);
+    xmlAttr("type", vtkPTraits<Type>::typeName);
     if (dataName.size())
     {
         xmlAttr("Name", dataName);
     }
     if (nComp > 1)
     {
-        xmlAttr("NumberOfComponents", nComp);
+        xmlAttr(fileAttr::NUMBER_OF_COMPONENTS, nComp);
     }
 
     closeTag(true);
diff --git a/src/fileFormats/vtk/format/foamVtkLegacyAsciiFormatter.C b/src/fileFormats/vtk/format/foamVtkLegacyAsciiFormatter.C
index 4e31fc46af..fe8728854c 100644
--- a/src/fileFormats/vtk/format/foamVtkLegacyAsciiFormatter.C
+++ b/src/fileFormats/vtk/format/foamVtkLegacyAsciiFormatter.C
@@ -28,15 +28,15 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-const char* Foam::foamVtkOutput::legacyAsciiFormatter::legacyName_ = "ASCII";
+const char* Foam::vtk::legacyAsciiFormatter::legacyName_ = "ASCII";
 
-const Foam::foamVtkOutput::outputOptions
-Foam::foamVtkOutput::legacyAsciiFormatter::opts_(formatType::LEGACY_ASCII);
+const Foam::vtk::outputOptions
+Foam::vtk::legacyAsciiFormatter::opts_(formatType::LEGACY_ASCII);
 
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-Foam::foamVtkOutput::legacyAsciiFormatter::legacyAsciiFormatter
+Foam::vtk::legacyAsciiFormatter::legacyAsciiFormatter
 (
     std::ostream& os
 )
@@ -45,7 +45,7 @@ Foam::foamVtkOutput::legacyAsciiFormatter::legacyAsciiFormatter
 {}
 
 
-Foam::foamVtkOutput::legacyAsciiFormatter::legacyAsciiFormatter
+Foam::vtk::legacyAsciiFormatter::legacyAsciiFormatter
 (
     std::ostream& os,
     unsigned precision
@@ -57,26 +57,26 @@ Foam::foamVtkOutput::legacyAsciiFormatter::legacyAsciiFormatter
 
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
 
-Foam::foamVtkOutput::legacyAsciiFormatter::~legacyAsciiFormatter()
+Foam::vtk::legacyAsciiFormatter::~legacyAsciiFormatter()
 {}
 
 
 // * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
 
-const Foam::foamVtkOutput::outputOptions&
-Foam::foamVtkOutput::legacyAsciiFormatter::opts() const
+const Foam::vtk::outputOptions&
+Foam::vtk::legacyAsciiFormatter::opts() const
 {
     return opts_;
 }
 
 
-const char* Foam::foamVtkOutput::legacyAsciiFormatter::name() const
+const char* Foam::vtk::legacyAsciiFormatter::name() const
 {
     return legacyName_;
 }
 
 
-const char* Foam::foamVtkOutput::legacyAsciiFormatter::encoding() const
+const char* Foam::vtk::legacyAsciiFormatter::encoding() const
 {
     return legacyName_;
 }
diff --git a/src/fileFormats/vtk/format/foamVtkLegacyAsciiFormatter.H b/src/fileFormats/vtk/format/foamVtkLegacyAsciiFormatter.H
index cb764b2992..7301ef9854 100644
--- a/src/fileFormats/vtk/format/foamVtkLegacyAsciiFormatter.H
+++ b/src/fileFormats/vtk/format/foamVtkLegacyAsciiFormatter.H
@@ -22,10 +22,10 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
-    Foam::foamVtkOutput::legacyAsciiFormatter
+    Foam::vtk::legacyAsciiFormatter
 
 Description
-    Formatting as per Foam::foamVtkOutput::asciiFormatter, but with
+    Formatting as per Foam::vtk::asciiFormatter, but with
     naming for legacy output.
 
 SourceFiles
@@ -42,7 +42,7 @@ SourceFiles
 
 namespace Foam
 {
-namespace foamVtkOutput
+namespace vtk
 {
 
 /*---------------------------------------------------------------------------*\
@@ -99,7 +99,7 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-} // End namespace foamVtkOutput
+} // End namespace vtk
 } // End namespace Foam
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/fileFormats/vtk/format/foamVtkLegacyRawFormatter.C b/src/fileFormats/vtk/format/foamVtkLegacyRawFormatter.C
index b533d0c56e..28b042c195 100644
--- a/src/fileFormats/vtk/format/foamVtkLegacyRawFormatter.C
+++ b/src/fileFormats/vtk/format/foamVtkLegacyRawFormatter.C
@@ -29,15 +29,15 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-const char* Foam::foamVtkOutput::legacyRawFormatter::legacyName_ = "BINARY";
+const char* Foam::vtk::legacyRawFormatter::legacyName_ = "BINARY";
 
-const Foam::foamVtkOutput::outputOptions
-Foam::foamVtkOutput::legacyRawFormatter::opts_(formatType::LEGACY_BINARY);
+const Foam::vtk::outputOptions
+Foam::vtk::legacyRawFormatter::opts_(formatType::LEGACY_BINARY);
 
 
 // * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * //
 
-void Foam::foamVtkOutput::legacyRawFormatter::write
+void Foam::vtk::legacyRawFormatter::write
 (
     const char* s,
     std::streamsize n
@@ -49,7 +49,7 @@ void Foam::foamVtkOutput::legacyRawFormatter::write
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-Foam::foamVtkOutput::legacyRawFormatter::legacyRawFormatter
+Foam::vtk::legacyRawFormatter::legacyRawFormatter
 (
     std::ostream& os
 )
@@ -60,39 +60,39 @@ Foam::foamVtkOutput::legacyRawFormatter::legacyRawFormatter
 
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
 
-Foam::foamVtkOutput::legacyRawFormatter::~legacyRawFormatter()
+Foam::vtk::legacyRawFormatter::~legacyRawFormatter()
 {}
 
 
 // * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
 
-const Foam::foamVtkOutput::outputOptions&
-Foam::foamVtkOutput::legacyRawFormatter::opts() const
+const Foam::vtk::outputOptions&
+Foam::vtk::legacyRawFormatter::opts() const
 {
     return opts_;
 }
 
 
-const char* Foam::foamVtkOutput::legacyRawFormatter::name() const
+const char* Foam::vtk::legacyRawFormatter::name() const
 {
     return legacyName_;
 }
 
 
-const char* Foam::foamVtkOutput::legacyRawFormatter::encoding() const
+const char* Foam::vtk::legacyRawFormatter::encoding() const
 {
     return legacyName_;
 }
 
 
-void Foam::foamVtkOutput::legacyRawFormatter::writeSize
+void Foam::vtk::legacyRawFormatter::writeSize
 (
     const uint64_t ignored
 )
 {/*nop*/}
 
 
-void Foam::foamVtkOutput::legacyRawFormatter::write
+void Foam::vtk::legacyRawFormatter::write
 (
     const uint8_t val
 )
@@ -104,7 +104,7 @@ void Foam::foamVtkOutput::legacyRawFormatter::write
 }
 
 
-void Foam::foamVtkOutput::legacyRawFormatter::write
+void Foam::vtk::legacyRawFormatter::write
 (
     const label val
 )
@@ -127,7 +127,7 @@ void Foam::foamVtkOutput::legacyRawFormatter::write
 }
 
 
-void Foam::foamVtkOutput::legacyRawFormatter::write
+void Foam::vtk::legacyRawFormatter::write
 (
     const float val
 )
@@ -148,7 +148,7 @@ void Foam::foamVtkOutput::legacyRawFormatter::write
 }
 
 
-void Foam::foamVtkOutput::legacyRawFormatter::write
+void Foam::vtk::legacyRawFormatter::write
 (
     const double val
 )
@@ -160,7 +160,7 @@ void Foam::foamVtkOutput::legacyRawFormatter::write
 }
 
 
-void Foam::foamVtkOutput::legacyRawFormatter::flush()
+void Foam::vtk::legacyRawFormatter::flush()
 {
     os()<< '\n';
 }
diff --git a/src/fileFormats/vtk/format/foamVtkLegacyRawFormatter.H b/src/fileFormats/vtk/format/foamVtkLegacyRawFormatter.H
index 2b558fc977..3f24f05cb0 100644
--- a/src/fileFormats/vtk/format/foamVtkLegacyRawFormatter.H
+++ b/src/fileFormats/vtk/format/foamVtkLegacyRawFormatter.H
@@ -22,7 +22,7 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
-    Foam::foamVtkOutput::legacyRawFormatter
+    Foam::vtk::legacyRawFormatter
 
 Description
     Binary output for the VTK legacy format, always written as big-endian
@@ -44,7 +44,7 @@ SourceFiles
 
 namespace Foam
 {
-namespace foamVtkOutput
+namespace vtk
 {
 
 /*---------------------------------------------------------------------------*\
@@ -118,7 +118,7 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-} // End namespace foamVtkOutput
+} // End namespace vtk
 } // End namespace Foam
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/fileFormats/vtk/output/foamVtkOutput.C b/src/fileFormats/vtk/output/foamVtkOutput.C
index 1f8dfdf503..7e18f72314 100644
--- a/src/fileFormats/vtk/output/foamVtkOutput.C
+++ b/src/fileFormats/vtk/output/foamVtkOutput.C
@@ -36,58 +36,58 @@ License
 
 // * * * * * * * * * * * * * * * Static Data * * * * * * * * * * * * * * * * //
 
-const Foam::Enum<Foam::vtkFileTag>
-Foam::foamVtkOutput::legacy::contentNames
+const Foam::Enum<Foam::vtk::fileTag>
+Foam::vtk::legacy::contentNames
 {
-    { vtkFileTag::POLY_DATA,         "POLYDATA" },
-    { vtkFileTag::UNSTRUCTURED_GRID, "UNSTRUCTURED_GRID" },
+    { vtk::fileTag::POLY_DATA,         "POLYDATA" },
+    { vtk::fileTag::UNSTRUCTURED_GRID, "UNSTRUCTURED_GRID" },
 };
 
 
-const Foam::Enum<Foam::vtkFileTag>
-Foam::foamVtkOutput::legacy::dataTypeNames
+const Foam::Enum<Foam::vtk::fileTag>
+Foam::vtk::legacy::dataTypeNames
 {
-    { vtkFileTag::CELL_DATA,  "CELL_DATA" },
-    { vtkFileTag::POINT_DATA, "POINT_DATA" }
+    { vtk::fileTag::CELL_DATA,  "CELL_DATA" },
+    { vtk::fileTag::POINT_DATA, "POINT_DATA" }
 };
 
 
 // * * * * * * * * * * * * * * Global Functions  * * * * * * * * * * * * * * //
 
-Foam::autoPtr<Foam::foamVtkOutput::formatter>
-Foam::foamVtkOutput::newFormatter
+Foam::autoPtr<Foam::vtk::formatter>
+Foam::vtk::newFormatter
 (
     std::ostream& os,
     const enum formatType fmtType,
     unsigned prec
 )
 {
-    autoPtr<foamVtkOutput::formatter> fmt;
+    autoPtr<vtk::formatter> fmt;
 
     switch (fmtType)
     {
         case formatType::INLINE_ASCII:
-            fmt.set(new foamVtkOutput::asciiFormatter(os, prec));
+            fmt.set(new vtk::asciiFormatter(os, prec));
             break;
 
         case formatType::INLINE_BASE64:
-            fmt.set(new foamVtkOutput::base64Formatter(os));
+            fmt.set(new vtk::base64Formatter(os));
             break;
 
         case formatType::APPEND_BASE64:
-            fmt.set(new foamVtkOutput::appendBase64Formatter(os));
+            fmt.set(new vtk::appendBase64Formatter(os));
             break;
 
         case formatType::APPEND_BINARY:
-            fmt.set(new foamVtkOutput::appendRawFormatter(os));
+            fmt.set(new vtk::appendRawFormatter(os));
             break;
 
         case formatType::LEGACY_ASCII:
-            fmt.set(new foamVtkOutput::legacyAsciiFormatter(os, prec));
+            fmt.set(new vtk::legacyAsciiFormatter(os, prec));
             break;
 
         case formatType::LEGACY_BINARY:
-            fmt.set(new foamVtkOutput::legacyRawFormatter(os));
+            fmt.set(new vtk::legacyRawFormatter(os));
             break;
     }
 
@@ -95,7 +95,7 @@ Foam::foamVtkOutput::newFormatter
 }
 
 
-Foam::label Foam::foamVtkOutput::writeVtmFile
+Foam::label Foam::vtk::writeVtmFile
 (
     std::ostream& os,
     const UList<fileName>& files
@@ -112,9 +112,9 @@ Foam::label Foam::foamVtkOutput::writeVtmFile
     forAll(files, i)
     {
         vtmFile
-            .openTag(vtkFileTag::DATA_SET)
-            ( "index", i )
-            ( "file", files[i] )
+            .openTag(vtk::fileTag::DATA_SET)
+            .xmlAttr("index", i)
+            .xmlAttr("file", files[i])
             .closeTag(true);
     }
 
@@ -124,9 +124,9 @@ Foam::label Foam::foamVtkOutput::writeVtmFile
 }
 
 
-std::ostream& Foam::foamVtkOutput::legacy::fileHeader
+std::ostream& Foam::vtk::legacy::fileHeader
 (
-    foamVtkOutput::formatter& fmt,
+    vtk::formatter& fmt,
     const std::string& title,
     const std::string& contentType
 )
diff --git a/src/fileFormats/vtk/output/foamVtkOutput.H b/src/fileFormats/vtk/output/foamVtkOutput.H
index f298d6ff12..4dd909219d 100644
--- a/src/fileFormats/vtk/output/foamVtkOutput.H
+++ b/src/fileFormats/vtk/output/foamVtkOutput.H
@@ -22,14 +22,14 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Namespace
-    Foam::foamVtkOutput
+    Foam::vtk
 
 Description
     Namespace for handling VTK output.
     Contains classes and functions for writing VTK file content.
 
 Namespace
-    Foam::foamVtkOutput::legacy
+    Foam::vtk::legacy
 
 Description
     Namespace for legacy VTK output constants and functions.
@@ -45,7 +45,7 @@ SourceFiles
 
 #include "autoPtr.H"
 #include "Enum.H"
-#include "foamVtkOutputTypes.H"
+#include "foamVtkCore.H"
 #include "foamVtkFormatter.H"
 #include "floatScalar.H"
 #include "IOstream.H"
@@ -54,27 +54,20 @@ SourceFiles
 
 namespace Foam
 {
-namespace foamVtkOutput
+namespace vtk
 {
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-  // Typedefs
-
-    //- Use UInt64 for header data
-    typedef formatter::headerType headerType;
-
-
   // Constants
 
-
   // General Functions
 
     //- Return a default asciiFormatter
-    autoPtr<foamVtkOutput::formatter> newFormatter(std::ostream& os);
+    autoPtr<vtk::formatter> newFormatter(std::ostream& os);
 
     //- Return a new formatter based on the specified format type
-    autoPtr<foamVtkOutput::formatter> newFormatter
+    autoPtr<vtk::formatter> newFormatter
     (
         std::ostream& os,
         const enum formatType fmtType,
@@ -90,7 +83,7 @@ namespace foamVtkOutput
     template<class Type>
     inline void write
     (
-        foamVtkOutput::formatter& fmt,
+        vtk::formatter& fmt,
         const Type& val
     );
 
@@ -100,7 +93,7 @@ namespace foamVtkOutput
     template<class Type>
     void writeList
     (
-        foamVtkOutput::formatter& fmt,
+        vtk::formatter& fmt,
         const UList<Type>& lst
     );
 
@@ -109,7 +102,7 @@ namespace foamVtkOutput
     template<class Type, unsigned Size>
     void writeList
     (
-        foamVtkOutput::formatter& fmt,
+        vtk::formatter& fmt,
         const FixedList<Type, Size>& lst
     );
 
@@ -119,7 +112,7 @@ namespace foamVtkOutput
     template<class Type>
     void writeList
     (
-        foamVtkOutput::formatter& fmt,
+        vtk::formatter& fmt,
         const UList<Type>& lst,
         const UList<label>& addressing
     );
@@ -136,10 +129,10 @@ namespace legacy
   // Constants
 
     //- Strings corresponding to the (POLYDATA, UNSTRUCTURED_GRID) elements
-    extern const Foam::Enum<vtkFileTag> contentNames;
+    extern const Foam::Enum<vtk::fileTag> contentNames;
 
     //- Strings corresponding to the (CELL_DATA, POINT_DATA) elements
-    extern const Foam::Enum<vtkFileTag> dataTypeNames;
+    extern const Foam::Enum<vtk::fileTag> dataTypeNames;
 
 
   // Functions
@@ -158,9 +151,9 @@ namespace legacy
     //  Includes "DATASET" with the specified dataset type.
     inline void fileHeader
     (
-        foamVtkOutput::formatter& fmt,
+        vtk::formatter& fmt,
         const std::string& title,
-        const vtkFileTag& contentTypeTag
+        const vtk::fileTag& contentTypeTag
     );
 
     //- Emit header for legacy file, with "ASCII" or "BINARY" depending on
@@ -168,7 +161,7 @@ namespace legacy
     //  If the contentType is non-empty, it is used for "DATASET" line.
     std::ostream& fileHeader
     (
-        foamVtkOutput::formatter& fmt,
+        vtk::formatter& fmt,
         const std::string& title,
         const std::string& contentType
     );
@@ -189,14 +182,14 @@ namespace legacy
     );
 
 
-    //- Use the enumerations vtkFileTag::CELL_DATA, vtkFileTag::POINT_DATA,
+    //- Use the enumerations vtk::fileTag::CELL_DATA, vtk::fileTag::POINT_DATA,
     //  to emit a legacy CELL_DATA, POINT_DATA element.
     //  The nEntries corresponds similarly to the number of cells or points,
     //  respectively.
     inline void dataHeader
     (
         std::ostream& os,
-        const vtkFileTag& dataTypeTag,
+        const vtk::fileTag& dataTypeTag,
         const label nEntries,
         const label nFields
     );
@@ -219,11 +212,12 @@ namespace legacy
         const label nEntries
     );
 
-};
+} // End namespace legacy
+
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-} // End namespace foamVtkOutput
+} // End namespace vtk
 } // End namespace Foam
 
 
diff --git a/src/fileFormats/vtk/output/foamVtkOutputI.H b/src/fileFormats/vtk/output/foamVtkOutputI.H
index 192caea831..9618bae2ab 100644
--- a/src/fileFormats/vtk/output/foamVtkOutputI.H
+++ b/src/fileFormats/vtk/output/foamVtkOutputI.H
@@ -27,12 +27,12 @@ License
 
 namespace Foam
 {
-namespace foamVtkOutput
+namespace vtk
 {
 
 //- Template specialization for label
 template<>
-inline void write<label>(foamVtkOutput::formatter& fmt, const label& val)
+inline void write<label>(vtk::formatter& fmt, const label& val)
 {
     fmt.write(val);
 }
@@ -40,7 +40,7 @@ inline void write<label>(foamVtkOutput::formatter& fmt, const label& val)
 
 //- Template specialization for float
 template<>
-inline void write<float>(foamVtkOutput::formatter& fmt, const float& val)
+inline void write<float>(vtk::formatter& fmt, const float& val)
 {
     fmt.write(val);
 }
@@ -48,18 +48,18 @@ inline void write<float>(foamVtkOutput::formatter& fmt, const float& val)
 
 //- Template specialization for double
 template<>
-inline void write<double>(foamVtkOutput::formatter& fmt, const double& val)
+inline void write<double>(vtk::formatter& fmt, const double& val)
 {
     fmt.write(val);
 }
 
-} // End namespace foamVtkOutput
+} // End namespace vtk
 } // End namespace Foam
 
 
 // * * * * * * * * * * * * * * Global Functions  * * * * * * * * * * * * * * //
 
-inline std::ostream& Foam::foamVtkOutput::legacy::fileHeader
+inline std::ostream& Foam::vtk::legacy::fileHeader
 (
     std::ostream& os,
     const std::string& title,
@@ -74,18 +74,18 @@ inline std::ostream& Foam::foamVtkOutput::legacy::fileHeader
 }
 
 
-inline void Foam::foamVtkOutput::legacy::fileHeader
+inline void Foam::vtk::legacy::fileHeader
 (
-    foamVtkOutput::formatter& fmt,
+    vtk::formatter& fmt,
     const std::string& title,
-    const vtkFileTag& contentTypeTag
+    const vtk::fileTag& contentTypeTag
 )
 {
     fileHeader(fmt, title, contentNames[contentTypeTag]);
 }
 
 
-inline void Foam::foamVtkOutput::legacy::beginPoints
+inline void Foam::vtk::legacy::beginPoints
 (
     std::ostream& os,
     const label nPoints
@@ -95,7 +95,7 @@ inline void Foam::foamVtkOutput::legacy::beginPoints
 }
 
 
-inline void Foam::foamVtkOutput::legacy::beginPolys
+inline void Foam::vtk::legacy::beginPolys
 (
     std::ostream& os,
     const label nPolys,
@@ -106,10 +106,10 @@ inline void Foam::foamVtkOutput::legacy::beginPolys
 }
 
 
-inline void Foam::foamVtkOutput::legacy::dataHeader
+inline void Foam::vtk::legacy::dataHeader
 (
     std::ostream& os,
-    const vtkFileTag& dataTypeTag,
+    const vtk::fileTag& dataTypeTag,
     const label nEntries,
     const label nFields
 )
@@ -119,7 +119,7 @@ inline void Foam::foamVtkOutput::legacy::dataHeader
 }
 
 
-inline void Foam::foamVtkOutput::legacy::floatField
+inline void Foam::vtk::legacy::floatField
 (
     std::ostream& os,
     const word& fieldName,
@@ -131,7 +131,7 @@ inline void Foam::foamVtkOutput::legacy::floatField
 }
 
 
-inline void Foam::foamVtkOutput::legacy::intField
+inline void Foam::vtk::legacy::intField
 (
     std::ostream& os,
     const word& fieldName,
diff --git a/src/fileFormats/vtk/output/foamVtkOutputOptions.C b/src/fileFormats/vtk/output/foamVtkOutputOptions.C
index d58cf3849b..8a8c30a060 100644
--- a/src/fileFormats/vtk/output/foamVtkOutputOptions.C
+++ b/src/fileFormats/vtk/output/foamVtkOutputOptions.C
@@ -28,8 +28,8 @@ License
 
 // * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
 
-Foam::foamVtkOutput::outputOptions&
-Foam::foamVtkOutput::outputOptions::ascii(bool on)
+Foam::vtk::outputOptions&
+Foam::vtk::outputOptions::ascii(bool on)
 {
     if (on)
     {
@@ -76,8 +76,8 @@ Foam::foamVtkOutput::outputOptions::ascii(bool on)
 }
 
 
-Foam::foamVtkOutput::outputOptions&
-Foam::foamVtkOutput::outputOptions::append(bool on)
+Foam::vtk::outputOptions&
+Foam::vtk::outputOptions::append(bool on)
 {
     if (on)
     {
@@ -118,8 +118,8 @@ Foam::foamVtkOutput::outputOptions::append(bool on)
 }
 
 
-Foam::foamVtkOutput::outputOptions&
-Foam::foamVtkOutput::outputOptions::legacy(bool on)
+Foam::vtk::outputOptions&
+Foam::vtk::outputOptions::legacy(bool on)
 {
     if (on)
     {
@@ -160,15 +160,15 @@ Foam::foamVtkOutput::outputOptions::legacy(bool on)
 }
 
 
-Foam::foamVtkOutput::outputOptions&
-Foam::foamVtkOutput::outputOptions::precision(unsigned prec)
+Foam::vtk::outputOptions&
+Foam::vtk::outputOptions::precision(unsigned prec)
 {
     precision_ = prec;
     return *this;
 }
 
 
-Foam::string Foam::foamVtkOutput::outputOptions::description() const
+Foam::string Foam::vtk::outputOptions::description() const
 {
     switch (fmtType_)
     {
diff --git a/src/fileFormats/vtk/output/foamVtkOutputOptions.H b/src/fileFormats/vtk/output/foamVtkOutputOptions.H
index c93dbd5f1f..00e715b15c 100644
--- a/src/fileFormats/vtk/output/foamVtkOutputOptions.H
+++ b/src/fileFormats/vtk/output/foamVtkOutputOptions.H
@@ -22,7 +22,7 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
-    Foam::foamVtkOutput::outputOptions
+    Foam::vtk::outputOptions
 
 Description
     Encapsulated combinations of output format options.
@@ -47,7 +47,7 @@ SourceFiles
 
 namespace Foam
 {
-namespace foamVtkOutput
+namespace vtk
 {
 
 /*---------------------------------------------------------------------------*\
@@ -148,7 +148,7 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-} // End namespace foamVtkOutput
+} // End namespace vtk
 } // End namespace Foam
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/fileFormats/vtk/output/foamVtkOutputOptionsI.H b/src/fileFormats/vtk/output/foamVtkOutputOptionsI.H
index 7d398ee7ea..c8802c3da8 100644
--- a/src/fileFormats/vtk/output/foamVtkOutputOptionsI.H
+++ b/src/fileFormats/vtk/output/foamVtkOutputOptionsI.H
@@ -28,14 +28,14 @@ License
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-inline Foam::foamVtkOutput::outputOptions::outputOptions()
+inline Foam::vtk::outputOptions::outputOptions()
 :
     fmtType_(formatType::INLINE_ASCII),
     precision_(IOstream::defaultPrecision())
 {}
 
 
-inline Foam::foamVtkOutput::outputOptions::outputOptions
+inline Foam::vtk::outputOptions::outputOptions
 (
     enum formatType fmtType
 )
@@ -47,23 +47,23 @@ inline Foam::foamVtkOutput::outputOptions::outputOptions
 
 // * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * * //
 
-inline Foam::autoPtr<Foam::foamVtkOutput::formatter>
-Foam::foamVtkOutput::outputOptions::newFormatter(std::ostream& os) const
+inline Foam::autoPtr<Foam::vtk::formatter>
+Foam::vtk::outputOptions::newFormatter(std::ostream& os) const
 {
-    return foamVtkOutput::newFormatter(os, fmtType_, precision_);
+    return vtk::newFormatter(os, fmtType_, precision_);
 }
 
 
 // * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
 
-inline Foam::foamVtkOutput::formatType
-Foam::foamVtkOutput::outputOptions::fmt() const
+inline Foam::vtk::formatType
+Foam::vtk::outputOptions::fmt() const
 {
     return fmtType_;
 }
 
 
-inline bool Foam::foamVtkOutput::outputOptions::legacy() const
+inline bool Foam::vtk::outputOptions::legacy() const
 {
     return
     (
@@ -73,13 +73,13 @@ inline bool Foam::foamVtkOutput::outputOptions::legacy() const
 }
 
 
-inline bool Foam::foamVtkOutput::outputOptions::xml() const
+inline bool Foam::vtk::outputOptions::xml() const
 {
     return !legacy();
 }
 
 
-inline bool Foam::foamVtkOutput::outputOptions::append() const
+inline bool Foam::vtk::outputOptions::append() const
 {
     return
     (
@@ -89,19 +89,19 @@ inline bool Foam::foamVtkOutput::outputOptions::append() const
 }
 
 
-inline bool Foam::foamVtkOutput::outputOptions::insitu() const
+inline bool Foam::vtk::outputOptions::insitu() const
 {
     return !append();
 }
 
 
-inline bool Foam::foamVtkOutput::outputOptions::ascii() const
+inline bool Foam::vtk::outputOptions::ascii() const
 {
     return !(unsigned(fmtType_) & 0x0F);
 }
 
 
-inline unsigned Foam::foamVtkOutput::outputOptions::precision() const
+inline unsigned Foam::vtk::outputOptions::precision() const
 {
     return precision_;
 }
diff --git a/src/fileFormats/vtk/output/foamVtkOutputTemplates.C b/src/fileFormats/vtk/output/foamVtkOutputTemplates.C
index f565602b6c..a60d01e52e 100644
--- a/src/fileFormats/vtk/output/foamVtkOutputTemplates.C
+++ b/src/fileFormats/vtk/output/foamVtkOutputTemplates.C
@@ -26,9 +26,9 @@ License
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 template<class Type>
-inline void Foam::foamVtkOutput::write
+inline void Foam::vtk::write
 (
-    foamVtkOutput::formatter& fmt,
+    vtk::formatter& fmt,
     const Type& val
 )
 {
@@ -40,9 +40,9 @@ inline void Foam::foamVtkOutput::write
 
 
 template<class Type>
-void Foam::foamVtkOutput::writeList
+void Foam::vtk::writeList
 (
-    foamVtkOutput::formatter& fmt,
+    vtk::formatter& fmt,
     const UList<Type>& lst
 )
 {
@@ -54,9 +54,9 @@ void Foam::foamVtkOutput::writeList
 
 
 template<class Type, unsigned Size>
-void Foam::foamVtkOutput::writeList
+void Foam::vtk::writeList
 (
-    foamVtkOutput::formatter& fmt,
+    vtk::formatter& fmt,
     const FixedList<Type, Size>& lst
 )
 {
@@ -68,9 +68,9 @@ void Foam::foamVtkOutput::writeList
 
 
 template<class Type>
-void Foam::foamVtkOutput::writeList
+void Foam::vtk::writeList
 (
-    foamVtkOutput::formatter& fmt,
+    vtk::formatter& fmt,
     const UList<Type>& lst,
     const UList<label>& addressing
 )
diff --git a/src/fileFormats/vtk/read/vtkUnstructuredReader.C b/src/fileFormats/vtk/read/vtkUnstructuredReader.C
index 153c165782..f29d57995c 100644
--- a/src/fileFormats/vtk/read/vtkUnstructuredReader.C
+++ b/src/fileFormats/vtk/read/vtkUnstructuredReader.C
@@ -125,7 +125,7 @@ void Foam::vtkUnstructuredReader::extractCells
     {
         switch (cellTypes[i])
         {
-            case foamVtkCore::VTK_VERTEX:
+            case vtk::cellType::VTK_VERTEX:
             {
                 warnUnhandledType(inFile, cellTypes[i], warningGiven);
                 label nRead = cellVertData[dataIndex++];
@@ -141,7 +141,7 @@ void Foam::vtkUnstructuredReader::extractCells
             }
             break;
 
-            case foamVtkCore::VTK_POLY_VERTEX:
+            case vtk::cellType::VTK_POLY_VERTEX:
             {
                 warnUnhandledType(inFile, cellTypes[i], warningGiven);
                 label nRead = cellVertData[dataIndex++];
@@ -149,7 +149,7 @@ void Foam::vtkUnstructuredReader::extractCells
             }
             break;
 
-            case foamVtkCore::VTK_LINE:
+            case vtk::cellType::VTK_LINE:
             {
                 //warnUnhandledType(inFile, cellTypes[i], warningGiven);
                 label nRead = cellVertData[dataIndex++];
@@ -169,7 +169,7 @@ void Foam::vtkUnstructuredReader::extractCells
             }
             break;
 
-            case foamVtkCore::VTK_POLY_LINE:
+            case vtk::cellType::VTK_POLY_LINE:
             {
                 //warnUnhandledType(inFile, cellTypes[i], warningGiven);
                 label nRead = cellVertData[dataIndex++];
@@ -183,7 +183,7 @@ void Foam::vtkUnstructuredReader::extractCells
             }
             break;
 
-            case foamVtkCore::VTK_TRIANGLE:
+            case vtk::cellType::VTK_TRIANGLE:
             {
                 faceMap_[facei] = i;
                 face& f = faces_[facei++];
@@ -203,7 +203,7 @@ void Foam::vtkUnstructuredReader::extractCells
             }
             break;
 
-            case foamVtkCore::VTK_QUAD:
+            case vtk::cellType::VTK_QUAD:
             {
                 faceMap_[facei] = i;
                 face& f = faces_[facei++];
@@ -224,7 +224,7 @@ void Foam::vtkUnstructuredReader::extractCells
             }
             break;
 
-            case foamVtkCore::VTK_POLYGON:
+            case vtk::cellType::VTK_POLYGON:
             {
                 faceMap_[facei] = i;
                 face& f = faces_[facei++];
@@ -237,7 +237,7 @@ void Foam::vtkUnstructuredReader::extractCells
             }
             break;
 
-            case foamVtkCore::VTK_TETRA:
+            case vtk::cellType::VTK_TETRA:
             {
                 label nRead = cellVertData[dataIndex++];
                 if (nRead != 4)
@@ -257,7 +257,7 @@ void Foam::vtkUnstructuredReader::extractCells
             }
             break;
 
-            case foamVtkCore::VTK_PYRAMID:
+            case vtk::cellType::VTK_PYRAMID:
             {
                 label nRead = cellVertData[dataIndex++];
                 if (nRead != 5)
@@ -278,7 +278,7 @@ void Foam::vtkUnstructuredReader::extractCells
             }
             break;
 
-            case foamVtkCore::VTK_WEDGE:
+            case vtk::cellType::VTK_WEDGE:
             {
                 label nRead = cellVertData[dataIndex++];
                 if (nRead != 6)
@@ -300,7 +300,7 @@ void Foam::vtkUnstructuredReader::extractCells
             }
             break;
 
-            case foamVtkCore::VTK_HEXAHEDRON:
+            case vtk::cellType::VTK_HEXAHEDRON:
             {
                 label nRead = cellVertData[dataIndex++];
                 if (nRead != 8)
diff --git a/src/fileFormats/vtk/read/vtkUnstructuredReader.H b/src/fileFormats/vtk/read/vtkUnstructuredReader.H
index 48dc38890a..bee79496c6 100644
--- a/src/fileFormats/vtk/read/vtkUnstructuredReader.H
+++ b/src/fileFormats/vtk/read/vtkUnstructuredReader.H
@@ -63,8 +63,6 @@ namespace Foam
 \*---------------------------------------------------------------------------*/
 
 class vtkUnstructuredReader
-:
-    public fileFormats::foamVtkCore
 {
 public:
 
@@ -206,7 +204,7 @@ private:
 
         void read(ISstream& inFile);
 
-        //- Dissallow assignment
+        //- Disallow assignment
         void operator=(const vtkUnstructuredReader&);
 
 
@@ -220,6 +218,7 @@ public:
         //- Construct from Istream, read all
         vtkUnstructuredReader(const objectRegistry& obr, ISstream&);
 
+
     // Member Functions
 
         //- Header
diff --git a/src/fileFormats/vtk/type/foamVtkFileEnums.C b/src/fileFormats/vtk/type/foamVtkFileEnums.C
deleted file mode 100644
index bf9d0d5cd3..0000000000
--- a/src/fileFormats/vtk/type/foamVtkFileEnums.C
+++ /dev/null
@@ -1,64 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2017 OpenCFD Ltd.
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-License
-    This file is part of OpenFOAM.
-
-    OpenFOAM is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "foamVtkFileEnums.H"
-#include "Enum.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-const Foam::Enum<Foam::vtkFileTag> Foam::vtkFileTagNames
-(
-    vtkFileTag::VTK_FILE,
-    {
-        "VTKFile",
-        "DataArray",
-        "Piece",
-        "DataSet",
-        "Points",
-        "Cells",
-        "Polys",
-        "Verts",
-        "CellData",
-        "PointData",
-        "PolyData",
-        "UnstructuredGrid",
-    }
-);
-
-
-const Foam::Enum<Foam::vtkFileAttr> Foam::vtkFileAttrNames
-(
-    vtkFileAttr::OFFSET,
-    {
-        "offset",
-        "NumberOfPoints",
-        "NumberOfCells",
-        "NumberOfPolys",
-        "NumberOfVerts"
-    }
-);
-
-
-// ************************************************************************* //
diff --git a/src/fileFormats/vtk/type/foamVtkFileEnums.H b/src/fileFormats/vtk/type/foamVtkFileEnums.H
deleted file mode 100644
index cb683661c0..0000000000
--- a/src/fileFormats/vtk/type/foamVtkFileEnums.H
+++ /dev/null
@@ -1,90 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2017 OpenCFD Ltd.
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-License
-    This file is part of OpenFOAM.
-
-    OpenFOAM is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
-
-InNamespace
-    Foam::foam
-
-Description
-    Enumerations for commonly used VTK file items.
-
-SourceFiles
-    foamVtkFileEnums.C
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef foamVtkFileEnums_H
-#define foamVtkFileEnums_H
-
-#include "Enum.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-//- Some common XML tags for vtk files
-enum class vtkFileTag
-{
-    VTK_FILE,           //!< "VTKFile"
-    DATA_ARRAY,         //!< "DataArray"
-    PIECE,              //!< "Piece"
-    DATA_SET,           //!< "DataSet"
-    POINTS,             //!< "Points"
-    CELLS,              //!< "Cells"
-    POLYS,              //!< "Polys"
-    VERTS,              //!< "Verts"
-    CELL_DATA,          //!< "CellData"
-    POINT_DATA,         //!< "PointData"
-    POLY_DATA,          //!< "PolyData"
-    UNSTRUCTURED_GRID,  //!< "UnstructuredGrid"
-};
-
-//- Strings corresponding to the elements
-extern const Foam::Enum<vtkFileTag> vtkFileTagNames;
-
-
-//- Some common XML attributes for vtk files
-enum class vtkFileAttr
-{
-    OFFSET,             //!< "offset"
-    NUMBER_OF_POINTS,   //!< "NumberOfPoints"
-    NUMBER_OF_CELLS,    //!< "NumberOfCells"
-    NUMBER_OF_POLYS,    //!< "NumberOfPolys"
-    NUMBER_OF_VERTS,    //!< "NumberOfVerts"
-};
-
-//- Strings corresponding to the elements
-extern const Foam::Enum<vtkFileAttr> vtkFileAttrNames;
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/fileFormats/vtk/type/foamVtkOutputTypes.H b/src/fileFormats/vtk/type/foamVtkOutputTypes.H
deleted file mode 100644
index 3eab6006f8..0000000000
--- a/src/fileFormats/vtk/type/foamVtkOutputTypes.H
+++ /dev/null
@@ -1,77 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2017 OpenCFD Ltd.
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-License
-    This file is part of OpenFOAM.
-
-    OpenFOAM is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
-
-InNamespace
-    Foam::foamVtkOutput
-
-Description
-    Enumerations and typedefs for VTK output.
-
-SourceFiles
-    foamVtkOutputTypes.H
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef foamVtkOutputTypes_H
-#define foamVtkOutputTypes_H
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-namespace foamVtkOutput
-{
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-  // Enumerations
-
-    //- The output format type for file contents.
-    //  Upper bits for output type, lower bits for the format itself.
-    enum class formatType
-    {
-        /** XML inline ASCII, using the asciiFormatter */
-        INLINE_ASCII  = 0,
-        /** XML inline base64, using the base64Formatter */
-        INLINE_BASE64 = 0x01,
-        /** XML append base64, using the appendBase64Formatter */
-        APPEND_BASE64 = 0x11,
-        /** XML append raw binary, using the appendRawFormatter */
-        APPEND_BINARY = 0x12,
-        /** Legacy ASCII, using the legacyAsciiFormatter */
-        LEGACY_ASCII  = 0x20,
-        /** Legacy raw binary, using the legacyRawFormatter */
-        LEGACY_BINARY = 0x22,
-    };
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace foamVtkOutput
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/functionObjects/utilities/writeVTK/writeVTK.C b/src/functionObjects/utilities/writeVTK/writeVTK.C
index 2fe616effd..ab56d294fd 100644
--- a/src/functionObjects/utilities/writeVTK/writeVTK.C
+++ b/src/functionObjects/utilities/writeVTK/writeVTK.C
@@ -115,20 +115,20 @@ bool Foam::functionObjects::writeVTK::write()
 
     Info<< "    Internal  : " << outputName << endl;
 
-    foamVtkCells foamVtkMeshCells
+    vtk::vtuCells meshCells
     (
         mesh_,
-        foamVtkCells::contentType::LEGACY,
+        vtk::vtuCells::contentType::LEGACY,
         true  // decompose
     );
 
     // Write mesh
-    foamVtkOutput::internalWriter writer
+    vtk::internalWriter writer
     (
         mesh_,
-        foamVtkMeshCells,
+        meshCells,
         outputName,
-        foamVtkOutput::formatType::LEGACY_ASCII
+        vtk::formatType::LEGACY_ASCII
     );
 
 
diff --git a/src/meshTools/output/foamVtkWriteCellSetFaces.C b/src/meshTools/output/foamVtkWriteCellSetFaces.C
index 02d3e5a11f..a84b5d5b70 100644
--- a/src/meshTools/output/foamVtkWriteCellSetFaces.C
+++ b/src/meshTools/output/foamVtkWriteCellSetFaces.C
@@ -32,12 +32,12 @@ License
 
 // * * * * * * * * * * * * * * * Global Functions  * * * * * * * * * * * * * //
 
-void Foam::foamVtkOutput::writeCellSetFaces
+void Foam::vtk::writeCellSetFaces
 (
     const primitiveMesh& mesh,
     const cellSet& set,
     const fileName& baseName,
-    const foamVtkOutput::outputOptions outOpts
+    const vtk::outputOptions outOpts
 )
 {
     outputOptions opts(outOpts);
@@ -47,11 +47,11 @@ void Foam::foamVtkOutput::writeCellSetFaces
 
     std::ofstream os((baseName + (legacy_ ? ".vtk" : ".vtp")).c_str());
 
-    autoPtr<foamVtkOutput::formatter> format = opts.newFormatter(os);
+    autoPtr<vtk::formatter> format = opts.newFormatter(os);
 
     if (legacy_)
     {
-        legacy::fileHeader(format(), set.name(), vtkFileTag::POLY_DATA);
+        legacy::fileHeader(format(), set.name(), vtk::fileTag::POLY_DATA);
     }
 
     //-------------------------------------------------------------------------
@@ -109,7 +109,7 @@ void Foam::foamVtkOutput::writeCellSetFaces
     // Write points and faces as polygons
     legacy::beginPoints(os, pp.nPoints());
 
-    foamVtkOutput::writeList(format(), pp.localPoints());
+    vtk::writeList(format(), pp.localPoints());
     format().flush();
 
     // connectivity count without additional storage (done internally)
@@ -129,17 +129,17 @@ void Foam::foamVtkOutput::writeCellSetFaces
         const face& f = pp.localFaces()[facei];
 
         format().write(f.size());  // The size prefix
-        foamVtkOutput::writeList(format(), f);
+        vtk::writeList(format(), f);
     }
     format().flush();
 
 
     // Write data - faceId/cellId
-    legacy::dataHeader(os, vtkFileTag::CELL_DATA, pp.size(), 1);
+    legacy::dataHeader(os, vtk::fileTag::CELL_DATA, pp.size(), 1);
 
     os << "cellID 1 " << pp.size() << " int" << nl;
 
-    foamVtkOutput::writeList(format(), faceValues);
+    vtk::writeList(format(), faceValues);
     format().flush();
 }
 
diff --git a/src/meshTools/output/foamVtkWriteCellSetFaces.H b/src/meshTools/output/foamVtkWriteCellSetFaces.H
index 047f4b16f8..765ff60807 100644
--- a/src/meshTools/output/foamVtkWriteCellSetFaces.H
+++ b/src/meshTools/output/foamVtkWriteCellSetFaces.H
@@ -22,7 +22,7 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 InNamespace
-    Foam::foamVtkOutput
+    Foam::vtk
 
 Description
     Write faces of cellSet to vtk polydata file.
@@ -45,11 +45,11 @@ SourceFiles
 
 namespace Foam
 {
- class primitiveMesh;
+class primitiveMesh;
 class cellSet;
 class fileName;
 
-namespace foamVtkOutput
+namespace vtk
 {
 
 //- Write perimeter faces of cellset to vtk polydata file.
@@ -59,10 +59,10 @@ void writeCellSetFaces
     const primitiveMesh& mesh,
     const cellSet& set,
     const fileName& baseName,
-    const foamVtkOutput::outputOptions outOpts
+    const vtk::outputOptions outOpts
 );
 
-} // End namespace foamVtkOutput
+} // End namespace vtk
 } // End namespace Foam
 
 
diff --git a/src/meshTools/output/foamVtkWriteFaceSet.C b/src/meshTools/output/foamVtkWriteFaceSet.C
index 86d45e9ae8..59c11329d4 100644
--- a/src/meshTools/output/foamVtkWriteFaceSet.C
+++ b/src/meshTools/output/foamVtkWriteFaceSet.C
@@ -32,12 +32,12 @@ License
 
 // * * * * * * * * * * * * * * * Global Functions  * * * * * * * * * * * * * //
 
-void Foam::foamVtkOutput::writeFaceSet
+void Foam::vtk::writeFaceSet
 (
     const primitiveMesh& mesh,
     const faceSet& set,
     const fileName& baseName,
-    const foamVtkOutput::outputOptions outOpts
+    const vtk::outputOptions outOpts
 )
 {
     outputOptions opts(outOpts);
@@ -47,11 +47,11 @@ void Foam::foamVtkOutput::writeFaceSet
 
     std::ofstream os((baseName + (legacy_ ? ".vtk" : ".vtp")).c_str());
 
-    autoPtr<foamVtkOutput::formatter> format = opts.newFormatter(os);
+    autoPtr<vtk::formatter> format = opts.newFormatter(os);
 
     if (legacy_)
     {
-        legacy::fileHeader(format(), set.name(), vtkFileTag::POLY_DATA);
+        legacy::fileHeader(format(), set.name(), vtk::fileTag::POLY_DATA);
     }
 
     //-------------------------------------------------------------------------
@@ -70,7 +70,7 @@ void Foam::foamVtkOutput::writeFaceSet
     // Write points and faces as polygons
     legacy::beginPoints(os, pp.nPoints());
 
-    foamVtkOutput::writeList(format(), pp.localPoints());
+    vtk::writeList(format(), pp.localPoints());
     format().flush();
 
     // connectivity count without additional storage (done internally)
@@ -89,18 +89,18 @@ void Foam::foamVtkOutput::writeFaceSet
         const face& f = pp.localFaces()[facei];
 
         format().write(f.size());  // The size prefix
-        foamVtkOutput::writeList(format(), f);
+        vtk::writeList(format(), f);
     }
     format().flush();
 
 
     // Write data - faceId/cellId
 
-    legacy::dataHeader(os, vtkFileTag::CELL_DATA, pp.size(), 1);
+    legacy::dataHeader(os, vtk::fileTag::CELL_DATA, pp.size(), 1);
 
     os << "faceID 1 " << pp.size() << " int" << nl;
 
-    foamVtkOutput::writeList(format(), faceLabels);
+    vtk::writeList(format(), faceLabels);
     format().flush();
 }
 
diff --git a/src/meshTools/output/foamVtkWriteFaceSet.H b/src/meshTools/output/foamVtkWriteFaceSet.H
index d709b0a681..24ba0c3932 100644
--- a/src/meshTools/output/foamVtkWriteFaceSet.H
+++ b/src/meshTools/output/foamVtkWriteFaceSet.H
@@ -22,7 +22,7 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 InNamespace
-    Foam::foamVtkOutput
+    Foam::vtk
 
 Description
     Write faceSet to vtk polydata file.
@@ -46,7 +46,7 @@ class primitiveMesh;
 class faceSet;
 class fileName;
 
-namespace foamVtkOutput
+namespace vtk
 {
 
 //- Write pointSet to vtk polydata file.
@@ -56,11 +56,11 @@ void writeFaceSet
     const primitiveMesh& mesh,
     const faceSet& set,
     const fileName& baseName,
-    const foamVtkOutput::outputOptions outOpts
+    const vtk::outputOptions outOpts
 );
 
 
-} // End namespace foamVtkOutput
+} // End namespace vtk
 } // End namespace Foam
 
 
diff --git a/src/meshTools/output/foamVtkWritePointSet.C b/src/meshTools/output/foamVtkWritePointSet.C
index f3a9b7e115..66cbfc8c44 100644
--- a/src/meshTools/output/foamVtkWritePointSet.C
+++ b/src/meshTools/output/foamVtkWritePointSet.C
@@ -31,12 +31,12 @@ License
 
 // * * * * * * * * * * * * * * * Global Functions  * * * * * * * * * * * * * //
 
-void Foam::foamVtkOutput::writePointSet
+void Foam::vtk::writePointSet
 (
     const primitiveMesh& mesh,
     const pointSet& set,
     const fileName& baseName,
-    const foamVtkOutput::outputOptions outOpts
+    const vtk::outputOptions outOpts
 )
 {
     outputOptions opts(outOpts);
@@ -46,11 +46,11 @@ void Foam::foamVtkOutput::writePointSet
 
     std::ofstream os((baseName + (legacy_ ? ".vtk" : ".vtp")).c_str());
 
-    autoPtr<foamVtkOutput::formatter> format = opts.newFormatter(os);
+    autoPtr<vtk::formatter> format = opts.newFormatter(os);
 
     if (legacy_)
     {
-        legacy::fileHeader(format(), set.name(), vtkFileTag::POLY_DATA);
+        legacy::fileHeader(format(), set.name(), vtk::fileTag::POLY_DATA);
     }
 
     //-------------------------------------------------------------------------
@@ -60,15 +60,15 @@ void Foam::foamVtkOutput::writePointSet
     // Write points
     legacy::beginPoints(os, pointLabels.size());
 
-    foamVtkOutput::writeList(format(), mesh.points(), pointLabels);
+    vtk::writeList(format(), mesh.points(), pointLabels);
     format().flush();
 
     // Write data - pointID
-    legacy::dataHeader(os, vtkFileTag::POINT_DATA, pointLabels.size(), 1);
+    legacy::dataHeader(os, vtk::fileTag::POINT_DATA, pointLabels.size(), 1);
 
     os << "pointID 1 " << pointLabels.size() << " int" << nl;
 
-    foamVtkOutput::writeList(format(), pointLabels);
+    vtk::writeList(format(), pointLabels);
     format().flush();
 }
 
diff --git a/src/meshTools/output/foamVtkWritePointSet.H b/src/meshTools/output/foamVtkWritePointSet.H
index 3ceda2914e..830dfd304a 100644
--- a/src/meshTools/output/foamVtkWritePointSet.H
+++ b/src/meshTools/output/foamVtkWritePointSet.H
@@ -22,7 +22,7 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 InNamespace
-    Foam::foamVtkOutput
+    Foam::vtk
 
 Description
     Write pointSet to vtk polydata file.
@@ -46,7 +46,7 @@ class primitiveMesh;
 class pointSet;
 class fileName;
 
-namespace foamVtkOutput
+namespace vtk
 {
 
 //- Write pointSet to vtk polydata file.
@@ -56,11 +56,11 @@ void writePointSet
     const primitiveMesh& mesh,
     const pointSet& set,
     const fileName& baseName,
-    const foamVtkOutput::outputOptions outOpts
+    const vtk::outputOptions outOpts
 );
 
 
-} // End namespace foamVtkOutput
+} // End namespace vtk
 } // End namespace Foam
 
 
diff --git a/src/surfMesh/surfaceFormats/vtk/VTKsurfaceFormat.C b/src/surfMesh/surfaceFormats/vtk/VTKsurfaceFormat.C
index 98fed44463..b7141105d6 100644
--- a/src/surfMesh/surfaceFormats/vtk/VTKsurfaceFormat.C
+++ b/src/surfMesh/surfaceFormats/vtk/VTKsurfaceFormat.C
@@ -37,9 +37,9 @@ License
 // TODO: make this run-time selectable (ASCII | BINARY)
 // - Legacy mode only
 
-static const Foam::foamVtkOutput::formatType fmtType =
-    Foam::foamVtkOutput::formatType::LEGACY_ASCII;
-    // Foam::foamVtkOutput::formatType::LEGACY_BASE64;
+static const Foam::vtk::formatType fmtType =
+    Foam::vtk::formatType::LEGACY_ASCII;
+    // Foam::vtk::formatType::LEGACY_BINARY;
 
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
@@ -47,7 +47,7 @@ static const Foam::foamVtkOutput::formatType fmtType =
 template<class Face>
 void Foam::fileFormats::VTKsurfaceFormat<Face>::writePolys
 (
-    foamVtkOutput::formatter& format,
+    vtk::formatter& format,
     const UList<Face>& faces
 )
 {
@@ -58,7 +58,7 @@ void Foam::fileFormats::VTKsurfaceFormat<Face>::writePolys
         nConnectivity += f.size();
     }
 
-    foamVtkOutput::legacy::beginPolys
+    vtk::legacy::beginPolys
     (
         format.os(),
         faces.size(),
@@ -72,7 +72,7 @@ void Foam::fileFormats::VTKsurfaceFormat<Face>::writePolys
     for (const Face& f : faces)
     {
         format.write(f.size());  // The size prefix
-        foamVtkOutput::writeList(format, f);
+        vtk::writeList(format, f);
     }
 
     format.flush();
@@ -276,8 +276,8 @@ void Foam::fileFormats::VTKsurfaceFormat<Face>::write
 
     std::ofstream os(filename.c_str());
 
-    autoPtr<foamVtkOutput::formatter> format =
-        foamVtkOutput::newFormatter(os, fmtType);
+    autoPtr<vtk::formatter> format =
+        vtk::newFormatter(os, fmtType);
 
     writeHeader(format(), pointLst);
 
@@ -290,7 +290,7 @@ void Foam::fileFormats::VTKsurfaceFormat<Face>::write
             nConnectivity += f.size();
         }
 
-        foamVtkOutput::legacy::beginPolys
+        vtk::legacy::beginPolys
         (
             format().os(),
             faceLst.size(),
@@ -305,7 +305,7 @@ void Foam::fileFormats::VTKsurfaceFormat<Face>::write
                 const Face& f = faceLst[faceMap[faceIndex++]];
 
                 format().write(f.size());  // The size prefix
-                foamVtkOutput::writeList(format(), f);
+                vtk::writeList(format(), f);
             }
         }
 
@@ -334,8 +334,8 @@ void Foam::fileFormats::VTKsurfaceFormat<Face>::write
 {
     std::ofstream os(filename.c_str());
 
-    autoPtr<foamVtkOutput::formatter> format =
-        foamVtkOutput::newFormatter(os, fmtType);
+    autoPtr<vtk::formatter> format =
+        vtk::newFormatter(os, fmtType);
 
     writeHeader(format(), surf.points());
 
diff --git a/src/surfMesh/surfaceFormats/vtk/VTKsurfaceFormat.H b/src/surfMesh/surfaceFormats/vtk/VTKsurfaceFormat.H
index cd0fb232a3..9a73aceeb5 100644
--- a/src/surfMesh/surfaceFormats/vtk/VTKsurfaceFormat.H
+++ b/src/surfMesh/surfaceFormats/vtk/VTKsurfaceFormat.H
@@ -63,7 +63,7 @@ class VTKsurfaceFormat
         //- Write polygons
         static void writePolys
         (
-            foamVtkOutput::formatter& format,
+            vtk::formatter& format,
             const UList<Face>& faces
         );
 
diff --git a/src/surfMesh/surfaceFormats/vtk/VTKsurfaceFormatCore.C b/src/surfMesh/surfaceFormats/vtk/VTKsurfaceFormatCore.C
index c251e1f621..fe58168e5b 100644
--- a/src/surfMesh/surfaceFormats/vtk/VTKsurfaceFormatCore.C
+++ b/src/surfMesh/surfaceFormats/vtk/VTKsurfaceFormatCore.C
@@ -31,27 +31,27 @@ License
 
 void Foam::fileFormats::VTKsurfaceFormatCore::writeHeader
 (
-    foamVtkOutput::formatter& format,
+    vtk::formatter& format,
     const pointField& pts
 )
 {
-    foamVtkOutput::legacy::fileHeader
+    vtk::legacy::fileHeader
     (
         format,
         ("surface written " + clock::dateTime()),
-        vtkFileTag::POLY_DATA
+        vtk::fileTag::POLY_DATA
     );
 
-    foamVtkOutput::legacy::beginPoints(format.os(), pts.size());
+    vtk::legacy::beginPoints(format.os(), pts.size());
 
-    foamVtkOutput::writeList(format, pts);
+    vtk::writeList(format, pts);
     format.flush();
 }
 
 
 void Foam::fileFormats::VTKsurfaceFormatCore::writeCellData
 (
-    foamVtkOutput::formatter& format,
+    vtk::formatter& format,
     const UList<surfZone>& zones
 )
 {
@@ -64,15 +64,15 @@ void Foam::fileFormats::VTKsurfaceFormatCore::writeCellData
         nFaces += z.size();
     }
 
-    foamVtkOutput::legacy::dataHeader
+    vtk::legacy::dataHeader
     (
         format.os(),
-        vtkFileTag::CELL_DATA,
+        vtk::fileTag::CELL_DATA,
         nFaces,
         1  // Only one field
     );
 
-    foamVtkOutput::legacy::intField
+    vtk::legacy::intField
     (
         format.os(),
         "region",
@@ -95,7 +95,7 @@ void Foam::fileFormats::VTKsurfaceFormatCore::writeCellData
 
 void Foam::fileFormats::VTKsurfaceFormatCore::writeCellData
 (
-    foamVtkOutput::formatter& format,
+    vtk::formatter& format,
     const labelUList& zoneIds
 )
 {
@@ -104,15 +104,15 @@ void Foam::fileFormats::VTKsurfaceFormatCore::writeCellData
     // Number of faces
     const label nFaces = zoneIds.size();
 
-    foamVtkOutput::legacy::dataHeader
+    vtk::legacy::dataHeader
     (
         format.os(),
-        vtkFileTag::CELL_DATA,
+        vtk::fileTag::CELL_DATA,
         nFaces,
         1  // Only one field
     );
 
-    foamVtkOutput::legacy::intField
+    vtk::legacy::intField
     (
         format.os(),
         "region",
@@ -120,7 +120,7 @@ void Foam::fileFormats::VTKsurfaceFormatCore::writeCellData
         nFaces
     );
 
-    foamVtkOutput::writeList(format, zoneIds);
+    vtk::writeList(format, zoneIds);
     format.flush();
 }
 
diff --git a/src/surfMesh/surfaceFormats/vtk/VTKsurfaceFormatCore.H b/src/surfMesh/surfaceFormats/vtk/VTKsurfaceFormatCore.H
index 3fdde4da2b..8b09942f87 100644
--- a/src/surfMesh/surfaceFormats/vtk/VTKsurfaceFormatCore.H
+++ b/src/surfMesh/surfaceFormats/vtk/VTKsurfaceFormatCore.H
@@ -58,21 +58,21 @@ protected:
         //- Write header information with points
         static void writeHeader
         (
-            foamVtkOutput::formatter& format,
+            vtk::formatter& format,
             const pointField& pts
         );
 
         //- Write regions (zones) information as CellData
         static void writeCellData
         (
-            foamVtkOutput::formatter& format,
+            vtk::formatter& format,
             const UList<surfZone>& zones
         );
 
         //- Write regions (zones) information as CellData
         static void writeCellData
         (
-            foamVtkOutput::formatter& format,
+            vtk::formatter& format,
             const labelUList& zoneIds
         );
 
diff --git a/src/surfMesh/surfaceFormats/vtp/VTPsurfaceFormat.C b/src/surfMesh/surfaceFormats/vtp/VTPsurfaceFormat.C
index 8a84d1b459..edab564775 100644
--- a/src/surfMesh/surfaceFormats/vtp/VTPsurfaceFormat.C
+++ b/src/surfMesh/surfaceFormats/vtp/VTPsurfaceFormat.C
@@ -35,9 +35,9 @@ License
 // - No append mode supported
 // - Legacy mode is dispatched via 'VTKsurfaceFormat' instead
 
-static const Foam::foamVtkOutput::formatType fmtType =
-    Foam::foamVtkOutput::formatType::INLINE_ASCII;
-    // Foam::foamVtkOutput::formatType::INLINE_BASE64;
+static const Foam::vtk::formatType fmtType =
+    Foam::vtk::formatType::INLINE_ASCII;
+    // Foam::vtk::formatType::INLINE_BASE64;
 
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
@@ -45,11 +45,11 @@ static const Foam::foamVtkOutput::formatType fmtType =
 template<class Face>
 void Foam::fileFormats::VTPsurfaceFormat<Face>::writePolys
 (
-    foamVtkOutput::formatter& format,
+    vtk::formatter& format,
     const UList<Face>& faces
 )
 {
-    format.tag(vtkFileTag::POLYS);
+    format.tag(vtk::fileTag::POLYS);
 
     //
     // 'connectivity'
@@ -61,14 +61,14 @@ void Foam::fileFormats::VTPsurfaceFormat<Face>::writePolys
             payLoad += f.size();
         }
 
-        format.openDataArray<label>("connectivity")
+        format.openDataArray<label>(vtk::dataArrayAttr::CONNECTIVITY)
             .closeTag();
 
         format.writeSize(payLoad * sizeof(label));
 
         for (const Face& f : faces)
         {
-            foamVtkOutput::writeList(format, f);
+            vtk::writeList(format, f);
         }
 
         format.flush();
@@ -83,7 +83,7 @@ void Foam::fileFormats::VTPsurfaceFormat<Face>::writePolys
         const uint64_t payLoad(faces.size() * sizeof(label));
 
         format
-            .openDataArray<label>("offsets")
+            .openDataArray<label>(vtk::dataArrayAttr::OFFSETS)
             .closeTag();
 
         format.writeSize(payLoad);
@@ -100,7 +100,7 @@ void Foam::fileFormats::VTPsurfaceFormat<Face>::writePolys
         format.endDataArray();
     }
 
-    format.endTag(vtkFileTag::POLYS);
+    format.endTag(vtk::fileTag::POLYS);
 }
 
 
@@ -135,14 +135,14 @@ void Foam::fileFormats::VTPsurfaceFormat<Face>::write
 
     std::ofstream os(filename.c_str(), std::ios::binary);
 
-    autoPtr<foamVtkOutput::formatter> format =
-        foamVtkOutput::newFormatter(os, fmtType);
+    autoPtr<vtk::formatter> format =
+        vtk::newFormatter(os, fmtType);
 
     writeHeader(format(), pointLst, faceLst.size());
 
     if (useFaceMap)
     {
-        format().tag(vtkFileTag::POLYS);
+        format().tag(vtk::fileTag::POLYS);
 
         //
         // 'connectivity'
@@ -154,7 +154,7 @@ void Foam::fileFormats::VTPsurfaceFormat<Face>::write
                 payLoad += f.size();
             }
 
-            format().openDataArray<label>("connectivity")
+            format().openDataArray<label>(vtk::dataArrayAttr::CONNECTIVITY)
                 .closeTag();
 
             format().writeSize(payLoad * sizeof(label));
@@ -166,7 +166,7 @@ void Foam::fileFormats::VTPsurfaceFormat<Face>::write
                 {
                     const Face& f = faceLst[faceMap[faceIndex++]];
 
-                    foamVtkOutput::writeList(format(), f);
+                    vtk::writeList(format(), f);
                 }
             }
 
@@ -182,7 +182,7 @@ void Foam::fileFormats::VTPsurfaceFormat<Face>::write
             const uint64_t payLoad(faceLst.size() * sizeof(label));
 
             format()
-                .openDataArray<label>("offsets")
+                .openDataArray<label>(vtk::dataArrayAttr::OFFSETS)
                     .closeTag();
 
             format().writeSize(payLoad);
@@ -204,7 +204,7 @@ void Foam::fileFormats::VTPsurfaceFormat<Face>::write
             format().endDataArray();
         }
 
-        format().endTag(vtkFileTag::POLYS);
+        format().endTag(vtk::fileTag::POLYS);
     }
     else
     {
@@ -231,8 +231,8 @@ void Foam::fileFormats::VTPsurfaceFormat<Face>::write
 {
     std::ofstream os(filename.c_str(), std::ios::binary);
 
-    autoPtr<foamVtkOutput::formatter> format =
-        foamVtkOutput::newFormatter(os, fmtType);
+    autoPtr<vtk::formatter> format =
+        vtk::newFormatter(os, fmtType);
 
     const List<Face>& faceLst = surf.surfFaces();
 
diff --git a/src/surfMesh/surfaceFormats/vtp/VTPsurfaceFormat.H b/src/surfMesh/surfaceFormats/vtp/VTPsurfaceFormat.H
index 1b4b4c642a..ebc35eca08 100644
--- a/src/surfMesh/surfaceFormats/vtp/VTPsurfaceFormat.H
+++ b/src/surfMesh/surfaceFormats/vtp/VTPsurfaceFormat.H
@@ -63,7 +63,7 @@ class VTPsurfaceFormat
         //- Write polygons
         static void writePolys
         (
-            foamVtkOutput::formatter& format,
+            vtk::formatter& format,
             const UList<Face>& faces
         );
 
diff --git a/src/surfMesh/surfaceFormats/vtp/VTPsurfaceFormatCore.C b/src/surfMesh/surfaceFormats/vtp/VTPsurfaceFormatCore.C
index 332b4e1b85..947b77d32f 100644
--- a/src/surfMesh/surfaceFormats/vtp/VTPsurfaceFormatCore.C
+++ b/src/surfMesh/surfaceFormats/vtp/VTPsurfaceFormatCore.C
@@ -31,7 +31,7 @@ License
 
 void Foam::fileFormats::VTPsurfaceFormatCore::writeHeader
 (
-    foamVtkOutput::formatter& format,
+    vtk::formatter& format,
     const pointField& pts,
     const label nFaces
 )
@@ -41,13 +41,13 @@ void Foam::fileFormats::VTPsurfaceFormatCore::writeHeader
     format
         .xmlHeader()
         .xmlComment("surface written " + clock::dateTime())
-        .beginVTKFile(vtkFileTag::POLY_DATA, "0.1");
+        .beginVTKFile(vtk::fileTag::POLY_DATA, "0.1");
 
     // <Piece>
     format
-        .openTag(vtkFileTag::PIECE)
-        ( "NumberOfPoints", pts.size() )
-        ( "NumberOfPolys",  nFaces )
+        .openTag(vtk::fileTag::PIECE)
+        .xmlAttr(vtk::fileAttr::NUMBER_OF_POINTS, pts.size())
+        .xmlAttr(vtk::fileAttr::NUMBER_OF_POLYS,  nFaces)
         .closeTag();
 
 
@@ -55,29 +55,29 @@ void Foam::fileFormats::VTPsurfaceFormatCore::writeHeader
 
     const uint64_t payLoad = (pts.size()*3* sizeof(float));
 
-    format.tag(vtkFileTag::POINTS)
-        .openDataArray<float, 3>(vtkFileTag::POINTS)
+    format.tag(vtk::fileTag::POINTS)
+        .openDataArray<float, 3>(vtk::dataArrayAttr::POINTS)
         .closeTag();
 
     format.writeSize(payLoad);
-    foamVtkOutput::writeList(format, pts);
+    vtk::writeList(format, pts);
     format.flush();
 
     format
         .endDataArray()
-        .endTag(vtkFileTag::POINTS);
+        .endTag(vtk::fileTag::POINTS);
 }
 
 
 void Foam::fileFormats::VTPsurfaceFormatCore::writeFooter
 (
-    foamVtkOutput::formatter& format
+    vtk::formatter& format
 )
 {
     // Slight cheat. </Piece> too
-    format.endTag(Foam::vtkFileTag::PIECE);
+    format.endTag(Foam::vtk::fileTag::PIECE);
 
-    format.endTag(vtkFileTag::POLY_DATA)
+    format.endTag(vtk::fileTag::POLY_DATA)
         .endVTKFile();
 }
 
@@ -85,7 +85,7 @@ void Foam::fileFormats::VTPsurfaceFormatCore::writeFooter
 
 void Foam::fileFormats::VTPsurfaceFormatCore::writeCellData
 (
-    foamVtkOutput::formatter& format,
+    vtk::formatter& format,
     const UList<surfZone>& zones
 )
 {
@@ -98,7 +98,7 @@ void Foam::fileFormats::VTPsurfaceFormatCore::writeCellData
         payLoad += z.size();
     }
 
-    format.tag(vtkFileTag::CELL_DATA);
+    format.tag(vtk::fileTag::CELL_DATA);
     format.openDataArray<label>("region")
         .closeTag();
 
@@ -117,31 +117,31 @@ void Foam::fileFormats::VTPsurfaceFormatCore::writeCellData
     format.flush();
     format.endDataArray();
 
-    format.endTag(vtkFileTag::CELL_DATA);
+    format.endTag(vtk::fileTag::CELL_DATA);
 }
 
 
 void Foam::fileFormats::VTPsurfaceFormatCore::writeCellData
 (
-    foamVtkOutput::formatter& format,
+    vtk::formatter& format,
     const labelUList& zoneIds
 )
 {
     // Zone ids as CellData
 
-    format.tag(vtkFileTag::CELL_DATA);
+    format.tag(vtk::fileTag::CELL_DATA);
     format.openDataArray<label>("region")
         .closeTag();
 
     const uint64_t payLoad(zoneIds.size() * sizeof(label));
 
     format.writeSize(payLoad);
-    foamVtkOutput::writeList(format, zoneIds);
+    vtk::writeList(format, zoneIds);
 
     format.flush();
     format.endDataArray();
 
-    format.endTag(vtkFileTag::CELL_DATA);
+    format.endTag(vtk::fileTag::CELL_DATA);
 
 }
 
diff --git a/src/surfMesh/surfaceFormats/vtp/VTPsurfaceFormatCore.H b/src/surfMesh/surfaceFormats/vtp/VTPsurfaceFormatCore.H
index 32e03e2107..4b4a3ad85d 100644
--- a/src/surfMesh/surfaceFormats/vtp/VTPsurfaceFormatCore.H
+++ b/src/surfMesh/surfaceFormats/vtp/VTPsurfaceFormatCore.H
@@ -58,26 +58,26 @@ protected:
         //- Write file header information with points
         static void writeHeader
         (
-            foamVtkOutput::formatter& format,
+            vtk::formatter& format,
             const pointField& pts,
             const label nFaces
         );
 
         //- Write file footer
-        static void writeFooter(foamVtkOutput::formatter& format);
+        static void writeFooter(vtk::formatter& format);
 
 
         //- Write regions (zones) information as CellData
         static void writeCellData
         (
-            foamVtkOutput::formatter& format,
+            vtk::formatter& format,
             const UList<surfZone>& zones
         );
 
         //- Write regions (zones) information as CellData
         static void writeCellData
         (
-            foamVtkOutput::formatter& format,
+            vtk::formatter& format,
             const labelUList& zoneIds
         );
 };
diff --git a/src/surfMesh/triSurface/interfaces/VTK/writeVTK.C b/src/surfMesh/triSurface/interfaces/VTK/writeVTK.C
index a9207eb219..047a5c53a7 100644
--- a/src/surfMesh/triSurface/interfaces/VTK/writeVTK.C
+++ b/src/surfMesh/triSurface/interfaces/VTK/writeVTK.C
@@ -33,9 +33,9 @@ License
 // TODO: make this run-time selectable (ASCII | BINARY)
 // - Legacy mode only
 
-static const Foam::foamVtkOutput::formatType fmtType =
-    Foam::foamVtkOutput::formatType::LEGACY_ASCII;
-    // Foam::foamVtkOutput::formatType::LEGACY_BASE64;
+static const Foam::vtk::formatType fmtType =
+    Foam::vtk::formatType::LEGACY_ASCII;
+    // Foam::vtk::formatType::LEGACY_BINARY;
 
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
@@ -46,15 +46,15 @@ void Foam::triSurface::writeVTK
     std::ostream& os
 ) const
 {
-    autoPtr<foamVtkOutput::formatter> format =
-        foamVtkOutput::newFormatter(os, fmtType);
+    autoPtr<vtk::formatter> format =
+        vtk::newFormatter(os, fmtType);
 
     // Header
-    foamVtkOutput::legacy::fileHeader
+    vtk::legacy::fileHeader
     (
         format(),
         "triSurface",
-        vtkFileTag::POLY_DATA
+        vtk::fileTag::POLY_DATA
     );
 
     const pointField& pts = this->points();
@@ -63,15 +63,15 @@ void Foam::triSurface::writeVTK
     const label nFaces = faceLst.size();
 
     // Points
-    foamVtkOutput::legacy::beginPoints(os, pts.size());
+    vtk::legacy::beginPoints(os, pts.size());
 
-    foamVtkOutput::writeList(format(), pts);
+    vtk::writeList(format(), pts);
     format().flush();
 
     // connectivity count (without additional storage)
     // is simply 3 * nFaces
 
-    foamVtkOutput::legacy::beginPolys(os, nFaces, 3*nFaces);
+    vtk::legacy::beginPolys(os, nFaces, 3*nFaces);
 
     labelList faceMap;
     surfacePatchList patches(calcPatches(faceMap));
@@ -88,7 +88,7 @@ void Foam::triSurface::writeVTK
                 const Face& f = faceLst[faceMap[faceIndex++]];
 
                 format().write(3);  // The size prefix
-                foamVtkOutput::writeList(format(), f);
+                vtk::writeList(format(), f);
             }
         }
         format().flush();
@@ -97,15 +97,15 @@ void Foam::triSurface::writeVTK
         // Write regions (zones) as CellData
         if (patches.size() > 1)
         {
-            foamVtkOutput::legacy::dataHeader
+            vtk::legacy::dataHeader
             (
                 os,
-                vtkFileTag::CELL_DATA,
+                vtk::fileTag::CELL_DATA,
                 nFaces,
                 1  // Only one field
             );
 
-            foamVtkOutput::legacy::intField
+            vtk::legacy::intField
             (
                 os,
                 "region",
@@ -132,22 +132,22 @@ void Foam::triSurface::writeVTK
         for (const Face& f : faceLst)
         {
             format().write(3);  // The size prefix
-            foamVtkOutput::writeList(format(), f);
+            vtk::writeList(format(), f);
         }
         format().flush();
 
 
         // Write regions (zones) as CellData
 
-        foamVtkOutput::legacy::dataHeader
+        vtk::legacy::dataHeader
         (
             os,
-            vtkFileTag::CELL_DATA,
+            vtk::fileTag::CELL_DATA,
             faceLst.size(),
             1  // Only one field
         );
 
-        foamVtkOutput::legacy::intField
+        vtk::legacy::intField
         (
             os,
             "region",

From 7ee1dba43ad55122b4787b7cffd458d22c401be4 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Tue, 13 Jun 2017 22:28:39 +0200
Subject: [PATCH 22/27] STYLE: adjust feedback comments in foamToVTK

---
 .../dataConversion/foamToVTK/foamToVTK.C      | 56 +++++++++----------
 1 file changed, 25 insertions(+), 31 deletions(-)

diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK.C b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK.C
index cb5ab87414..4ea7887a59 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK.C
+++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK.C
@@ -122,10 +122,7 @@ Note
 
     \verbatim
       <?xml version="1.0"?>
-      <VTKFile type="Collection"
-           version="0.1"
-           byte_order="LittleEndian"
-           compressor="vtkZLibDataCompressor">
+      <VTKFile type="Collection" version="0.1" byte_order="LittleEndian">
         <Collection>
           <DataSet timestep="50" file="pitzDaily_2.vtu"/>
           <DataSet timestep="100" file="pitzDaily_3.vtu"/>
@@ -261,7 +258,7 @@ vtk::outputOptions getOutputOptions(const argList& args)
                 opts.ascii(true);
 
                 WarningInFunction
-                    << "Using ASCII rather than binary VTK format since "
+                    << "Using ASCII rather than legacy binary VTK format since "
                     << "floatScalar and/or label are not 4 bytes in size."
                     << nl << endl;
             }
@@ -434,8 +431,9 @@ int main(int argc, char *argv[])
 
     if (noPointValues)
     {
-        WarningInFunction
-            << "Outputting cell values only" << nl << endl;
+        Info<< "Outputting cell values only."
+            << " Point fields disabled by '-noPointValues' option"
+            << nl;
     }
 
     const bool allPatches = args.optionFound("allPatches");
@@ -676,11 +674,13 @@ int main(int argc, char *argv[])
         }
 
         const label nVolFields =
-                vScalarFld.size()
-              + vVectorFld.size()
-              + vSphTensorf.size()
-              + vSymTensorFld.size()
-              + vTensorFld.size();
+        (
+            vScalarFld.size()
+          + vVectorFld.size()
+          + vSphTensorf.size()
+          + vSymTensorFld.size()
+          + vTensorFld.size()
+        );
 
 
         // Construct dimensioned fields
@@ -744,29 +744,23 @@ int main(int argc, char *argv[])
         }
 
         const label nDimFields =
-                dScalarFld.size()
-              + dVectorFld.size()
-              + dSphTensorFld.size()
-              + dSymTensorFld.size()
-              + dTensorFld.size();
+        (
+            dScalarFld.size()
+          + dVectorFld.size()
+          + dSphTensorFld.size()
+          + dSymTensorFld.size()
+          + dTensorFld.size()
+        );
 
 
-        // Construct pointMesh only if necessary since constructs edge
-        // addressing (expensive on polyhedral meshes)
-        if (noPointValues)
-        {
-            Info<< "    pointScalarFields : switched off"
-                << " (\"-noPointValues\" (at your option)\n";
-            Info<< "    pointVectorFields : switched off"
-                << " (\"-noPointValues\" (at your option)\n";
-        }
-
         PtrList<const pointScalarField> pScalarFld;
         PtrList<const pointVectorField> pVectorFld;
         PtrList<const pointSphericalTensorField> pSphTensorFld;
         PtrList<const pointSymmTensorField> pSymTensorFld;
         PtrList<const pointTensorField> pTensorFld;
 
+        // Construct pointMesh only if necessary since it constructs edge
+        // addressing (expensive on polyhedral meshes)
         if (!noPointValues && !(specifiedFields && selectedFields.empty()))
         {
             readFields
@@ -797,7 +791,7 @@ int main(int argc, char *argv[])
                 selectedFields,
                 pSphTensorFld
             );
-            print("    pointSphericalTensor :", Info, pSphTensorFld);
+            print("    pointSphTensor       : ", Info, pSphTensorFld);
 
             readFields
             (
@@ -819,7 +813,6 @@ int main(int argc, char *argv[])
             );
             print("    pointTensor          :", Info, pTensorFld);
         }
-        Info<< endl;
 
         const label nPointFields =
             pScalarFld.size()
@@ -901,6 +894,7 @@ int main(int argc, char *argv[])
 
                 // Interpolated volFields
                 volPointInterpolation pInterp(mesh);
+
                 writer.write(pInterp, vScalarFld);
                 writer.write(pInterp, vVectorFld);
                 writer.write(pInterp, vSphTensorf);
@@ -1051,8 +1045,8 @@ int main(int argc, char *argv[])
                 writer.write(pSymTensorFld);
                 writer.write(pTensorFld);
 
-                // no interpolated volFields since I cannot be bothered to
-                // create the patchInterpolation for all subpatches.
+                // no interpolated volFields to avoid creating
+                // patchInterpolation for all subpatches.
 
                 writer.endPointData();
             }

From 82211112452cfd6da3d8e9e586e14c5d01856b0f Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Tue, 13 Jun 2017 23:59:11 +0200
Subject: [PATCH 23/27] STYLE: pass legacy nCmpt as int

---
 src/fileFormats/vtk/output/foamVtkOutput.H          | 4 ++--
 src/fileFormats/vtk/output/foamVtkOutputI.H         | 4 ++--
 src/fileFormats/vtk/output/foamVtkOutputTemplates.C | 3 ++-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/fileFormats/vtk/output/foamVtkOutput.H b/src/fileFormats/vtk/output/foamVtkOutput.H
index 4dd909219d..c3632a1191 100644
--- a/src/fileFormats/vtk/output/foamVtkOutput.H
+++ b/src/fileFormats/vtk/output/foamVtkOutput.H
@@ -199,7 +199,7 @@ namespace legacy
     (
         std::ostream& os,
         const word& name,
-        const label nCmpt,
+        const int nCmpt,
         const label nEntries
     );
 
@@ -208,7 +208,7 @@ namespace legacy
     (
         std::ostream& os,
         const word& name,
-        const label nCmpt,
+        const int nCmpt,
         const label nEntries
     );
 
diff --git a/src/fileFormats/vtk/output/foamVtkOutputI.H b/src/fileFormats/vtk/output/foamVtkOutputI.H
index 9618bae2ab..b7717ea66d 100644
--- a/src/fileFormats/vtk/output/foamVtkOutputI.H
+++ b/src/fileFormats/vtk/output/foamVtkOutputI.H
@@ -123,7 +123,7 @@ inline void Foam::vtk::legacy::floatField
 (
     std::ostream& os,
     const word& fieldName,
-    const label nCmpt,
+    const int nCmpt,
     const label nEntries
 )
 {
@@ -135,7 +135,7 @@ inline void Foam::vtk::legacy::intField
 (
     std::ostream& os,
     const word& fieldName,
-    const label nCmpt,
+    const int nCmpt,
     const label nEntries
 )
 {
diff --git a/src/fileFormats/vtk/output/foamVtkOutputTemplates.C b/src/fileFormats/vtk/output/foamVtkOutputTemplates.C
index a60d01e52e..f28d458378 100644
--- a/src/fileFormats/vtk/output/foamVtkOutputTemplates.C
+++ b/src/fileFormats/vtk/output/foamVtkOutputTemplates.C
@@ -32,7 +32,8 @@ inline void Foam::vtk::write
     const Type& val
 )
 {
-    for (direction cmpt=0; cmpt < pTraits<Type>::nComponents; ++cmpt)
+    const direction nCmpt = pTraits<Type>::nComponents;
+    for (direction cmpt=0; cmpt < nCmpt; ++cmpt)
     {
         fmt.write(component(val, cmpt));
     }

From 2a72baf29f8979173d262d3a8678814c06be0a74 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Wed, 14 Jun 2017 00:28:58 +0200
Subject: [PATCH 24/27] ENH: support direct writing of fields from
 vtk::internalWriter

- eliminates the PtrList requirement (more flexible)

COMP: use tmp intermediate for volPointInterpolation return value

- gcc 4.8.5 had some weird issue of otherwise not binding a const-ref.
  (in foamVtkInternalWriterTemplates.C)
---
 .../vtk/output/foamVtkInternalWriter.H        |  64 ++--
 .../output/foamVtkInternalWriterTemplates.C   | 290 ++++++++++--------
 2 files changed, 199 insertions(+), 155 deletions(-)

diff --git a/src/conversion/vtk/output/foamVtkInternalWriter.H b/src/conversion/vtk/output/foamVtkInternalWriter.H
index 2751cd6785..7fd4aa4f5d 100644
--- a/src/conversion/vtk/output/foamVtkInternalWriter.H
+++ b/src/conversion/vtk/output/foamVtkInternalWriter.H
@@ -153,7 +153,44 @@ public:
         void writeFooter();
 
 
-        //- Write internal fields
+      // Write fields (individually)
+
+        //- Write the internal field
+        template<class Type>
+        void write(const DimensionedField<Type, volMesh>& field);
+
+        //- Write the volume field (internal part)
+        template<class Type, template<class> class PatchField>
+        void write(const GeometricField<Type, PatchField, volMesh>& field);
+
+        //- Write the point field
+        //  Interpolate to originating cell centre for decomposed cells.
+        template<class Type, template<class> class PatchField>
+        void write
+        (
+            const GeometricField<Type, PatchField, pointMesh>& field
+        );
+
+        //- Write point-interpolated internal field
+        template<class Type>
+        void write
+        (
+            const volPointInterpolation& pInterp,
+            const DimensionedField<Type, volMesh>& vfield
+        );
+
+        //- Write point-interpolated volume field
+        template<class Type>
+        void write
+        (
+            const volPointInterpolation& pInterp,
+            const GeometricField<Type, fvPatchField, volMesh>& vfield
+        );
+
+
+      // Write fields (collectively)
+
+        //- Write multiple internal fields
         template<class Type>
         void write
         (
@@ -163,29 +200,18 @@ public:
             >& flds
         );
 
-        //- Write volFields
-        template<class Type, template<class> class PatchField>
+        //- Write multiple volume/point fields
+        template<class Type, template<class> class PatchField, class GeoMesh>
         void write
         (
             const UPtrList
             <
-                const GeometricField<Type, PatchField, volMesh>
-            >& flds
-        );
-
-        //- Write pointFields on all mesh points.
-        //  Interpolate to cell centre for decomposed cell centres.
-        template<class Type, template<class> class PatchField>
-        void write
-        (
-            const UPtrList
-            <
-                const GeometricField<Type, PatchField, pointMesh>
+                const GeometricField<Type, PatchField, GeoMesh>
             >& flds
         );
 
 
-        //- Interpolated internal fields
+        //- Write multiple point-interpolated internal fields
         template<class Type>
         void write
         (
@@ -196,14 +222,14 @@ public:
             >& flds
         );
 
-        //- Interpolated volFields
-        template<class Type, template<class> class PatchField>
+        //- Write multiple point-interpolated volume fields
+        template<class Type>
         void write
         (
             const volPointInterpolation& pInterp,
             const UPtrList
             <
-                const GeometricField<Type, PatchField, volMesh>
+                const GeometricField<Type, fvPatchField, volMesh>
             >& flds
         );
 
diff --git a/src/conversion/vtk/output/foamVtkInternalWriterTemplates.C b/src/conversion/vtk/output/foamVtkInternalWriterTemplates.C
index c316c36d14..77689e5ec7 100644
--- a/src/conversion/vtk/output/foamVtkInternalWriterTemplates.C
+++ b/src/conversion/vtk/output/foamVtkInternalWriterTemplates.C
@@ -33,7 +33,7 @@ License
 template<class Type>
 void Foam::vtk::internalWriter::write
 (
-    const UPtrList<const DimensionedField<Type, volMesh>>& flds
+    const DimensionedField<Type, volMesh>& field
 )
 {
     const labelList& cellMap = vtuCells_.cellMap();
@@ -41,27 +41,22 @@ void Foam::vtk::internalWriter::write
     const int nCmpt(pTraits<Type>::nComponents);
     // const uint64_t payLoad(cellMap.size() * nCmpt * sizeof(float));
 
-    forAll(flds, i)
+    if (legacy_)
     {
-        const auto& fld = flds[i];
+        legacy::floatField(os(), field.name(), nCmpt, cellMap.size());
+    }
+    else
+    {
+        format().openDataArray<float, nCmpt>(field.name())
+            .closeTag();
+    }
 
-        if (legacy_)
-        {
-            legacy::floatField(os(), fld.name(), nCmpt, cellMap.size());
-        }
-        else
-        {
-            format().openDataArray<float, nCmpt>(fld.name())
-                .closeTag();
-        }
+    // writeField includes payload size, and flush
+    vtk::writeField(format(), field, cellMap);
 
-        // writeField includes payload size
-        vtk::writeField(format(), fld, cellMap);
-
-        if (!legacy_)
-        {
-            format().endDataArray();
-        }
+    if (!legacy_)
+    {
+        format().endDataArray();
     }
 }
 
@@ -69,82 +64,163 @@ void Foam::vtk::internalWriter::write
 template<class Type, template<class> class PatchField>
 void Foam::vtk::internalWriter::write
 (
-    const UPtrList<const GeometricField<Type, PatchField, volMesh>>& flds
+    const GeometricField<Type, PatchField, volMesh>& field
 )
 {
-    const labelList& cellMap = vtuCells_.cellMap();
-
-    const int nCmpt(pTraits<Type>::nComponents);
-    // const uint64_t payLoad(cellMap.size() * nCmpt * sizeof(float));
-
-    forAll(flds, i)
-    {
-        const auto& fld = flds[i];
-
-        if (legacy_)
-        {
-            legacy::floatField(os(), fld.name(), nCmpt, cellMap.size());
-        }
-        else
-        {
-            format().openDataArray<float, nCmpt>(fld.name())
-                .closeTag();
-        }
-
-        // writeField includes payload size
-        vtk::writeField(format(), fld, cellMap);
-
-        if (!legacy_)
-        {
-            format().endDataArray();
-        }
-    }
+    write(field.internalField());
 }
 
 
 template<class Type, template<class> class PatchField>
 void Foam::vtk::internalWriter::write
 (
-    const UPtrList<const GeometricField<Type, PatchField, pointMesh>>& flds
+    const GeometricField<Type, PatchField, pointMesh>& field
 )
 {
     const labelList& addPointCellLabels = vtuCells_.addPointCellLabels();
 
     const int nCmpt(pTraits<Type>::nComponents);
-    const int nVals(vtuCells_.nFieldPoints());
+    const label nVals(vtuCells_.nFieldPoints());
 
     // Only needed for non-legacy
     const uint64_t payLoad(nVals * nCmpt * sizeof(float));
 
-    forAll(flds, i)
+    if (legacy_)
     {
-        const auto& fld = flds[i];
+        legacy::floatField(os(), field.name(), nCmpt, nVals);
+    }
+    else
+    {
+        format().openDataArray<float, nCmpt>(field.name())
+            .closeTag();
+    }
 
-        if (legacy_)
-        {
-            legacy::floatField(os(), fld.name(), nCmpt, nVals);
-        }
-        else
-        {
-            format().openDataArray<float, nCmpt>(fld.name())
-                .closeTag();
-        }
+    format().writeSize(payLoad);
+    vtk::writeList(format(), field);
 
-        format().writeSize(payLoad);
-        vtk::writeList(format(), fld);
+    for (const label cellId : addPointCellLabels)
+    {
+        const Type val = interpolatePointToCell(field, cellId);
+        vtk::write(format(), val);
+    }
 
-        forAll(addPointCellLabels, i)
-        {
-            const Type val = interpolatePointToCell(fld, addPointCellLabels[i]);
-            vtk::write(format(), val);
-        }
+    format().flush();
 
-        format().flush();
+    if (!legacy_)
+    {
+        format().endDataArray();
+    }
+}
 
-        if (!legacy_)
-        {
-            format().endDataArray();
-        }
+
+template<class Type>
+void Foam::vtk::internalWriter::write
+(
+    const volPointInterpolation& pInterp,
+    const DimensionedField<Type, volMesh>& vfield
+)
+{
+    typedef DimensionedField<Type, pointMesh> PointFieldType;
+
+    // Use tmp intermediate. Compiler sometimes weird otherwise.
+    tmp<PointFieldType> tfield = pInterp.interpolate(vfield);
+    const PointFieldType& pfield = tfield();
+
+    const labelList& addPointCellLabels = vtuCells_.addPointCellLabels();
+
+    const int nCmpt(pTraits<Type>::nComponents);
+    const label nVals(vtuCells_.nFieldPoints());
+
+    // Only needed for non-legacy
+    const uint64_t payLoad(nVals * nCmpt * sizeof(float));
+
+    if (legacy_)
+    {
+        legacy::floatField(os(), vfield.name(), nCmpt, nVals);
+    }
+    else
+    {
+        format().openDataArray<float, nCmpt>(vfield.name())
+            .closeTag();
+    }
+
+    format().writeSize(payLoad);
+    vtk::writeList(format(), pfield);
+    vtk::writeList(format(), vfield, addPointCellLabels);
+    format().flush();
+
+    if (!legacy_)
+    {
+        format().endDataArray();
+    }
+}
+
+
+template<class Type>
+void Foam::vtk::internalWriter::write
+(
+    const volPointInterpolation& pInterp,
+    const GeometricField<Type, fvPatchField, volMesh>& vfield
+)
+{
+    typedef GeometricField<Type, pointPatchField, pointMesh> PointFieldType;
+
+    // Use tmp intermediate. Compiler sometimes weird otherwise.
+    tmp<PointFieldType> tfield = pInterp.interpolate(vfield);
+    const PointFieldType& pfield = tfield();
+
+    const labelList& addPointCellLabels = vtuCells_.addPointCellLabels();
+
+    const int nCmpt(pTraits<Type>::nComponents);
+    const label nVals(vtuCells_.nFieldPoints());
+
+    // Only needed for non-legacy
+    const uint64_t payLoad(nVals * nCmpt * sizeof(float));
+
+    if (legacy_)
+    {
+        legacy::floatField(os(), vfield.name(), nCmpt, nVals);
+    }
+    else
+    {
+        format().openDataArray<float, nCmpt>(vfield.name())
+            .closeTag();
+    }
+
+    format().writeSize(payLoad);
+    vtk::writeList(format(), pfield);
+    vtk::writeList(format(), vfield, addPointCellLabels);
+    format().flush();
+
+    if (!legacy_)
+    {
+        format().endDataArray();
+    }
+}
+
+
+template<class Type>
+void Foam::vtk::internalWriter::write
+(
+    const UPtrList<const DimensionedField<Type, volMesh>>& flds
+)
+{
+    for (const auto& field : flds)
+    {
+        write(field);
+    }
+}
+
+
+template<class Type, template<class> class PatchField, class GeoMesh>
+void Foam::vtk::internalWriter::write
+(
+    const UPtrList<const GeometricField<Type, PatchField, GeoMesh>>& flds
+)
+{
+    for (const auto& field : flds)
+    {
+        write(field);
     }
 }
 
@@ -156,81 +232,23 @@ void Foam::vtk::internalWriter::write
     const UPtrList<const DimensionedField<Type, volMesh>>& flds
 )
 {
-    const labelList& addPointCellLabels = vtuCells_.addPointCellLabels();
-
-    const int nCmpt(pTraits<Type>::nComponents);
-    const int nVals(vtuCells_.nFieldPoints());
-
-    // Only needed for non-legacy
-    const uint64_t payLoad(nVals * nCmpt * sizeof(float));
-
-    forAll(flds, i)
+    for (const auto& field : flds)
     {
-        const auto& vfield = flds[i];
-        const auto& pfield = pInterp.interpolate(vfield)();
-
-        if (legacy_)
-        {
-            legacy::floatField(os(), vfield.name(), nCmpt, nVals);
-        }
-        else
-        {
-            format().openDataArray<float, nCmpt>(vfield.name())
-                .closeTag();
-        }
-
-        format().writeSize(payLoad);
-        vtk::writeList(format(), pfield);
-        vtk::writeList(format(), vfield, addPointCellLabels);
-        format().flush();
-
-        if (!legacy_)
-        {
-            format().endDataArray();
-        }
+        write(pInterp, field);
     }
 }
 
 
-template<class Type, template<class> class PatchField>
+template<class Type>
 void Foam::vtk::internalWriter::write
 (
     const volPointInterpolation& pInterp,
-    const UPtrList<const GeometricField<Type, PatchField, volMesh>>& flds
+    const UPtrList<const GeometricField<Type, fvPatchField, volMesh>>& flds
 )
 {
-    const labelList& addPointCellLabels = vtuCells_.addPointCellLabels();
-
-    const int nCmpt(pTraits<Type>::nComponents);
-    const int nVals(vtuCells_.nFieldPoints());
-
-    // Only needed for non-legacy
-    const uint64_t payLoad(nVals * nCmpt * sizeof(float));
-
-    forAll(flds, i)
+    for (const auto& field : flds)
     {
-        const auto& vfield = flds[i];
-        const auto& pfield = pInterp.interpolate(vfield)();
-
-        if (legacy_)
-        {
-            legacy::floatField(os(), vfield.name(), nCmpt, nVals);
-        }
-        else
-        {
-            format().openDataArray<float, nCmpt>(vfield.name())
-                .closeTag();
-        }
-
-        format().writeSize(payLoad);
-        vtk::writeList(format(), pfield);
-        vtk::writeList(format(), vfield, addPointCellLabels);
-        format().flush();
-
-        if (!legacy_)
-        {
-            format().endDataArray();
-        }
+        write(pInterp, field);
     }
 }
 

From df5b009708c82130c5e94dbb7b0353750ed5ff34 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Wed, 14 Jun 2017 00:53:51 +0200
Subject: [PATCH 25/27] ENH: support direct writing of fields from
 vtk::patchWriter

- eliminates the PtrList requirement (more flexible)
---
 .../vtk/output/foamVtkPatchWriter.C           |  35 ++--
 .../vtk/output/foamVtkPatchWriter.H           |  37 ++--
 .../vtk/output/foamVtkPatchWriterTemplates.C  | 192 ++++++++++--------
 .../vtk/output/foamVtkSurfaceMeshWriter.H     |  15 +-
 .../foamVtkSurfaceMeshWriterTemplates.C       |  58 +++---
 5 files changed, 189 insertions(+), 148 deletions(-)

diff --git a/src/conversion/vtk/output/foamVtkPatchWriter.C b/src/conversion/vtk/output/foamVtkPatchWriter.C
index ebaef3ce86..fcbe032cfd 100644
--- a/src/conversion/vtk/output/foamVtkPatchWriter.C
+++ b/src/conversion/vtk/output/foamVtkPatchWriter.C
@@ -61,9 +61,9 @@ void Foam::vtk::patchWriter::writePoints()
 
     format().writeSize(payLoad);
 
-    forAll(patchIDs_, i)
+    for (const label patchId : patchIDs_)
     {
-        const polyPatch& pp = patches[patchIDs_[i]];
+        const polyPatch& pp = patches[patchId];
 
         vtk::writeList(format(), pp.localPoints());
     }
@@ -84,9 +84,9 @@ void Foam::vtk::patchWriter::writePolysLegacy()
 
     // connectivity count without additional storage (done internally)
     uint64_t nConnectivity = 0;
-    forAll(patchIDs_, i)
+    for (const label patchId : patchIDs_)
     {
-        const polyPatch& pp = patches[patchIDs_[i]];
+        const polyPatch& pp = patches[patchId];
 
         forAll(pp, facei)
         {
@@ -101,9 +101,9 @@ void Foam::vtk::patchWriter::writePolysLegacy()
     // [nPts, id1, id2, ..., nPts, id1, id2, ...]
 
     label off = 0;
-    forAll(patchIDs_, i)
+    for (const label patchId : patchIDs_)
     {
-        const polyPatch& pp = patches[patchIDs_[i]];
+        const polyPatch& pp = patches[patchId];
 
         forAll(pp, facei)
         {
@@ -138,14 +138,13 @@ void Foam::vtk::patchWriter::writePolys()
     {
         // payload count
         uint64_t payLoad = 0;
-        forAll(patchIDs_, i)
+        for (const label patchId : patchIDs_)
         {
-            const polyPatch& pp = patches[patchIDs_[i]];
+            const polyPatch& pp = patches[patchId];
 
             forAll(pp, facei)
             {
-                const face& f = pp.localFaces()[facei];
-                payLoad += f.size();
+                payLoad += pp[facei].size();
             }
         }
 
@@ -156,9 +155,9 @@ void Foam::vtk::patchWriter::writePolys()
         format().writeSize(payLoad * sizeof(label));
 
         label off = 0;
-        forAll(patchIDs_, i)
+        for (const label patchId : patchIDs_)
         {
-            const polyPatch& pp = patches[patchIDs_[i]];
+            const polyPatch& pp = patches[patchId];
 
             forAll(pp, facei)
             {
@@ -191,9 +190,9 @@ void Foam::vtk::patchWriter::writePolys()
         format().writeSize(nFaces_ * sizeof(label));
 
         label off = 0;
-        forAll(patchIDs_, i)
+        for (const label patchId : patchIDs_)
         {
-            const polyPatch& pp = patches[patchIDs_[i]];
+            const polyPatch& pp = patches[patchId];
 
             forAll(pp, facei)
             {
@@ -262,9 +261,9 @@ Foam::vtk::patchWriter::patchWriter
 
     // Basic sizes
     nPoints_ = nFaces_ = 0;
-    forAll(patchIDs_, i)
+    for (const label patchId : patchIDs_)
     {
-        const polyPatch& pp = patches[patchIDs_[i]];
+        const polyPatch& pp = patches[patchId];
 
         nPoints_ += pp.nPoints();
         nFaces_  += pp.size();
@@ -384,10 +383,8 @@ void Foam::vtk::patchWriter::writePatchIDs()
 
     format().writeSize(payLoad);
 
-    forAll(patchIDs_, i)
+    for (const label patchId : patchIDs_)
     {
-        const label patchId = patchIDs_[i];
-
         const label sz = mesh_.boundaryMesh()[patchId].size();
 
         for (label facei = 0; facei < sz; ++facei)
diff --git a/src/conversion/vtk/output/foamVtkPatchWriter.H b/src/conversion/vtk/output/foamVtkPatchWriter.H
index 76b21ea436..627b847882 100644
--- a/src/conversion/vtk/output/foamVtkPatchWriter.H
+++ b/src/conversion/vtk/output/foamVtkPatchWriter.H
@@ -167,27 +167,38 @@ public:
         void writeFooter();
 
 
-        //- Write volFields
+      // Write fields (individually)
+
+        //- Write volume field
         template<class Type, template<class> class PatchField>
+        void write(const GeometricField<Type, PatchField, volMesh>& field);
+
+        //- Write point fields
+        template<class Type, template<class> class PatchField>
+        void write(const GeometricField<Type, PatchField, pointMesh>& field);
+
+        //- Write point-interpolated volume field
+        template<class Type>
+        void write
+        (
+            const PrimitivePatchInterpolation<primitivePatch>& pInterp,
+            const GeometricField<Type, fvPatchField, volMesh>& field
+        );
+
+
+      // Write fields (collectively)
+
+        //- Write multiple volume/point fields
+        template<class Type, template<class> class PatchField, class GeoMesh>
         void write
         (
             const UPtrList
             <
-                const GeometricField<Type, PatchField, volMesh>
+                const GeometricField<Type, PatchField, GeoMesh>
             >& flds
         );
 
-        //- Write pointFields
-        template<class Type, template<class> class PatchField>
-        void write
-        (
-            const UPtrList
-            <
-                const GeometricField<Type, PatchField, pointMesh>
-            >&
-        );
-
-        //- Interpolated volFields
+        //- Write multiple point-interpolated volume fields
         template<class Type>
         void write
         (
diff --git a/src/conversion/vtk/output/foamVtkPatchWriterTemplates.C b/src/conversion/vtk/output/foamVtkPatchWriterTemplates.C
index 58fbadffb6..9c77912499 100644
--- a/src/conversion/vtk/output/foamVtkPatchWriterTemplates.C
+++ b/src/conversion/vtk/output/foamVtkPatchWriterTemplates.C
@@ -31,48 +31,43 @@ License
 template<class Type, template<class> class PatchField>
 void Foam::vtk::patchWriter::write
 (
-    const UPtrList<const GeometricField<Type, PatchField, volMesh>>& flds
+    const GeometricField<Type, PatchField, volMesh>& field
 )
 {
     const int nCmpt(pTraits<Type>::nComponents);
     const uint64_t payLoad(nFaces_ * nCmpt * sizeof(float));
 
-    forAll(flds, fieldi)
+    if (legacy_)
     {
-        const auto& fld = flds[fieldi];
+        legacy::floatField(os_, field.name(), nCmpt, nFaces_);
+    }
+    else
+    {
+        format().openDataArray<float, nCmpt>(field.name())
+            .closeTag();
+    }
 
-        if (legacy_)
+    format().writeSize(payLoad);
+
+    for (const label patchId : patchIDs_)
+    {
+        const auto& pfld = field.boundaryField()[patchId];
+
+        if (nearCellValue_)
         {
-            legacy::floatField(os_, fld.name(), nCmpt, nFaces_);
+            vtk::writeList(format(), pfld.patchInternalField()());
         }
         else
         {
-            format().openDataArray<float, nCmpt>(fld.name())
-                .closeTag();
+            vtk::writeList(format(), pfld);
         }
+    }
 
-        format().writeSize(payLoad);
+    format().flush();
 
-        forAll(patchIDs_, i)
-        {
-            const auto& pfld = fld.boundaryField()[patchIDs_[i]];
-
-            if (nearCellValue_)
-            {
-                vtk::writeList(format(), pfld.patchInternalField()());
-            }
-            else
-            {
-                vtk::writeList(format(), pfld);
-            }
-        }
-
-        format().flush();
-
-        if (!legacy_)
-        {
-            format().endDataArray();
-        }
+    if (!legacy_)
+    {
+        format().endDataArray();
     }
 }
 
@@ -80,41 +75,99 @@ void Foam::vtk::patchWriter::write
 template<class Type, template<class> class PatchField>
 void Foam::vtk::patchWriter::write
 (
-    const UPtrList<const GeometricField<Type, PatchField, pointMesh>>& flds
+    const GeometricField<Type, PatchField, pointMesh>& field
 )
 {
     const int nCmpt(pTraits<Type>::nComponents);
     const uint64_t payLoad(nPoints_ * nCmpt * sizeof(float));
 
-    forAll(flds, fieldi)
+    if (legacy_)
     {
-        const auto& fld = flds[fieldi];
+        legacy::floatField(os_, field.name(), nCmpt, nPoints_);
+    }
+    else
+    {
+        format().openDataArray<float, nCmpt>(field.name())
+            .closeTag();
+    }
 
-        if (legacy_)
+    format().writeSize(payLoad);
+
+    for (const label patchId : patchIDs_)
+    {
+        const auto& pfld = field.boundaryField()[patchId];
+
+        vtk::writeList(format(), pfld.patchInternalField()());
+    }
+
+    format().flush();
+
+    if (!legacy_)
+    {
+        format().endDataArray();
+    }
+}
+
+
+template<class Type>
+void Foam::vtk::patchWriter::write
+(
+    const PrimitivePatchInterpolation<primitivePatch>& pInter,
+    const GeometricField<Type, fvPatchField, volMesh>& field
+)
+{
+    const int nCmpt(pTraits<Type>::nComponents);
+    const uint64_t payLoad(nPoints_ * nCmpt * sizeof(float));
+
+    if (legacy_)
+    {
+        legacy::floatField(os_, field.name(), nCmpt, nPoints_);
+    }
+    else
+    {
+        format().openDataArray<float, nCmpt>(field.name())
+            .closeTag();
+    }
+
+    format().writeSize(payLoad);
+
+    for (const label patchId : patchIDs_)
+    {
+        const auto& pfld = field.boundaryField()[patchId];
+
+        if (nearCellValue_)
         {
-            legacy::floatField(os_, fld.name(), nCmpt, nPoints_);
+            auto tfield =
+                pInter.faceToPointInterpolate(pfld.patchInternalField()());
+
+            vtk::writeList(format(), tfield());
         }
         else
         {
-            format().openDataArray<float, nCmpt>(fld.name())
-                .closeTag();
+            auto tfield = pInter.faceToPointInterpolate(pfld);
+
+            vtk::writeList(format(), tfield());
         }
+    }
 
-        format().writeSize(payLoad);
+    format().flush();
 
-        forAll(patchIDs_, i)
-        {
-            const auto& pfld = fld.boundaryField()[patchIDs_[i]];
+    if (!legacy_)
+    {
+        format().endDataArray();
+    }
+}
 
-            vtk::writeList(format(), pfld.patchInternalField()());
-        }
 
-        format().flush();
-
-        if (!legacy_)
-        {
-            format().endDataArray();
-        }
+template<class Type, template<class> class PatchField, class GeoMesh>
+void Foam::vtk::patchWriter::write
+(
+    const UPtrList<const GeometricField<Type, PatchField, GeoMesh>>& flds
+)
+{
+    for (const auto& field : flds)
+    {
+        write(field);
     }
 }
 
@@ -126,50 +179,9 @@ void Foam::vtk::patchWriter::write
     const UPtrList<const GeometricField<Type, fvPatchField, volMesh>>& flds
 )
 {
-    const int nCmpt(pTraits<Type>::nComponents);
-    const uint64_t payLoad(nPoints_ * nCmpt * sizeof(float));
-
-    forAll(flds, fieldi)
+    for (const auto& field : flds)
     {
-        const auto& fld = flds[fieldi];
-
-        if (legacy_)
-        {
-            legacy::floatField(os_, fld.name(), nCmpt, nPoints_);
-        }
-        else
-        {
-            format().openDataArray<float, nCmpt>(fld.name())
-                .closeTag();
-        }
-
-        format().writeSize(payLoad);
-
-        forAll(patchIDs_, i)
-        {
-            const auto& pfld = fld.boundaryField()[patchIDs_[i]];
-
-            if (nearCellValue_)
-            {
-                auto tfield =
-                    pInter.faceToPointInterpolate(pfld.patchInternalField()());
-
-                vtk::writeList(format(), tfield());
-            }
-            else
-            {
-                auto tfield = pInter.faceToPointInterpolate(pfld);
-
-                vtk::writeList(format(), tfield());
-            }
-        }
-
-        format().flush();
-
-        if (!legacy_)
-        {
-            format().endDataArray();
-        }
+        write(pInter, field);
     }
 }
 
diff --git a/src/conversion/vtk/output/foamVtkSurfaceMeshWriter.H b/src/conversion/vtk/output/foamVtkSurfaceMeshWriter.H
index 9b174a0dec..bf5de51327 100644
--- a/src/conversion/vtk/output/foamVtkSurfaceMeshWriter.H
+++ b/src/conversion/vtk/output/foamVtkSurfaceMeshWriter.H
@@ -135,13 +135,26 @@ public:
         void writeFooter();
 
 
-        //- Get face field
+        //- Get face field (internal face or boundary face)
         template<class Type>
         tmp<Field<Type>> getFaceField
         (
             const GeometricField<Type, fvsPatchField, surfaceMesh>& sfld
         ) const;
 
+
+      // Write fields (individually)
+
+        //- Write surface field
+        template<class Type>
+        void write
+        (
+            const GeometricField<Type, fvsPatchField, surfaceMesh>& field
+        );
+
+
+      // Write fields (collectively)
+
         //- Write surface fields
         template<class Type>
         void write
diff --git a/src/conversion/vtk/output/foamVtkSurfaceMeshWriterTemplates.C b/src/conversion/vtk/output/foamVtkSurfaceMeshWriterTemplates.C
index cdad74b7d0..1b459b3bd9 100644
--- a/src/conversion/vtk/output/foamVtkSurfaceMeshWriterTemplates.C
+++ b/src/conversion/vtk/output/foamVtkSurfaceMeshWriterTemplates.C
@@ -59,6 +59,37 @@ Foam::vtk::surfaceMeshWriter::getFaceField
 }
 
 
+template<class Type>
+void Foam::vtk::surfaceMeshWriter::write
+(
+    const GeometricField<Type, fvsPatchField, surfaceMesh>& field
+)
+{
+    const int nCmpt(pTraits<Type>::nComponents);
+    const uint64_t payLoad(pp_.size() * nCmpt * sizeof(float));
+
+    if (legacy_)
+    {
+        legacy::floatField(os(), field.name(), nCmpt, pp_.size());
+    }
+    else
+    {
+        format().openDataArray<float, nCmpt>(field.name())
+            .closeTag();
+    }
+
+    format().writeSize(payLoad);
+    vtk::writeList(format(), getFaceField(field)());
+
+    format().flush();
+
+    if (!legacy_)
+    {
+        format().endDataArray();
+    }
+}
+
+
 template<class Type>
 void Foam::vtk::surfaceMeshWriter::write
 (
@@ -68,32 +99,9 @@ void Foam::vtk::surfaceMeshWriter::write
     >& sflds
 )
 {
-    const int nCmpt(pTraits<Type>::nComponents);
-    const uint64_t payLoad(pp_.size() * nCmpt * sizeof(float));
-
-    forAll(sflds, fieldi)
+    for (const auto& field : sflds)
     {
-        const auto& fld = sflds[fieldi];
-
-        if (legacy_)
-        {
-            legacy::floatField(os(), fld.name(), nCmpt, pp_.size());
-        }
-        else
-        {
-            format().openDataArray<float, nCmpt>(fld.name())
-                .closeTag();
-        }
-
-        format().writeSize(payLoad);
-        vtk::writeList(format(), getFaceField(fld)());
-
-        format().flush();
-
-        if (!legacy_)
-        {
-            format().endDataArray();
-        }
+        write(field);
     }
 }
 

From 98cc0fc004f109c322a39353bbd2ae9f87d5fbf1 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Wed, 14 Jun 2017 01:48:32 +0200
Subject: [PATCH 26/27] ENH: upgrade writeVTK function object -> vtkWrite
 function object

- user-selectable format (vtk or vtu, ascii or binary)
- dictionary syntax closer to ensightWrite
- tutorial example in windAroundBuildings
---
 .../surface/surfaceFeatureExtractDict.cfg     |   2 +-
 src/functionObjects/utilities/Make/files      |   2 +-
 .../utilities/ensightWrite/ensightWrite.H     |   1 -
 .../utilities/vtkWrite/vtkWrite.C             | 221 ++++++++++++++++++
 .../writeVTK.H => vtkWrite/vtkWrite.H}        | 106 ++++-----
 .../vtkWriteTemplates.C}                      |  46 ++--
 .../utilities/writeVTK/writeVTK.C             | 166 -------------
 .../simpleFoam/motorBike/system/ensightWrite  |   4 +-
 .../windAroundBuildings/system/controlDict    |   2 +
 .../windAroundBuildings/system/vtkWrite       |  31 +++
 10 files changed, 335 insertions(+), 246 deletions(-)
 create mode 100644 src/functionObjects/utilities/vtkWrite/vtkWrite.C
 rename src/functionObjects/utilities/{writeVTK/writeVTK.H => vtkWrite/vtkWrite.H} (62%)
 rename src/functionObjects/utilities/{writeVTK/writeVTKTemplates.C => vtkWrite/vtkWriteTemplates.C} (63%)
 delete mode 100644 src/functionObjects/utilities/writeVTK/writeVTK.C
 create mode 100644 tutorials/incompressible/simpleFoam/windAroundBuildings/system/vtkWrite

diff --git a/etc/caseDicts/surface/surfaceFeatureExtractDict.cfg b/etc/caseDicts/surface/surfaceFeatureExtractDict.cfg
index 683d8acd59..14af1b9e48 100644
--- a/etc/caseDicts/surface/surfaceFeatureExtractDict.cfg
+++ b/etc/caseDicts/surface/surfaceFeatureExtractDict.cfg
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  plus                                  |  
+|  \\    /   O peration     | Version:  plus                                  |
 |   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/src/functionObjects/utilities/Make/files b/src/functionObjects/utilities/Make/files
index ea37b71c95..5cd7055b46 100644
--- a/src/functionObjects/utilities/Make/files
+++ b/src/functionObjects/utilities/Make/files
@@ -2,7 +2,7 @@ abort/abort.C
 
 codedFunctionObject/codedFunctionObject.C
 ensightWrite/ensightWrite.C
-writeVTK/writeVTK.C
+vtkWrite/vtkWrite.C
 
 removeRegisteredObject/removeRegisteredObject.C
 
diff --git a/src/functionObjects/utilities/ensightWrite/ensightWrite.H b/src/functionObjects/utilities/ensightWrite/ensightWrite.H
index 79c4110800..ce9592f99c 100644
--- a/src/functionObjects/utilities/ensightWrite/ensightWrite.H
+++ b/src/functionObjects/utilities/ensightWrite/ensightWrite.H
@@ -76,7 +76,6 @@ SourceFiles
     ensightWrite.C
     ensightWriteTemplates.C
 
-
 \*---------------------------------------------------------------------------*/
 
 #ifndef functionObjects_ensightWrite_H
diff --git a/src/functionObjects/utilities/vtkWrite/vtkWrite.C b/src/functionObjects/utilities/vtkWrite/vtkWrite.C
new file mode 100644
index 0000000000..af55e3f82e
--- /dev/null
+++ b/src/functionObjects/utilities/vtkWrite/vtkWrite.C
@@ -0,0 +1,221 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2016 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2017 OpenCFD Ltd.
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "vtkWrite.H"
+#include "dictionary.H"
+#include "Time.H"
+#include "foamVtkInternalWriter.H"
+#include "addToRunTimeSelectionTable.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace functionObjects
+{
+    defineTypeNameAndDebug(vtkWrite, 0);
+    addToRunTimeSelectionTable(functionObject, vtkWrite, dictionary);
+}
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::functionObjects::vtkWrite::vtkWrite
+(
+    const word& name,
+    const Time& runTime,
+    const dictionary& dict
+)
+:
+    fvMeshFunctionObject(name, runTime, dict),
+    writeOpts_(vtk::formatType::INLINE_BASE64),
+    selectFields_(),
+    dirName_("VTK")
+{
+    read(dict);
+}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+Foam::functionObjects::vtkWrite::~vtkWrite()
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+bool Foam::functionObjects::vtkWrite::read(const dictionary& dict)
+{
+    fvMeshFunctionObject::read(dict);
+
+    //
+    // writer options - default is xml base64
+    //
+    writeOpts_ = vtk::formatType::INLINE_BASE64;
+    if (dict.lookupOrDefault<bool>("legacy", false))
+    {
+        writeOpts_.legacy(true);
+    }
+
+    writeOpts_.ascii
+    (
+        dict.found("format")
+     && (IOstream::formatEnum(dict.lookup("format")) == IOstream::ASCII)
+    );
+
+    // FUTURE?
+    // writeOpts_.precision
+    // (
+    //     dict.lookupOrDefault
+    //     (
+    //         "writePrecision",
+    //         IOstream::defaultPrecision()
+    //     )
+    // );
+
+    // Info<< type() << " " << name() << " output-format: "
+    //     << writeOpts_.description() << nl;
+
+    //
+    // other options
+    //
+    dict.readIfPresent("directory", dirName_);
+
+    writeIds_ = dict.lookupOrDefault<bool>("writeIds", false);
+
+
+    //
+    // output fields
+    //
+    dict.lookup("fields") >> selectFields_;
+    wordRes::inplaceUniq(selectFields_);
+
+    return true;
+}
+
+
+bool Foam::functionObjects::vtkWrite::execute()
+{
+    return true;
+}
+
+
+bool Foam::functionObjects::vtkWrite::write()
+{
+    // Count number of fields to be written: only needed for legacy vtk format
+    label nFields = 0;
+    if (writeOpts_.legacy())
+    {
+        nFields =
+        (
+            (writeIds_ ? 1 : 0)
+          + countFields<volScalarField>()
+          + countFields<volVectorField>()
+          + countFields<volSphericalTensorField>()
+          + countFields<volSymmTensorField>()
+          + countFields<volTensorField>()
+        );
+    }
+
+    // const word timeDesc =
+    //     useTimeName ? time_.timeName() : Foam::name(time_.timeIndex());
+
+    const word timeDesc = time_.timeName();
+
+    fileName vtkDir = dirName_;
+    if (!vtkDir.isAbsolute())
+    {
+        vtkDir = time_.path()/vtkDir;
+    }
+    mkDir(vtkDir);
+
+    string vtkName = time_.caseName();
+
+    if (Pstream::parRun())
+    {
+        // Strip off leading casename, leaving just processor_DDD ending.
+        string::size_type i = vtkName.rfind("processor");
+
+        if (i != string::npos)
+        {
+            vtkName = vtkName.substr(i);
+        }
+    }
+
+    // Create file and write header
+    const fileName outputName
+    (
+        vtkDir/vtkName
+      + "_"
+      + timeDesc
+    );
+
+    Info<< name() << " output Time: " << time_.timeName() << nl
+        << "    Internal  : " << outputName << endl;
+
+    vtk::vtuCells vtuMeshCells
+    (
+        mesh_,
+        writeOpts_,
+        true  // decompose
+    );
+
+    // Write mesh
+    vtk::internalWriter writer
+    (
+        mesh_,
+        vtuMeshCells,
+        outputName,
+        writeOpts_
+    );
+
+    // CellData
+    {
+        writer.beginCellData(nFields);
+
+        // Write cellID field
+        if (writeIds_)
+        {
+            writer.writeCellIDs();
+        }
+
+        // Write volFields
+        writeFields<volScalarField>(writer);
+        writeFields<volVectorField>(writer);
+        writeFields<volSphericalTensorField>(writer);
+        writeFields<volSymmTensorField>(writer);
+        writeFields<volTensorField>(writer);
+
+        writer.endCellData();
+    }
+
+    writer.writeFooter();
+
+    return true;
+}
+
+
+// ************************************************************************* //
diff --git a/src/functionObjects/utilities/writeVTK/writeVTK.H b/src/functionObjects/utilities/vtkWrite/vtkWrite.H
similarity index 62%
rename from src/functionObjects/utilities/writeVTK/writeVTK.H
rename to src/functionObjects/utilities/vtkWrite/vtkWrite.H
index 33c62057f3..025e92bdab 100644
--- a/src/functionObjects/utilities/writeVTK/writeVTK.H
+++ b/src/functionObjects/utilities/vtkWrite/vtkWrite.H
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2016 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2017 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -22,7 +22,7 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
-    Foam::functionObjects::writeVTK
+    Foam::functionObjects::vtkWrite
 
 Group
     grpUtilitiesFunctionObjects
@@ -36,56 +36,47 @@ Description
 
     Example of function object specification:
     \verbatim
-        writeVTK1
-        {
-            type        writeVTK;
-            libs ("libutilityFunctionObjects.so");
-            ...
-            objectNames (obj1 obj2);
-        }
+    vtkWrite1
+    {
+        type            vtkWrite;
+        libs            ("libutilityFunctionObjects.so");
+        writeControl    writeTime;
+        writeInterval   1;
+        format          binary;
+        legacy          false;
+        ...
+        fields          (U p);
+    }
     \endverbatim
 
 Usage
     \table
         Property     | Description             | Required    | Default value
-        type         | Type name: writeVTK     | yes         |
-        objectNames  | objects to write        | yes         |
+        type         | Type name: vtkWrite     | yes         |
+        fields       | Fields to output        | yes         |
+        writeControl | Output control          | recommended | timeStep
+        directory    | The output directory name | no        | "VTK"
+        format       | ASCII or binary format  | no          | binary
+        legacy       | Legacy VTK output       | no          | false
+        writeIds     | Write cell ids as field | no          | true
     \endtable
 
 See also
     Foam::functionObjects::fvMeshFunctionObject
     Foam::functionObjects::timeControl
 
-    Example of function object specification to calculate Lambda2:
-    \verbatim
-    Lambda2_1
-    {
-        type        Lambda2;
-        functionObjectLibs ("libutilityFunctionObjects.so");
-        ...
-    }
-    \endverbatim
-
-    \heading Function object usage
-    \table
-        Property     | Description             | Required    | Default value
-        type         | Type name: Lambda2      | yes         |
-        UName        | Name of velocity field  | no          | U
-        resultName   | Name of Lambda2 field   | no          | <function name>
-        log          | Log to standard output  | no          | yes
-    \endtable
-
 SourceFiles
-    writeVTK.C
-    IOwriteVTK.H
+    vtkWrite.C
+    vtkWriteTemplates.C
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef functionObjects_writeVTK_H
-#define functionObjects_writeVTK_H
+#ifndef functionObjects_vtkWrite_H
+#define functionObjects_vtkWrite_H
 
 #include "fvMeshFunctionObject.H"
-#include "wordReList.H"
+#include "foamVtkInternalWriter.H"
+#include "wordRes.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -95,46 +86,57 @@ namespace functionObjects
 {
 
 /*---------------------------------------------------------------------------*\
-                   Class writeVTK Declaration
+                          Class vtkWrite Declaration
 \*---------------------------------------------------------------------------*/
 
-class writeVTK
+class vtkWrite
 :
     public fvMeshFunctionObject
 {
     // Private data
 
-        //- Names of objects
-        wordReList objectNames_;
+        //- VTK output options
+        vtk::outputOptions writeOpts_;
 
-        //- Result name
-        word resultName_;
+        //- Name of fields to process
+        wordReList selectFields_;
+
+        //- Output directory name
+        fileName dirName_;
+
+        //- Write cell ids field
+        bool writeIds_;
 
-        //- Switch to send output to Info as well as to file
-        Switch log_;
 
     // Private Member Functions
 
+        //- Count number of selected fields for GeoField type.
+        //  Only needed for legacy vtk format.
         template<class GeoField>
-        UPtrList<const GeoField> lookupFields() const;
+        label countFields() const;
+
+        //- Write selected fields for GeoField type.
+        template<class GeoField>
+        label writeFields(vtk::internalWriter& writer, bool verbose=true) const;
+
 
         //- Disallow default bitwise copy construct
-        writeVTK(const writeVTK&) = delete;
+        vtkWrite(const vtkWrite&) = delete;
 
         //- Disallow default bitwise assignment
-        void operator=(const writeVTK&) = delete;
+        void operator=(const vtkWrite&) = delete;
 
 
 public:
 
     //- Runtime type information
-    TypeName("writeVTK");
+    TypeName("vtkWrite");
 
 
     // Constructors
 
         //- Construct from Time and dictionary
-        writeVTK
+        vtkWrite
         (
             const word& name,
             const Time& t,
@@ -143,18 +145,18 @@ public:
 
 
     //- Destructor
-    virtual ~writeVTK();
+    virtual ~vtkWrite();
 
 
     // Member Functions
 
-        //- Read the writeVTK data
+        //- Read the vtkWrite specification
         virtual bool read(const dictionary& dict);
 
         //- Execute, currently does nothing
         virtual bool execute();
 
-        //- Write the writeVTK
+        //- Write fields
         virtual bool write();
 };
 
@@ -167,7 +169,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-    #include "writeVTKTemplates.C"
+    #include "vtkWriteTemplates.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/functionObjects/utilities/writeVTK/writeVTKTemplates.C b/src/functionObjects/utilities/vtkWrite/vtkWriteTemplates.C
similarity index 63%
rename from src/functionObjects/utilities/writeVTK/writeVTKTemplates.C
rename to src/functionObjects/utilities/vtkWrite/vtkWriteTemplates.C
index e46f0333d4..1cdce49cd1 100644
--- a/src/functionObjects/utilities/writeVTK/writeVTKTemplates.C
+++ b/src/functionObjects/utilities/vtkWrite/vtkWriteTemplates.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2017 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -23,38 +23,38 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "writeVTK.H"
-#include "objectRegistry.H"
-#include "DynamicList.H"
-
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
 template<class GeoField>
-Foam::UPtrList<const GeoField>
-Foam::functionObjects::writeVTK::lookupFields() const
+Foam::label
+Foam::functionObjects::vtkWrite::countFields() const
 {
-    DynamicList<word> allNames(obr_.toc().size());
-    forAll(objectNames_, i)
-    {
-        wordList names(obr_.names<GeoField>(objectNames_[i]));
+    return obr_.names<GeoField>(selectFields_).size();
+}
 
-        if (names.size())
-        {
-            allNames.append(names);
-        }
+
+template<class GeoField>
+Foam::label
+Foam::functionObjects::vtkWrite::writeFields
+(
+    vtk::internalWriter& writer,
+    bool verbose
+) const
+{
+    const wordList names = obr_.sortedNames<GeoField>(selectFields_);
+
+    if (verbose && names.size())
+    {
+        Info<< "    " << GeoField::typeName
+            << " " << flatOutput(names) << endl;
     }
 
-    UPtrList<const GeoField> fields(allNames.size());
-
-    forAll(allNames, i)
+    for (const word& fieldName : names)
     {
-        const GeoField& field = obr_.lookupObject<GeoField>(allNames[i]);
-        Info<< "    Writing " << GeoField::typeName
-            << " field " << field.name() << endl;
-        fields.set(i, &field);
+        writer.write(obr_.lookupObject<GeoField>(fieldName));
     }
 
-    return fields;
+    return names.size();
 }
 
 
diff --git a/src/functionObjects/utilities/writeVTK/writeVTK.C b/src/functionObjects/utilities/writeVTK/writeVTK.C
deleted file mode 100644
index ab56d294fd..0000000000
--- a/src/functionObjects/utilities/writeVTK/writeVTK.C
+++ /dev/null
@@ -1,166 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2016 OpenFOAM Foundation
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-License
-    This file is part of OpenFOAM.
-
-    OpenFOAM is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "writeVTK.H"
-#include "dictionary.H"
-#include "Time.H"
-#include "foamVtkInternalWriter.H"
-#include "addToRunTimeSelectionTable.H"
-
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-namespace Foam
-{
-namespace functionObjects
-{
-    defineTypeNameAndDebug(writeVTK, 0);
-    addToRunTimeSelectionTable(functionObject, writeVTK, dictionary);
-}
-}
-
-
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
-
-Foam::functionObjects::writeVTK::writeVTK
-(
-    const word& name,
-    const Time& runTime,
-    const dictionary& dict
-)
-:
-    fvMeshFunctionObject(name, runTime, dict),
-    objectNames_()
-{
-    read(dict);
-}
-
-
-// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
-
-Foam::functionObjects::writeVTK::~writeVTK()
-{}
-
-
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-
-bool Foam::functionObjects::writeVTK::read(const dictionary& dict)
-{
-    dict.lookup("objects") >> objectNames_;
-
-    return true;
-}
-
-
-bool Foam::functionObjects::writeVTK::execute()
-{
-    return true;
-}
-
-
-bool Foam::functionObjects::writeVTK::write()
-{
-    Info<< type() << " " << name() << " output:" << nl;
-
-    Info<< "Time: " << time_.timeName() << endl;
-
-    word timeDesc = time_.timeName();
-
-    // VTK/ directory in the case
-    fileName fvPath(time_.path()/"VTK");
-
-    mkDir(fvPath);
-
-    string vtkName = time_.caseName();
-
-    if (Pstream::parRun())
-    {
-        // Strip off leading casename, leaving just processor_DDD ending.
-        string::size_type i = vtkName.rfind("processor");
-
-        if (i != string::npos)
-        {
-            vtkName = vtkName.substr(i);
-        }
-    }
-
-    // Create file and write header
-    const fileName outputName
-    (
-        fvPath/vtkName
-      + "_"
-      + timeDesc
-    );
-
-    Info<< "    Internal  : " << outputName << endl;
-
-    vtk::vtuCells meshCells
-    (
-        mesh_,
-        vtk::vtuCells::contentType::LEGACY,
-        true  // decompose
-    );
-
-    // Write mesh
-    vtk::internalWriter writer
-    (
-        mesh_,
-        meshCells,
-        outputName,
-        vtk::formatType::LEGACY_ASCII
-    );
-
-
-    UPtrList<const volScalarField> vsf(lookupFields<volScalarField>());
-    UPtrList<const volVectorField> vvf(lookupFields<volVectorField>());
-    UPtrList<const volSphericalTensorField> vsptf
-    (
-        lookupFields<volSphericalTensorField>()
-    );
-    UPtrList<const volSymmTensorField> vstf(lookupFields<volSymmTensorField>());
-    UPtrList<const volTensorField> vtf(lookupFields<volTensorField>());
-
-    const label nVolFields =
-        vsf.size() + vvf.size() + vsptf.size() + vstf.size() + vtf.size();
-
-    // CellData
-    {
-        writer.beginCellData(1 + nVolFields);
-
-        // Write cellID field
-        writer.writeCellIDs();
-
-        // Write volFields
-        writer.write(vsf);
-        writer.write(vvf);
-        writer.write(vsptf);
-        writer.write(vstf);
-        writer.write(vtf);
-    }
-
-    return true;
-}
-
-
-// ************************************************************************* //
diff --git a/tutorials/incompressible/simpleFoam/motorBike/system/ensightWrite b/tutorials/incompressible/simpleFoam/motorBike/system/ensightWrite
index 34e7b14d71..2630bdc3b6 100644
--- a/tutorials/incompressible/simpleFoam/motorBike/system/ensightWrite
+++ b/tutorials/incompressible/simpleFoam/motorBike/system/ensightWrite
@@ -10,8 +10,8 @@ ensightWrite
     // Fields to output (words or regex)
     fields  (U p "(k|epsilon|omega)");
 
-    writeControl writeTime;
-    writeIterval 1;
+    writeControl  writeTime;
+    writeInterval 1;
 }
 
 // ************************************************************************* //
diff --git a/tutorials/incompressible/simpleFoam/windAroundBuildings/system/controlDict b/tutorials/incompressible/simpleFoam/windAroundBuildings/system/controlDict
index 7ceca861c1..2f6bf24381 100644
--- a/tutorials/incompressible/simpleFoam/windAroundBuildings/system/controlDict
+++ b/tutorials/incompressible/simpleFoam/windAroundBuildings/system/controlDict
@@ -50,6 +50,8 @@ runTimeModifiable true;
 
 functions
 {
+    #include "vtkWrite"
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/incompressible/simpleFoam/windAroundBuildings/system/vtkWrite b/tutorials/incompressible/simpleFoam/windAroundBuildings/system/vtkWrite
new file mode 100644
index 0000000000..9f729db0cb
--- /dev/null
+++ b/tutorials/incompressible/simpleFoam/windAroundBuildings/system/vtkWrite
@@ -0,0 +1,31 @@
+// -*- C++ -*-
+// Minimal example of using the vtkWrite function object.
+vtkWrite
+{
+    type    vtkWrite;
+    libs    ("libutilityFunctionObjects.so");
+    log     true;
+
+    // Fields to output (words or regex)
+    fields  (U p "(k|epsilon|omega)");
+
+    //- Output format (ascii | binary) - Default=binary
+    // format  binary;
+
+    //- Use legacy output format - Default=false
+    // legacy  false;
+
+    //- Output directory name - Default="VTK"
+    // directory       "VTK";
+
+    //- Write cell ids as field - Default=true
+    writeIds        false;
+
+    writeControl    writeTime;
+    writeInterval   1;
+
+    writeControl    timeStep;
+    writeInterval   25;
+}
+
+// ************************************************************************* //

From 2d530401fdabbf47c3c0dda0074d388d38d3f2fe Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Wed, 14 Jun 2017 08:14:24 +0200
Subject: [PATCH 27/27] ENH: add foamToVTK -name option

- as per foamToEnsight, foamToEnsightParts.
  Allows the user to specify different output directories.
---
 .../foamToEnsight/foamToEnsight.C             |  3 +--
 .../foamToEnsightParts/foamToEnsightParts.C   |  3 +--
 .../dataConversion/foamToVTK/foamToVTK.C      | 27 ++++++++++++-------
 etc/config.sh/bashcompletion                  |  4 +--
 4 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/applications/utilities/postProcessing/dataConversion/foamToEnsight/foamToEnsight.C b/applications/utilities/postProcessing/dataConversion/foamToEnsight/foamToEnsight.C
index 705c8e6650..bf15ffef0a 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToEnsight/foamToEnsight.C
+++ b/applications/utilities/postProcessing/dataConversion/foamToEnsight/foamToEnsight.C
@@ -173,8 +173,7 @@ int main(int argc, char *argv[])
     (
         "name",
         "subdir",
-        "define sub-directory name to use for ensight data "
-        "(default: 'EnSight')"
+        "sub-directory name for ensight output (default: 'EnSight')"
     );
     argList::addOption
     (
diff --git a/applications/utilities/postProcessing/dataConversion/foamToEnsightParts/foamToEnsightParts.C b/applications/utilities/postProcessing/dataConversion/foamToEnsightParts/foamToEnsightParts.C
index ab2e67e855..f6fdfae977 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToEnsightParts/foamToEnsightParts.C
+++ b/applications/utilities/postProcessing/dataConversion/foamToEnsightParts/foamToEnsightParts.C
@@ -128,8 +128,7 @@ int main(int argc, char *argv[])
     (
         "name",
         "subdir",
-        "define sub-directory name to use for Ensight data "
-        "(default: \"Ensight\")"
+        "sub-directory name for ensight output (default: 'Ensight')"
     );
     argList::addOption
     (
diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK.C b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK.C
index 4ea7887a59..a012136f01 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK.C
+++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK.C
@@ -302,10 +302,7 @@ fileName relativeName(const Time& runTime, const fileName& file)
 
 int main(int argc, char *argv[])
 {
-    argList::addNote
-    (
-        "legacy VTK file format writer"
-    );
+    argList::addNote("VTK file format writer");
     timeSelector::addOptions();
 
     #include "addRegionOption.H"
@@ -398,7 +395,13 @@ int main(int argc, char *argv[])
     argList::addBoolOption
     (
         "useTimeName",
-        "use the time name instead of the time index when naming the files"
+        "use time name instead of the time index when naming files"
+    );
+    argList::addOption
+    (
+        "name",
+        "subdir",
+        "sub-directory name for VTK output (default: 'VTK')"
     );
 
     #include "setRootCase.H"
@@ -470,10 +473,13 @@ int main(int argc, char *argv[])
     word pointSetName;
     args.optionReadIfPresent("pointSet", pointSetName);
 
+    // Define sub-directory name to use for VTK data.
+    const word vtkDirName = args.optionLookupOrDefault<word>("name", "VTK");
+
     #include "createNamedMesh.H"
 
     // VTK/ directory in the case
-    fileName fvPath(runTime.path()/"VTK");
+    fileName fvPath(runTime.path()/vtkDirName);
 
     // Directory of mesh (region0 gets filtered out)
     fileName regionPrefix;
@@ -1340,10 +1346,11 @@ int main(int argc, char *argv[])
 
     if (Pstream::parRun() && doLinks)
     {
-        mkDir(runTime.path()/".."/"VTK");
-        chDir(runTime.path()/".."/"VTK");
+        mkDir(runTime.path()/".."/vtkDirName);
+        chDir(runTime.path()/".."/vtkDirName);
 
-        Info<< "Linking all processor files to " << runTime.path()/".."/"VTK"
+        Info<< "Linking all processor files to "
+            << runTime.path()/".."/vtkDirName
             << endl;
 
         // Get list of vtk files
@@ -1351,7 +1358,7 @@ int main(int argc, char *argv[])
         (
             fileName("..")
           / "processor" + Foam::name(Pstream::myProcNo())
-          / "VTK"
+          / vtkDirName
         );
 
         fileNameList dirs(readDir(procVTK, fileName::DIRECTORY));
diff --git a/etc/config.sh/bashcompletion b/etc/config.sh/bashcompletion
index b7b919e15d..464fb2f1ef 100644
--- a/etc/config.sh/bashcompletion
+++ b/etc/config.sh/bashcompletion
@@ -2563,8 +2563,8 @@ _of_foamToVTK()
     local cur="${COMP_WORDS[COMP_CWORD]}"
     local prev="${COMP_WORDS[COMP_CWORD-1]}"
 
-    local opts="-allPatches -ascii -constant -latestTime -nearCellValue -newTimes -noFaceZones -noFunctionObjects -noInternal -noLagrangian -noLinks -noPointValues -noZero -parallel -poly -surfaceFields -useTimeName -srcDoc -doc -help "
-    local optsWithArgs="-case -cellSet -decomposeParDict -excludePatches -faceSet -fields -pointSet -region -roots -time "
+    local opts="-allPatches -ascii -constant -latestTime -nearCellValue -newTimes -noFaceZones -noFunctionObjects -noInternal -noLagrangian -noLinks -noPointValues -noZero -parallel -poly -surfaceFields -useTimeName -xml -srcDoc -doc -help "
+    local optsWithArgs="-case -cellSet -decomposeParDict -excludePatches -faceSet -fields -name -pointSet -region -roots -time "
 
     case ${prev} in
         -case)