STYLE: flatten PVReaders directory structure

applications/utilities/postProcessing/graphics/PVReaders/Allwclean

@@ -1,8 +1,19 @@
 #!/bin/sh
 cd ${0%/*} || exit 1    # Run from this directory
 
+# Source the wmake functions
+. $WM_PROJECT_DIR/wmake/scripts/wmakeFunctions
+
+# Cleanup OpenFOAM libraries
 wclean libso foamPv
-PVblockMeshReader/Allwclean
-PVFoamReader/Allwclean
+wclean libso vtkPVblockMesh
+wclean libso vtkPVFoam
+
+# Cleanup client-server and/or combined plugins
+rm -f $FOAM_LIBBIN/libPVblockMeshReader* 2>/dev/null
+rm -f $FOAM_LIBBIN/libPVFoamReader* 2>/dev/null
+
+# Cleanup generated files - remove entire top-level
+removeObjectDir $PWD
 
 #------------------------------------------------------------------------------

applications/utilities/postProcessing/graphics/PVReaders/Allwmake

@@ -12,6 +12,13 @@ export WM_CONTINUE_ON_ERROR=true
 
 # -----------------------------------------------------------------------------
 
+warnIncomplete()
+{
+    echo
+    echo "    WARNING: incomplete build of ParaView plugin: $@"
+    echo
+}
+
 # major version as per paraview include directory:
 # Eg, "PREFIX/include/paraview-5.0" -> "5.0"
 major="${ParaView_INCLUDE_DIR##*-}"
@@ -22,8 +29,14 @@ case "$major" in
     then
     (
         wmakeLibPv foamPv
-        PVblockMeshReader/Allwmake $targetType $*
-        PVFoamReader/Allwmake $targetType $*
+        wmakeLibPv vtkPVblockMesh
+        wmakeLibPv vtkPVFoam
+
+        if [ "$targetType" != objects ]
+        then
+            cmakePv $PWD/PVblockMeshReader || warnIncomplete "BlockMesh"
+            cmakePv $PWD/PVFoamReader || warnIncomplete "OpenFOAM"
+        fi
     )
     fi
     ;;

applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/Allwclean

@@ -1,16 +0,0 @@
-#!/bin/sh
-cd ${0%/*} || exit 1    # Run from this directory
-
-# Source the wmake functions
-. $WM_PROJECT_DIR/wmake/scripts/wmakeFunctions
-
-# Cleanup client-server and/or combined plugins
-rm -f $FOAM_LIBBIN/libPVFoamReader* 2>/dev/null
-
-rm -rf PVFoamReader/Make        # safety: old build location
-wclean libso vtkPVFoam
-
-# Cleanup generated files - remove entire top-level
-removeObjectDir $PWD
-
-#------------------------------------------------------------------------------

applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/Allwmake

@@ -1,26 +0,0 @@
-#!/bin/sh
-cd ${0%/*} || exit 1    # Run from this directory
-
-# Parse arguments for library compilation
-. $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
-
-# Source CMake functions
-. $WM_PROJECT_DIR/wmake/scripts/cmakeFunctions
-
-# -----------------------------------------------------------------------------
-
-if [ -d "$ParaView_DIR" ]
-then
-    wmakeLibPv vtkPVFoam
-
-    if [ "$targetType" != objects ]
-    then
-        cmakePv $PWD/PVFoamReader || {
-            echo
-            echo "    WARNING: incomplete build of ParaView OpenFOAM plugin"
-            echo
-        }
-    fi
-fi
-
-#------------------------------------------------------------------------------

applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/CMakeLists.txt

@@ -14,8 +14,8 @@ include_directories(
     $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}/../foamPv
     ${PROJECT_SOURCE_DIR}/../vtkPVFoam
-    ${PROJECT_SOURCE_DIR}/../../foamPv/lnInclude
 )
 
 add_definitions(

applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/Allwclean

@@ -1,16 +0,0 @@
-#!/bin/sh
-cd ${0%/*} || exit 1    # Run from this directory
-
-# Source the wmake functions
-. $WM_PROJECT_DIR/wmake/scripts/wmakeFunctions
-
-# Cleanup client-server and/or combined plugins
-rm -f $FOAM_LIBBIN/libPVblockMeshReader* 2>/dev/null
-
-rm -rf PVblockMeshReader/Make   # safety: old build location
-wclean libso vtkPVblockMesh
-
-# Cleanup generated files - remove entire top-level
-removeObjectDir $PWD
-
-#------------------------------------------------------------------------------

applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/Allwmake

@@ -1,26 +0,0 @@
-#!/bin/sh
-cd ${0%/*} || exit 1    # Run from this directory
-
-# Parse arguments for library compilation
-. $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
-
-# Source CMake functions
-. $WM_PROJECT_DIR/wmake/scripts/cmakeFunctions
-
-# -----------------------------------------------------------------------------
-
-if [ -d "$ParaView_DIR" ]
-then
-    wmakeLibPv vtkPVblockMesh
-
-    if [ "$targetType" != objects ]
-    then
-        cmakePv $PWD/PVblockMeshReader || {
-            echo
-            echo "    WARNING: incomplete build of ParaView BlockMesh plugin"
-            echo
-        }
-    fi
-fi
-
-#------------------------------------------------------------------------------

applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/CMakeLists.txt

@@ -13,8 +13,8 @@ include_directories(
     $ENV{WM_PROJECT_DIR}/src/OpenFOAM/lnInclude
     $ENV{WM_PROJECT_DIR}/src/OSspecific/$ENV{WM_OSTYPE}/lnInclude
     $ENV{WM_PROJECT_DIR}/src/meshing/blockMesh/lnInclude
+    ${PROJECT_SOURCE_DIR}/../foamPv
     ${PROJECT_SOURCE_DIR}/../vtkPVblockMesh
-    ${PROJECT_SOURCE_DIR}/../../foamPv/lnInclude
 )
 
 add_definitions(

applications/utilities/postProcessing/graphics/PVReaders/vtkPVFoam/Make/options

@@ -10,7 +10,7 @@ EXE_INC = \
     -I$(LIB_SRC)/conversion/lnInclude \
     -I$(ParaView_INCLUDE_DIR) \
     -I$(ParaView_INCLUDE_DIR)/vtkkwiml \
-    -I../../foamPv/lnInclude \
+    -I../foamPv \
     -I../PVFoamReader
 
 LIB_LIBS = \

applications/utilities/postProcessing/graphics/PVReaders/vtkPVFoam/vtkPVFoamUpdateInfo.C

@@ -635,8 +635,7 @@ void Foam::vtkPVFoam::updateInfoLagrangianFields
 
     if (debug)
     {
-        Info<< "<end> updateInfoLagrangianFields - "
-            << "lagrangian objects.size() = " << objects.size() << endl;
+        Info<< "<end> " << FUNCTION_NAME << endl;
     }
 }
 

applications/utilities/postProcessing/graphics/PVReaders/vtkPVblockMesh/Make/options

@@ -7,7 +7,7 @@ EXE_INC = \
     -I$(LIB_SRC)/mesh/blockMesh/lnInclude \
     -I$(ParaView_INCLUDE_DIR) \
     -I$(ParaView_INCLUDE_DIR)/vtkkwiml \
-    -I../../foamPv/lnInclude \
+    -I../foamPv \
     -I../PVblockMeshReader
 
 LIB_LIBS = \