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] 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;