diff --git a/applications/utilities/postProcessing/graphics/PVReaders/Allwclean b/applications/utilities/postProcessing/graphics/PVReaders/Allwclean
index a0ae16a29..f29fafac7 100755
--- a/applications/utilities/postProcessing/graphics/PVReaders/Allwclean
+++ b/applications/utilities/postProcessing/graphics/PVReaders/Allwclean
@@ -1,8 +1,13 @@
#!/bin/sh
cd ${0%/*} || exit 1 # Run from this directory
-wclean libso vtkPVReaders
-PVblockMeshReader/Allwclean
-PVFoamReader/Allwclean
+wclean libso vtkPVblockMesh
+wclean libso vtkPVFoam
+
+rm -f $FOAM_LIBBIN/libPVblockMeshReader* 2>/dev/null
+rm -rf PVblockMeshReader/Make
+
+rm -f $FOAM_LIBBIN/libPVFoamReader* 2>/dev/null
+rm -rf PVFoamReader/Make
#------------------------------------------------------------------------------
diff --git a/applications/utilities/postProcessing/graphics/PVReaders/Allwmake b/applications/utilities/postProcessing/graphics/PVReaders/Allwmake
index c32dbb6fe..12b467924 100755
--- a/applications/utilities/postProcessing/graphics/PVReaders/Allwmake
+++ b/applications/utilities/postProcessing/graphics/PVReaders/Allwmake
@@ -17,9 +17,28 @@ case "$ParaView_VERSION" in
[ -n "$WM_CC" ] && export CC="$WM_CC"
[ -n "$WM_CXX" ] && export CXX="$WM_CXX"
- wmake $targetType vtkPVReaders
- PVblockMeshReader/Allwmake $targetType $*
- PVFoamReader/Allwmake $targetType $*
+ wmake $targetType vtkPVblockMesh
+ wmake $targetType vtkPVFoam
+
+ if [ "$targetType" != "objects" ]
+ then
+ (
+ cd PVblockMeshReader
+ mkdir -p Make/$WM_OPTIONS > /dev/null 2>&1
+ cd Make/$WM_OPTIONS
+ cmake ../..
+ make
+ )
+
+ (
+ cd PVFoamReader
+ mkdir -p Make/$WM_OPTIONS > /dev/null 2>&1
+ cd Make/$WM_OPTIONS
+ cmake ../..
+ make
+ )
+ fi
+
else
echo " ERROR: ParaView not found in $ParaView_DIR"
fi
diff --git a/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/Allwclean b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/Allwclean
deleted file mode 100755
index 4f9293f14..000000000
--- a/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/Allwclean
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-cd ${0%/*} || exit 1 # Run from this directory
-
-# deal with client/server vs combined plugins
-rm -f $FOAM_LIBBIN/libPVFoamReader* 2>/dev/null
-
-rm -rf PVFoamReader/Make
-wclean libso vtkPVFoam
-
-#------------------------------------------------------------------------------
diff --git a/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/Allwmake b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/Allwmake
deleted file mode 100755
index f7df1fb8e..000000000
--- a/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/Allwmake
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-cd ${0%/*} || exit 1 # Run from this directory
-
-# Parse arguments for library compilation
-. $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
-
-if [ -d "$ParaView_DIR" -a -r "$ParaView_DIR" ]
-then
- wmake $targetType vtkPVFoam
-
- if [ "$targetType" != "objects" ]
- then
- (
- cd PVFoamReader
- mkdir -p Make/$WM_OPTIONS > /dev/null 2>&1
- cd Make/$WM_OPTIONS
- cmake ../..
- make
- )
- fi
-fi
-
-#------------------------------------------------------------------------------
diff --git a/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/PVFoamReader/CMakeLists.txt b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/CMakeLists.txt
similarity index 100%
rename from applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/PVFoamReader/CMakeLists.txt
rename to applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/CMakeLists.txt
diff --git a/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/PVFoamReader/PVFoamReader.xml b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/PVFoamReader.xml
similarity index 100%
rename from applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/PVFoamReader/PVFoamReader.xml
rename to applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/PVFoamReader.xml
diff --git a/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/PVFoamReader/PVFoamReader_SM.xml b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/PVFoamReader_SM.xml
similarity index 100%
rename from applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/PVFoamReader/PVFoamReader_SM.xml
rename to applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/PVFoamReader_SM.xml
diff --git a/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/PVFoamReader/vtkPVFoamReader.cxx b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoamReader.cxx
similarity index 100%
rename from applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/PVFoamReader/vtkPVFoamReader.cxx
rename to applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoamReader.cxx
diff --git a/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/PVFoamReader/vtkPVFoamReader.h b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoamReader.h
similarity index 100%
rename from applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/PVFoamReader/vtkPVFoamReader.h
rename to applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoamReader.h
diff --git a/applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/Allwclean b/applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/Allwclean
deleted file mode 100755
index dd5f34815..000000000
--- a/applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/Allwclean
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-cd ${0%/*} || exit 1 # Run from this directory
-
-# deal with client/server vs combined plugins
-rm -f $FOAM_LIBBIN/libPVblockMeshReader* 2>/dev/null
-
-rm -rf PVblockMeshReader/Make
-wclean libso vtkPVblockMesh
-
-#------------------------------------------------------------------------------
diff --git a/applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/Allwmake b/applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/Allwmake
deleted file mode 100755
index 6cf5fde8b..000000000
--- a/applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/Allwmake
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-cd ${0%/*} || exit 1 # Run from this directory
-
-# Parse arguments for library compilation
-. $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
-
-if [ -d "$ParaView_DIR" -a -r "$ParaView_DIR" ]
-then
- wmake $targetType vtkPVblockMesh
-
- if [ "$targetType" != "objects" ]
- then
- (
- cd PVblockMeshReader
- mkdir -p Make/$WM_OPTIONS > /dev/null 2>&1
- cd Make/$WM_OPTIONS
- cmake ../..
- make
- )
- fi
-fi
-
-#------------------------------------------------------------------------------
diff --git a/applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/PVblockMeshReader/CMakeLists.txt b/applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/CMakeLists.txt
similarity index 100%
rename from applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/PVblockMeshReader/CMakeLists.txt
rename to applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/CMakeLists.txt
diff --git a/applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/PVblockMeshReader/PVblockMeshReader.xml b/applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/PVblockMeshReader.xml
similarity index 100%
rename from applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/PVblockMeshReader/PVblockMeshReader.xml
rename to applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/PVblockMeshReader.xml
diff --git a/applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/PVblockMeshReader/PVblockMeshReader_SM.xml b/applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/PVblockMeshReader_SM.xml
similarity index 100%
rename from applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/PVblockMeshReader/PVblockMeshReader_SM.xml
rename to applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/PVblockMeshReader_SM.xml
diff --git a/applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/PVblockMeshReader/vtkPVblockMeshReader.cxx b/applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/vtkPVblockMeshReader.cxx
similarity index 100%
rename from applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/PVblockMeshReader/vtkPVblockMeshReader.cxx
rename to applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/vtkPVblockMeshReader.cxx
diff --git a/applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/PVblockMeshReader/vtkPVblockMeshReader.h b/applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/vtkPVblockMeshReader.h
similarity index 100%
rename from applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/PVblockMeshReader/vtkPVblockMeshReader.h
rename to applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/vtkPVblockMeshReader.h
diff --git a/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/Make/files b/applications/utilities/postProcessing/graphics/PVReaders/vtkPVFoam/Make/files
similarity index 100%
rename from applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/Make/files
rename to applications/utilities/postProcessing/graphics/PVReaders/vtkPVFoam/Make/files
diff --git a/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/Make/options b/applications/utilities/postProcessing/graphics/PVReaders/vtkPVFoam/Make/options
similarity index 88%
rename from applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/Make/options
rename to applications/utilities/postProcessing/graphics/PVReaders/vtkPVFoam/Make/options
index df8b71d28..8d26e378a 100644
--- a/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/Make/options
+++ b/applications/utilities/postProcessing/graphics/PVReaders/vtkPVFoam/Make/options
@@ -5,7 +5,6 @@ EXE_INC = \
-I$(LIB_SRC)/finiteVolume/lnInclude \
-I$(LIB_SRC)/dynamicMesh/lnInclude \
-I$(LIB_SRC)/lagrangian/basic/lnInclude \
- -I../../vtkPVReaders/lnInclude \
-I../PVFoamReader \
-I$(ParaView_INCLUDE_DIR) \
-I$(ParaView_INCLUDE_DIR)/vtkkwiml \
@@ -18,5 +17,5 @@ LIB_LIBS = \
-ldynamicMesh \
-lgenericPatchFields \
-llagrangian \
- -L$(FOAM_LIBBIN) -lvtkPVReaders \
+ -L$(FOAM_LIBBIN) \
$(GLIBS)
diff --git a/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkOpenFOAMPoints.H b/applications/utilities/postProcessing/graphics/PVReaders/vtkPVFoam/vtkOpenFOAMPoints.H
similarity index 97%
rename from applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkOpenFOAMPoints.H
rename to applications/utilities/postProcessing/graphics/PVReaders/vtkPVFoam/vtkOpenFOAMPoints.H
index 2a45d73b2..a1c73e5a1 100644
--- a/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkOpenFOAMPoints.H
+++ b/applications/utilities/postProcessing/graphics/PVReaders/vtkPVFoam/vtkOpenFOAMPoints.H
@@ -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) 2011-2017 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
diff --git a/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkOpenFOAMTupleRemap.H b/applications/utilities/postProcessing/graphics/PVReaders/vtkPVFoam/vtkOpenFOAMTupleRemap.H
similarity index 96%
rename from applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkOpenFOAMTupleRemap.H
rename to applications/utilities/postProcessing/graphics/PVReaders/vtkPVFoam/vtkOpenFOAMTupleRemap.H
index d18bc79b3..e3dcbd707 100644
--- a/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkOpenFOAMTupleRemap.H
+++ b/applications/utilities/postProcessing/graphics/PVReaders/vtkPVFoam/vtkOpenFOAMTupleRemap.H
@@ -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) 2011-2017 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
diff --git a/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoam.C b/applications/utilities/postProcessing/graphics/PVReaders/vtkPVFoam/vtkPVFoam.C
similarity index 100%
rename from applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoam.C
rename to applications/utilities/postProcessing/graphics/PVReaders/vtkPVFoam/vtkPVFoam.C
diff --git a/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoam.H b/applications/utilities/postProcessing/graphics/PVReaders/vtkPVFoam/vtkPVFoam.H
similarity index 100%
rename from applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoam.H
rename to applications/utilities/postProcessing/graphics/PVReaders/vtkPVFoam/vtkPVFoam.H
diff --git a/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamAddToSelection.H b/applications/utilities/postProcessing/graphics/PVReaders/vtkPVFoam/vtkPVFoamAddToSelection.H
similarity index 97%
rename from applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamAddToSelection.H
rename to applications/utilities/postProcessing/graphics/PVReaders/vtkPVFoam/vtkPVFoamAddToSelection.H
index 8368b7d35..e3b2a7e85 100644
--- a/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamAddToSelection.H
+++ b/applications/utilities/postProcessing/graphics/PVReaders/vtkPVFoam/vtkPVFoamAddToSelection.H
@@ -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) 2011-2017 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
diff --git a/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamFaceField.H b/applications/utilities/postProcessing/graphics/PVReaders/vtkPVFoam/vtkPVFoamFaceField.H
similarity index 98%
rename from applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamFaceField.H
rename to applications/utilities/postProcessing/graphics/PVReaders/vtkPVFoam/vtkPVFoamFaceField.H
index 69395405d..53af78c5a 100644
--- a/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamFaceField.H
+++ b/applications/utilities/postProcessing/graphics/PVReaders/vtkPVFoam/vtkPVFoamFaceField.H
@@ -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) 2011-2017 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
diff --git a/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamFields.C b/applications/utilities/postProcessing/graphics/PVReaders/vtkPVFoam/vtkPVFoamFields.C
similarity index 99%
rename from applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamFields.C
rename to applications/utilities/postProcessing/graphics/PVReaders/vtkPVFoam/vtkPVFoamFields.C
index 6f35e41ae..2554b2cae 100644
--- a/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamFields.C
+++ b/applications/utilities/postProcessing/graphics/PVReaders/vtkPVFoam/vtkPVFoamFields.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) 2011-2017 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
diff --git a/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamLagrangianFields.H b/applications/utilities/postProcessing/graphics/PVReaders/vtkPVFoam/vtkPVFoamLagrangianFields.H
similarity index 98%
rename from applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamLagrangianFields.H
rename to applications/utilities/postProcessing/graphics/PVReaders/vtkPVFoam/vtkPVFoamLagrangianFields.H
index fcaff892e..d8525878c 100644
--- a/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamLagrangianFields.H
+++ b/applications/utilities/postProcessing/graphics/PVReaders/vtkPVFoam/vtkPVFoamLagrangianFields.H
@@ -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) 2011-2017 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
diff --git a/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamMesh.C b/applications/utilities/postProcessing/graphics/PVReaders/vtkPVFoam/vtkPVFoamMesh.C
similarity index 99%
rename from applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamMesh.C
rename to applications/utilities/postProcessing/graphics/PVReaders/vtkPVFoam/vtkPVFoamMesh.C
index d4aef5aa6..db48a4e90 100644
--- a/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamMesh.C
+++ b/applications/utilities/postProcessing/graphics/PVReaders/vtkPVFoam/vtkPVFoamMesh.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) 2011-2017 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
diff --git a/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamMeshLagrangian.C b/applications/utilities/postProcessing/graphics/PVReaders/vtkPVFoam/vtkPVFoamMeshLagrangian.C
similarity index 97%
rename from applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamMeshLagrangian.C
rename to applications/utilities/postProcessing/graphics/PVReaders/vtkPVFoam/vtkPVFoamMeshLagrangian.C
index fafbd0a28..1641c2069 100644
--- a/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamMeshLagrangian.C
+++ b/applications/utilities/postProcessing/graphics/PVReaders/vtkPVFoam/vtkPVFoamMeshLagrangian.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) 2011-2017 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
diff --git a/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamMeshSet.C b/applications/utilities/postProcessing/graphics/PVReaders/vtkPVFoam/vtkPVFoamMeshSet.C
similarity index 98%
rename from applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamMeshSet.C
rename to applications/utilities/postProcessing/graphics/PVReaders/vtkPVFoam/vtkPVFoamMeshSet.C
index a4c5a59e9..f2a97e807 100644
--- a/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamMeshSet.C
+++ b/applications/utilities/postProcessing/graphics/PVReaders/vtkPVFoam/vtkPVFoamMeshSet.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) 2011-2017 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
diff --git a/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamMeshVolume.C b/applications/utilities/postProcessing/graphics/PVReaders/vtkPVFoam/vtkPVFoamMeshVolume.C
similarity index 99%
rename from applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamMeshVolume.C
rename to applications/utilities/postProcessing/graphics/PVReaders/vtkPVFoam/vtkPVFoamMeshVolume.C
index a99fba019..5ed724a58 100644
--- a/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamMeshVolume.C
+++ b/applications/utilities/postProcessing/graphics/PVReaders/vtkPVFoam/vtkPVFoamMeshVolume.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) 2011-2017 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
diff --git a/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamMeshZone.C b/applications/utilities/postProcessing/graphics/PVReaders/vtkPVFoam/vtkPVFoamMeshZone.C
similarity index 97%
rename from applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamMeshZone.C
rename to applications/utilities/postProcessing/graphics/PVReaders/vtkPVFoam/vtkPVFoamMeshZone.C
index e60a8aea4..05aeda492 100644
--- a/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamMeshZone.C
+++ b/applications/utilities/postProcessing/graphics/PVReaders/vtkPVFoam/vtkPVFoamMeshZone.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) 2011-2017 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
diff --git a/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamPatchField.H b/applications/utilities/postProcessing/graphics/PVReaders/vtkPVFoam/vtkPVFoamPatchField.H
similarity index 98%
rename from applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamPatchField.H
rename to applications/utilities/postProcessing/graphics/PVReaders/vtkPVFoam/vtkPVFoamPatchField.H
index 0aafd18bd..79e3d0f8b 100644
--- a/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamPatchField.H
+++ b/applications/utilities/postProcessing/graphics/PVReaders/vtkPVFoam/vtkPVFoamPatchField.H
@@ -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) 2011-2017 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
diff --git a/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamPointFields.H b/applications/utilities/postProcessing/graphics/PVReaders/vtkPVFoam/vtkPVFoamPointFields.H
similarity index 99%
rename from applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamPointFields.H
rename to applications/utilities/postProcessing/graphics/PVReaders/vtkPVFoam/vtkPVFoamPointFields.H
index fc22aca9a..48d8af88c 100644
--- a/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamPointFields.H
+++ b/applications/utilities/postProcessing/graphics/PVReaders/vtkPVFoam/vtkPVFoamPointFields.H
@@ -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) 2011-2017 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
diff --git a/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamTemplates.C b/applications/utilities/postProcessing/graphics/PVReaders/vtkPVFoam/vtkPVFoamTemplates.C
similarity index 97%
rename from applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamTemplates.C
rename to applications/utilities/postProcessing/graphics/PVReaders/vtkPVFoam/vtkPVFoamTemplates.C
index 714d73d7c..344ee6291 100644
--- a/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamTemplates.C
+++ b/applications/utilities/postProcessing/graphics/PVReaders/vtkPVFoam/vtkPVFoamTemplates.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) 2011-2017 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
diff --git a/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamUpdateInfo.C b/applications/utilities/postProcessing/graphics/PVReaders/vtkPVFoam/vtkPVFoamUpdateInfo.C
similarity index 100%
rename from applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamUpdateInfo.C
rename to applications/utilities/postProcessing/graphics/PVReaders/vtkPVFoam/vtkPVFoamUpdateInfo.C
diff --git a/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamUpdateInfoFields.H b/applications/utilities/postProcessing/graphics/PVReaders/vtkPVFoam/vtkPVFoamUpdateInfoFields.H
similarity index 100%
rename from applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamUpdateInfoFields.H
rename to applications/utilities/postProcessing/graphics/PVReaders/vtkPVFoam/vtkPVFoamUpdateInfoFields.H
diff --git a/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamUtils.C b/applications/utilities/postProcessing/graphics/PVReaders/vtkPVFoam/vtkPVFoamUtils.C
similarity index 99%
rename from applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamUtils.C
rename to applications/utilities/postProcessing/graphics/PVReaders/vtkPVFoam/vtkPVFoamUtils.C
index 0280afa5a..368d90001 100644
--- a/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamUtils.C
+++ b/applications/utilities/postProcessing/graphics/PVReaders/vtkPVFoam/vtkPVFoamUtils.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) 2011-2017 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
diff --git a/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamVolFields.H b/applications/utilities/postProcessing/graphics/PVReaders/vtkPVFoam/vtkPVFoamVolFields.H
similarity index 99%
rename from applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamVolFields.H
rename to applications/utilities/postProcessing/graphics/PVReaders/vtkPVFoam/vtkPVFoamVolFields.H
index d1b4a771d..0c9e85f91 100644
--- a/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamVolFields.H
+++ b/applications/utilities/postProcessing/graphics/PVReaders/vtkPVFoam/vtkPVFoamVolFields.H
@@ -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) 2011-2017 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
diff --git a/applications/utilities/postProcessing/graphics/PVReaders/vtkPVReaders/Make/files b/applications/utilities/postProcessing/graphics/PVReaders/vtkPVReaders/Make/files
deleted file mode 100644
index e26a8c497..000000000
--- a/applications/utilities/postProcessing/graphics/PVReaders/vtkPVReaders/Make/files
+++ /dev/null
@@ -1,3 +0,0 @@
-vtkPVReaders.C
-
-LIB = $(FOAM_LIBBIN)/libvtkPVReaders
diff --git a/applications/utilities/postProcessing/graphics/PVReaders/vtkPVReaders/Make/options b/applications/utilities/postProcessing/graphics/PVReaders/vtkPVReaders/Make/options
deleted file mode 100644
index 8a80ee149..000000000
--- a/applications/utilities/postProcessing/graphics/PVReaders/vtkPVReaders/Make/options
+++ /dev/null
@@ -1,6 +0,0 @@
-EXE_INC = \
- -I$(ParaView_INCLUDE_DIR) \
- -I$(ParaView_INCLUDE_DIR)/vtkkwiml
-
-LIB_LIBS = \
- $(GLIBS)
diff --git a/applications/utilities/postProcessing/graphics/PVReaders/vtkPVReaders/vtkPVReaders.C b/applications/utilities/postProcessing/graphics/PVReaders/vtkPVReaders/vtkPVReaders.C
deleted file mode 100644
index 2197fb736..000000000
--- a/applications/utilities/postProcessing/graphics/PVReaders/vtkPVReaders/vtkPVReaders.C
+++ /dev/null
@@ -1,333 +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 .
-
-Description
- Misc helper methods and utilities
-
-\*---------------------------------------------------------------------------*/
-
-#include "vtkPVReaders.H"
-
-// OpenFOAM includes
-#include "IFstream.H"
-
-// VTK includes
-#include "vtkDataArraySelection.h"
-#include "vtkDataSet.h"
-#include "vtkMultiBlockDataSet.h"
-#include "vtkInformation.h"
-
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-namespace Foam
-{
-defineTypeNameAndDebug(vtkPVReaders, 0);
-}
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
- //! \cond fileScope
- // Extract up to the first non-word characters
- inline word getFirstWord(const char* str)
- {
- if (str)
- {
- label n = 0;
- while (str[n] && word::valid(str[n]))
- {
- ++n;
- }
- return word(str, n, true);
- }
- else
- {
- return word::null;
- }
-
- }
- //! \endcond
-
-} // End namespace Foam
-
-
-// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
-
-void Foam::vtkPVReaders::AddToBlock
-(
- vtkMultiBlockDataSet* output,
- vtkDataSet* dataset,
- const partInfo& selector,
- const label datasetNo,
- const std::string& datasetName
-)
-{
- const int blockNo = selector.block();
-
- vtkDataObject* blockDO = output->GetBlock(blockNo);
- vtkMultiBlockDataSet* block = vtkMultiBlockDataSet::SafeDownCast(blockDO);
-
- if (!block)
- {
- if (blockDO)
- {
- FatalErrorInFunction
- << "Block already has a vtkDataSet assigned to it"
- << endl;
- return;
- }
-
- block = vtkMultiBlockDataSet::New();
- output->SetBlock(blockNo, block);
- block->Delete();
- }
-
- if (debug)
- {
- Info<< "block[" << blockNo << "] has "
- << block->GetNumberOfBlocks()
- << " datasets prior to adding set " << datasetNo
- << " with name: " << datasetName << endl;
- }
-
- block->SetBlock(datasetNo, dataset);
-
- // name the block when assigning dataset 0
- if (datasetNo == 0)
- {
- output->GetMetaData(blockNo)->Set
- (
- vtkCompositeDataSet::NAME(),
- selector.name()
- );
- }
-
- if (datasetName.size())
- {
- block->GetMetaData(datasetNo)->Set
- (
- vtkCompositeDataSet::NAME(),
- datasetName.c_str()
- );
- }
-}
-
-
-vtkDataSet* Foam::vtkPVReaders::GetDataSetFromBlock
-(
- vtkMultiBlockDataSet* output,
- const partInfo& selector,
- const label datasetNo
-)
-{
- const int blockNo = selector.block();
-
- vtkDataObject* blockDO = output->GetBlock(blockNo);
- vtkMultiBlockDataSet* block = vtkMultiBlockDataSet::SafeDownCast(blockDO);
-
- if (block)
- {
- return vtkDataSet::SafeDownCast(block->GetBlock(datasetNo));
- }
-
- return 0;
-}
-
-
-// ununsed at the moment
-Foam::label Foam::vtkPVReaders::GetNumberOfDataSets
-(
- vtkMultiBlockDataSet* output,
- const partInfo& selector
-)
-{
- const int blockNo = selector.block();
-
- vtkDataObject* blockDO = output->GetBlock(blockNo);
- vtkMultiBlockDataSet* block = vtkMultiBlockDataSet::SafeDownCast(blockDO);
- if (block)
- {
- return block->GetNumberOfBlocks();
- }
-
- return 0;
-}
-
-
-// Foam::word Foam::vtkPVReaders::getPartName(int partId)
-// {
-// return getFirstWord(reader_->GetPartArrayName(partId));
-// }
-
-
-Foam::wordHashSet Foam::vtkPVReaders::getSelected
-(
- vtkDataArraySelection* select
-)
-{
- int nElem = select->GetNumberOfArrays();
- wordHashSet selections(2*nElem);
-
- for (int elemI=0; elemI < nElem; ++elemI)
- {
- if (select->GetArraySetting(elemI))
- {
- selections.insert(getFirstWord(select->GetArrayName(elemI)));
- }
- }
-
- return selections;
-}
-
-
-Foam::wordHashSet Foam::vtkPVReaders::getSelected
-(
- vtkDataArraySelection* select,
- const partInfo& selector
-)
-{
- int nElem = select->GetNumberOfArrays();
- wordHashSet selections(2*nElem);
-
- for (int elemI = selector.start(); elemI < selector.end(); ++elemI)
- {
- if (select->GetArraySetting(elemI))
- {
- selections.insert(getFirstWord(select->GetArrayName(elemI)));
- }
- }
-
- return selections;
-}
-
-
-Foam::stringList Foam::vtkPVReaders::getSelectedArrayEntries
-(
- vtkDataArraySelection* select
-)
-{
- stringList selections(select->GetNumberOfArrays());
- label nElem = 0;
-
- forAll(selections, elemI)
- {
- if (select->GetArraySetting(elemI))
- {
- selections[nElem++] = select->GetArrayName(elemI);
- }
- }
- selections.setSize(nElem);
-
-
- if (debug)
- {
- label nElem = select->GetNumberOfArrays();
- Info<< "available(";
- for (int elemI = 0; elemI < nElem; ++elemI)
- {
- Info<< " \"" << select->GetArrayName(elemI) << "\"";
- }
- Info<< " )\nselected(";
-
- forAll(selections, elemI)
- {
- Info<< " " << selections[elemI];
- }
- Info<< " )\n";
- }
-
- return selections;
-}
-
-
-Foam::stringList Foam::vtkPVReaders::getSelectedArrayEntries
-(
- vtkDataArraySelection* select,
- const partInfo& selector
-)
-{
- stringList selections(selector.size());
- label nElem = 0;
-
- for (int elemI = selector.start(); elemI < selector.end(); ++elemI)
- {
- if (select->GetArraySetting(elemI))
- {
- selections[nElem++] = select->GetArrayName(elemI);
- }
- }
- selections.setSize(nElem);
-
-
- if (debug)
- {
- Info<< "available(";
- for (int elemI = selector.start(); elemI < selector.end(); ++elemI)
- {
- Info<< " \"" << select->GetArrayName(elemI) << "\"";
- }
- Info<< " )\nselected(";
-
- forAll(selections, elemI)
- {
- Info<< " " << selections[elemI];
- }
- Info<< " )\n";
- }
-
- return selections;
-}
-
-
-void Foam::vtkPVReaders::setSelectedArrayEntries
-(
- vtkDataArraySelection* select,
- const stringList& selections
-)
-{
- const int nElem = select->GetNumberOfArrays();
- select->DisableAllArrays();
-
- // Loop through entries, setting values from selectedEntries
- for (int elemI=0; elemI < nElem; ++elemI)
- {
- string arrayName(select->GetArrayName(elemI));
-
- forAll(selections, elemI)
- {
- if (selections[elemI] == arrayName)
- {
- select->EnableArray(arrayName.c_str());
- break;
- }
- }
- }
-}
-
-
-// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
-
-
-// ************************************************************************* //
diff --git a/applications/utilities/postProcessing/graphics/PVReaders/vtkPVReaders/vtkPVReaders.H b/applications/utilities/postProcessing/graphics/PVReaders/vtkPVReaders/vtkPVReaders.H
deleted file mode 100644
index 958668105..000000000
--- a/applications/utilities/postProcessing/graphics/PVReaders/vtkPVReaders/vtkPVReaders.H
+++ /dev/null
@@ -1,228 +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 .
-
-Namespace
- Foam::vtkPVReaders
-
-Description
- A collection of helper functions when building a reader interface in
- ParaView3.
-
-SourceFiles
- vtkPVReaders.C
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef vtkPVReaders_H
-#define vtkPVReaders_H
-
-// do not include legacy strstream headers
-#ifndef VTK_EXCLUDE_STRSTREAM_HEADERS
-# define VTK_EXCLUDE_STRSTREAM_HEADERS
-#endif
-
-#include "className.H"
-#include "fileName.H"
-#include "stringList.H"
-#include "wordList.H"
-#include "HashSet.H"
-
-
-// * * * * * * * * * * * * * Forward Declarations * * * * * * * * * * * * * //
-
-class vtkDataArraySelection;
-class vtkDataSet;
-class vtkPoints;
-class vtkPVFoamReader;
-class vtkRenderer;
-class vtkTextActor;
-class vtkMultiBlockDataSet;
-class vtkPolyData;
-class vtkUnstructuredGrid;
-class vtkIndent;
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-namespace vtkPVReaders
-{
- //- Declare name of the class and its debug switch
- NamespaceName("vtkPVReaders");
-
- //- Bookkeeping for GUI checklists and the multi-block organization
- class partInfo
- {
- const char *name_;
- int block_;
- int start_;
- int size_;
-
- public:
-
- partInfo(const char *name, const int blockNo=0)
- :
- name_(name),
- block_(blockNo),
- start_(-1),
- size_(0)
- {}
-
- //- Return the block holding these datasets
- int block() const
- {
- return block_;
- }
-
- //- Assign block number, return previous value
- int block(int blockNo)
- {
- int prev = block_;
- block_ = blockNo;
- return prev;
- }
-
- const char* name() const
- {
- return name_;
- }
-
- int start() const
- {
- return start_;
- }
-
- int end() const
- {
- return start_ + size_;
- }
-
- int size() const
- {
- return size_;
- }
-
- bool empty() const
- {
- return !size_;
- }
-
- void reset()
- {
- start_ = -1;
- size_ = 0;
- }
-
- //- Assign new start and reset the size
- void operator=(const int i)
- {
- start_ = i;
- size_ = 0;
- }
-
- //- Increment the size
- void operator+=(const int n)
- {
- size_ += n;
- }
- };
-
-
- //- Convenience method use to convert the readers from VTK 5
- // multiblock API to the current composite data infrastructure
- void AddToBlock
- (
- vtkMultiBlockDataSet* output,
- vtkDataSet* dataset,
- const partInfo& selector,
- const label datasetNo,
- const std::string& datasetName
- );
-
-
- //- Convenience method use to convert the readers from VTK 5
- // multiblock API to the current composite data infrastructure
- vtkDataSet* GetDataSetFromBlock
- (
- vtkMultiBlockDataSet* output,
- const partInfo& selector,
- const label datasetNo
- );
-
- //- Convenience method use to convert the readers from VTK 5
- // multiblock API to the current composite data infrastructure
- // ununsed at the moment
- label GetNumberOfDataSets
- (
- vtkMultiBlockDataSet* output,
- const partInfo& selector
- );
-
-
- //- Retrieve the current selections as a wordHashSet
- wordHashSet getSelected
- (
- vtkDataArraySelection* select
- );
-
-
- //- Retrieve a sub-list of the current selections
- wordHashSet getSelected
- (
- vtkDataArraySelection*,
- const partInfo&
- );
-
-
- //- Retrieve the current selections
- stringList getSelectedArrayEntries(vtkDataArraySelection*);
-
- //- Retrieve a sub-list of the current selections
- stringList getSelectedArrayEntries
- (
- vtkDataArraySelection* select,
- const partInfo& selector
- );
-
-
- //- Set selection(s)
- void setSelectedArrayEntries
- (
- vtkDataArraySelection*,
- const stringList&
- );
-
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace vtkPV
-
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/vtkPVblockMesh/Make/files b/applications/utilities/postProcessing/graphics/PVReaders/vtkPVblockMesh/Make/files
similarity index 100%
rename from applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/vtkPVblockMesh/Make/files
rename to applications/utilities/postProcessing/graphics/PVReaders/vtkPVblockMesh/Make/files
diff --git a/applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/vtkPVblockMesh/Make/options b/applications/utilities/postProcessing/graphics/PVReaders/vtkPVblockMesh/Make/options
similarity index 80%
rename from applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/vtkPVblockMesh/Make/options
rename to applications/utilities/postProcessing/graphics/PVReaders/vtkPVblockMesh/Make/options
index 9dcba4b39..ea0253e0d 100644
--- a/applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/vtkPVblockMesh/Make/options
+++ b/applications/utilities/postProcessing/graphics/PVReaders/vtkPVblockMesh/Make/options
@@ -4,12 +4,11 @@ EXE_INC = \
-I$(LIB_SRC)/mesh/blockMesh/lnInclude \
-I$(ParaView_INCLUDE_DIR) \
-I$(ParaView_INCLUDE_DIR)/vtkkwiml \
- -I../../vtkPVReaders/lnInclude \
-I../PVblockMeshReader
LIB_LIBS = \
-lmeshTools \
-lfileFormats \
-lblockMesh \
- -L$(FOAM_LIBBIN) -lvtkPVReaders \
+ -L$(FOAM_LIBBIN) \
$(GLIBS)
diff --git a/applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/vtkPVblockMesh/vtkOpenFOAMPoints.H b/applications/utilities/postProcessing/graphics/PVReaders/vtkPVblockMesh/vtkOpenFOAMPoints.H
similarity index 96%
rename from applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/vtkPVblockMesh/vtkOpenFOAMPoints.H
rename to applications/utilities/postProcessing/graphics/PVReaders/vtkPVblockMesh/vtkOpenFOAMPoints.H
index d36406984..32478ca93 100644
--- a/applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/vtkPVblockMesh/vtkOpenFOAMPoints.H
+++ b/applications/utilities/postProcessing/graphics/PVReaders/vtkPVblockMesh/vtkOpenFOAMPoints.H
@@ -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) 2011-2017 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
diff --git a/applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/vtkPVblockMesh/vtkPVblockMesh.C b/applications/utilities/postProcessing/graphics/PVReaders/vtkPVblockMesh/vtkPVblockMesh.C
similarity index 100%
rename from applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/vtkPVblockMesh/vtkPVblockMesh.C
rename to applications/utilities/postProcessing/graphics/PVReaders/vtkPVblockMesh/vtkPVblockMesh.C
diff --git a/applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/vtkPVblockMesh/vtkPVblockMesh.H b/applications/utilities/postProcessing/graphics/PVReaders/vtkPVblockMesh/vtkPVblockMesh.H
similarity index 99%
rename from applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/vtkPVblockMesh/vtkPVblockMesh.H
rename to applications/utilities/postProcessing/graphics/PVReaders/vtkPVblockMesh/vtkPVblockMesh.H
index dc502926f..5b6d2268b 100644
--- a/applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/vtkPVblockMesh/vtkPVblockMesh.H
+++ b/applications/utilities/postProcessing/graphics/PVReaders/vtkPVblockMesh/vtkPVblockMesh.H
@@ -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) 2011-2017 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
diff --git a/applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/vtkPVblockMesh/vtkPVblockMeshConvert.C b/applications/utilities/postProcessing/graphics/PVReaders/vtkPVblockMesh/vtkPVblockMeshConvert.C
similarity index 99%
rename from applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/vtkPVblockMesh/vtkPVblockMeshConvert.C
rename to applications/utilities/postProcessing/graphics/PVReaders/vtkPVblockMesh/vtkPVblockMeshConvert.C
index 9c7f8a06b..76112a668 100644
--- a/applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/vtkPVblockMesh/vtkPVblockMeshConvert.C
+++ b/applications/utilities/postProcessing/graphics/PVReaders/vtkPVblockMesh/vtkPVblockMeshConvert.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) 2011-2017 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
diff --git a/applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/vtkPVblockMesh/vtkPVblockMeshUtils.C b/applications/utilities/postProcessing/graphics/PVReaders/vtkPVblockMesh/vtkPVblockMeshUtils.C
similarity index 99%
rename from applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/vtkPVblockMesh/vtkPVblockMeshUtils.C
rename to applications/utilities/postProcessing/graphics/PVReaders/vtkPVblockMesh/vtkPVblockMeshUtils.C
index a838c5b60..4f1bd63f6 100644
--- a/applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/vtkPVblockMesh/vtkPVblockMeshUtils.C
+++ b/applications/utilities/postProcessing/graphics/PVReaders/vtkPVblockMesh/vtkPVblockMeshUtils.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) 2011-2017 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License