diff --git a/applications/utilities/postProcessing/graphics/PV3FoamReader/Allwmake b/applications/utilities/postProcessing/graphics/PV3FoamReader/Allwmake deleted file mode 100755 index 9a91c33990..0000000000 --- a/applications/utilities/postProcessing/graphics/PV3FoamReader/Allwmake +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/sh -set -x - -if [ -d "$ParaView_DIR" -a -r "$ParaView_DIR" ] -then - case "$ParaView_VERSION" in - 3*) - wmake libso vtkPV3Foam - ( - cd PV3FoamReader - mkdir -p Make/$WM_OPTIONS > /dev/null 2>&1 - cd Make/$WM_OPTIONS - cmake ../.. - make - ) - ;; - esac -fi diff --git a/applications/utilities/postProcessing/graphics/PV3-3FoamReader/Allwmake b/applications/utilities/postProcessing/graphics/PV3FoamReader/PV3-3FoamReader/Allwmake similarity index 100% rename from applications/utilities/postProcessing/graphics/PV3-3FoamReader/Allwmake rename to applications/utilities/postProcessing/graphics/PV3FoamReader/PV3-3FoamReader/Allwmake diff --git a/applications/utilities/postProcessing/graphics/PV3-3FoamReader/PV3FoamReader/CMakeLists.txt b/applications/utilities/postProcessing/graphics/PV3FoamReader/PV3-3FoamReader/PV3FoamReader/CMakeLists.txt similarity index 100% rename from applications/utilities/postProcessing/graphics/PV3-3FoamReader/PV3FoamReader/CMakeLists.txt rename to applications/utilities/postProcessing/graphics/PV3FoamReader/PV3-3FoamReader/PV3FoamReader/CMakeLists.txt diff --git a/applications/utilities/postProcessing/graphics/PV3-3FoamReader/PV3FoamReader/PV3FoamReader.qrc b/applications/utilities/postProcessing/graphics/PV3FoamReader/PV3-3FoamReader/PV3FoamReader/PV3FoamReader.qrc similarity index 100% rename from applications/utilities/postProcessing/graphics/PV3-3FoamReader/PV3FoamReader/PV3FoamReader.qrc rename to applications/utilities/postProcessing/graphics/PV3FoamReader/PV3-3FoamReader/PV3FoamReader/PV3FoamReader.qrc diff --git a/applications/utilities/postProcessing/graphics/PV3-3FoamReader/PV3FoamReader/PV3FoamReader.xml b/applications/utilities/postProcessing/graphics/PV3FoamReader/PV3-3FoamReader/PV3FoamReader/PV3FoamReader.xml similarity index 100% rename from applications/utilities/postProcessing/graphics/PV3-3FoamReader/PV3FoamReader/PV3FoamReader.xml rename to applications/utilities/postProcessing/graphics/PV3FoamReader/PV3-3FoamReader/PV3FoamReader/PV3FoamReader.xml diff --git a/applications/utilities/postProcessing/graphics/PV3-3FoamReader/PV3FoamReader/PV3FoamReader_SM.xml b/applications/utilities/postProcessing/graphics/PV3FoamReader/PV3-3FoamReader/PV3FoamReader/PV3FoamReader_SM.xml similarity index 100% rename from applications/utilities/postProcessing/graphics/PV3-3FoamReader/PV3FoamReader/PV3FoamReader_SM.xml rename to applications/utilities/postProcessing/graphics/PV3FoamReader/PV3-3FoamReader/PV3FoamReader/PV3FoamReader_SM.xml diff --git a/applications/utilities/postProcessing/graphics/PV3-3FoamReader/PV3FoamReader/vtkPV3FoamReader.cxx b/applications/utilities/postProcessing/graphics/PV3FoamReader/PV3-3FoamReader/PV3FoamReader/vtkPV3FoamReader.cxx similarity index 100% rename from applications/utilities/postProcessing/graphics/PV3-3FoamReader/PV3FoamReader/vtkPV3FoamReader.cxx rename to applications/utilities/postProcessing/graphics/PV3FoamReader/PV3-3FoamReader/PV3FoamReader/vtkPV3FoamReader.cxx diff --git a/applications/utilities/postProcessing/graphics/PV3-3FoamReader/PV3FoamReader/vtkPV3FoamReader.h b/applications/utilities/postProcessing/graphics/PV3FoamReader/PV3-3FoamReader/PV3FoamReader/vtkPV3FoamReader.h similarity index 100% rename from applications/utilities/postProcessing/graphics/PV3-3FoamReader/PV3FoamReader/vtkPV3FoamReader.h rename to applications/utilities/postProcessing/graphics/PV3FoamReader/PV3-3FoamReader/PV3FoamReader/vtkPV3FoamReader.h diff --git a/applications/utilities/postProcessing/graphics/PV3-3FoamReader/vtkPV3Foam/Make/files b/applications/utilities/postProcessing/graphics/PV3FoamReader/PV3-3FoamReader/vtkPV3Foam/Make/files similarity index 100% rename from applications/utilities/postProcessing/graphics/PV3-3FoamReader/vtkPV3Foam/Make/files rename to applications/utilities/postProcessing/graphics/PV3FoamReader/PV3-3FoamReader/vtkPV3Foam/Make/files diff --git a/applications/utilities/postProcessing/graphics/PV3-3FoamReader/vtkPV3Foam/Make/options b/applications/utilities/postProcessing/graphics/PV3FoamReader/PV3-3FoamReader/vtkPV3Foam/Make/options similarity index 100% rename from applications/utilities/postProcessing/graphics/PV3-3FoamReader/vtkPV3Foam/Make/options rename to applications/utilities/postProcessing/graphics/PV3FoamReader/PV3-3FoamReader/vtkPV3Foam/Make/options diff --git a/applications/utilities/postProcessing/graphics/PV3-3FoamReader/vtkPV3Foam/vtkDataArrayTemplateImplicit.txx b/applications/utilities/postProcessing/graphics/PV3FoamReader/PV3-3FoamReader/vtkPV3Foam/vtkDataArrayTemplateImplicit.txx similarity index 100% rename from applications/utilities/postProcessing/graphics/PV3-3FoamReader/vtkPV3Foam/vtkDataArrayTemplateImplicit.txx rename to applications/utilities/postProcessing/graphics/PV3FoamReader/PV3-3FoamReader/vtkPV3Foam/vtkDataArrayTemplateImplicit.txx diff --git a/applications/utilities/postProcessing/graphics/PV3-3FoamReader/vtkPV3Foam/vtkPV3Foam.C b/applications/utilities/postProcessing/graphics/PV3FoamReader/PV3-3FoamReader/vtkPV3Foam/vtkPV3Foam.C similarity index 100% rename from applications/utilities/postProcessing/graphics/PV3-3FoamReader/vtkPV3Foam/vtkPV3Foam.C rename to applications/utilities/postProcessing/graphics/PV3FoamReader/PV3-3FoamReader/vtkPV3Foam/vtkPV3Foam.C diff --git a/applications/utilities/postProcessing/graphics/PV3-3FoamReader/vtkPV3Foam/vtkPV3Foam.H b/applications/utilities/postProcessing/graphics/PV3FoamReader/PV3-3FoamReader/vtkPV3Foam/vtkPV3Foam.H similarity index 100% rename from applications/utilities/postProcessing/graphics/PV3-3FoamReader/vtkPV3Foam/vtkPV3Foam.H rename to applications/utilities/postProcessing/graphics/PV3FoamReader/PV3-3FoamReader/vtkPV3Foam/vtkPV3Foam.H diff --git a/applications/utilities/postProcessing/graphics/PV3-3FoamReader/vtkPV3Foam/vtkPV3FoamAddFaceSetMesh.C b/applications/utilities/postProcessing/graphics/PV3FoamReader/PV3-3FoamReader/vtkPV3Foam/vtkPV3FoamAddFaceSetMesh.C similarity index 100% rename from applications/utilities/postProcessing/graphics/PV3-3FoamReader/vtkPV3Foam/vtkPV3FoamAddFaceSetMesh.C rename to applications/utilities/postProcessing/graphics/PV3FoamReader/PV3-3FoamReader/vtkPV3Foam/vtkPV3FoamAddFaceSetMesh.C diff --git a/applications/utilities/postProcessing/graphics/PV3-3FoamReader/vtkPV3Foam/vtkPV3FoamAddFaceZoneMesh.C b/applications/utilities/postProcessing/graphics/PV3FoamReader/PV3-3FoamReader/vtkPV3Foam/vtkPV3FoamAddFaceZoneMesh.C similarity index 100% rename from applications/utilities/postProcessing/graphics/PV3-3FoamReader/vtkPV3Foam/vtkPV3FoamAddFaceZoneMesh.C rename to applications/utilities/postProcessing/graphics/PV3FoamReader/PV3-3FoamReader/vtkPV3Foam/vtkPV3FoamAddFaceZoneMesh.C diff --git a/applications/utilities/postProcessing/graphics/PV3-3FoamReader/vtkPV3Foam/vtkPV3FoamAddFields.H b/applications/utilities/postProcessing/graphics/PV3FoamReader/PV3-3FoamReader/vtkPV3Foam/vtkPV3FoamAddFields.H similarity index 100% rename from applications/utilities/postProcessing/graphics/PV3-3FoamReader/vtkPV3Foam/vtkPV3FoamAddFields.H rename to applications/utilities/postProcessing/graphics/PV3FoamReader/PV3-3FoamReader/vtkPV3Foam/vtkPV3FoamAddFields.H diff --git a/applications/utilities/postProcessing/graphics/PV3-3FoamReader/vtkPV3Foam/vtkPV3FoamAddLagrangianMesh.C b/applications/utilities/postProcessing/graphics/PV3FoamReader/PV3-3FoamReader/vtkPV3Foam/vtkPV3FoamAddLagrangianMesh.C similarity index 100% rename from applications/utilities/postProcessing/graphics/PV3-3FoamReader/vtkPV3Foam/vtkPV3FoamAddLagrangianMesh.C rename to applications/utilities/postProcessing/graphics/PV3FoamReader/PV3-3FoamReader/vtkPV3Foam/vtkPV3FoamAddLagrangianMesh.C diff --git a/applications/utilities/postProcessing/graphics/PV3-3FoamReader/vtkPV3Foam/vtkPV3FoamAddPatchMesh.C b/applications/utilities/postProcessing/graphics/PV3FoamReader/PV3-3FoamReader/vtkPV3Foam/vtkPV3FoamAddPatchMesh.C similarity index 100% rename from applications/utilities/postProcessing/graphics/PV3-3FoamReader/vtkPV3Foam/vtkPV3FoamAddPatchMesh.C rename to applications/utilities/postProcessing/graphics/PV3FoamReader/PV3-3FoamReader/vtkPV3Foam/vtkPV3FoamAddPatchMesh.C diff --git a/applications/utilities/postProcessing/graphics/PV3-3FoamReader/vtkPV3Foam/vtkPV3FoamAddPointSetMesh.C b/applications/utilities/postProcessing/graphics/PV3FoamReader/PV3-3FoamReader/vtkPV3Foam/vtkPV3FoamAddPointSetMesh.C similarity index 100% rename from applications/utilities/postProcessing/graphics/PV3-3FoamReader/vtkPV3Foam/vtkPV3FoamAddPointSetMesh.C rename to applications/utilities/postProcessing/graphics/PV3FoamReader/PV3-3FoamReader/vtkPV3Foam/vtkPV3FoamAddPointSetMesh.C diff --git a/applications/utilities/postProcessing/graphics/PV3-3FoamReader/vtkPV3Foam/vtkPV3FoamAddPointZoneMesh.C b/applications/utilities/postProcessing/graphics/PV3FoamReader/PV3-3FoamReader/vtkPV3Foam/vtkPV3FoamAddPointZoneMesh.C similarity index 100% rename from applications/utilities/postProcessing/graphics/PV3-3FoamReader/vtkPV3Foam/vtkPV3FoamAddPointZoneMesh.C rename to applications/utilities/postProcessing/graphics/PV3FoamReader/PV3-3FoamReader/vtkPV3Foam/vtkPV3FoamAddPointZoneMesh.C diff --git a/applications/utilities/postProcessing/graphics/PV3-3FoamReader/vtkPV3Foam/vtkPV3FoamAddVolumeMesh.C b/applications/utilities/postProcessing/graphics/PV3FoamReader/PV3-3FoamReader/vtkPV3Foam/vtkPV3FoamAddVolumeMesh.C similarity index 100% rename from applications/utilities/postProcessing/graphics/PV3-3FoamReader/vtkPV3Foam/vtkPV3FoamAddVolumeMesh.C rename to applications/utilities/postProcessing/graphics/PV3FoamReader/PV3-3FoamReader/vtkPV3Foam/vtkPV3FoamAddVolumeMesh.C diff --git a/applications/utilities/postProcessing/graphics/PV3-3FoamReader/vtkPV3Foam/vtkPV3FoamConvertFaceField.H b/applications/utilities/postProcessing/graphics/PV3FoamReader/PV3-3FoamReader/vtkPV3Foam/vtkPV3FoamConvertFaceField.H similarity index 100% rename from applications/utilities/postProcessing/graphics/PV3-3FoamReader/vtkPV3Foam/vtkPV3FoamConvertFaceField.H rename to applications/utilities/postProcessing/graphics/PV3FoamReader/PV3-3FoamReader/vtkPV3Foam/vtkPV3FoamConvertFaceField.H diff --git a/applications/utilities/postProcessing/graphics/PV3-3FoamReader/vtkPV3Foam/vtkPV3FoamConvertLagrangianFields.H b/applications/utilities/postProcessing/graphics/PV3FoamReader/PV3-3FoamReader/vtkPV3Foam/vtkPV3FoamConvertLagrangianFields.H similarity index 100% rename from applications/utilities/postProcessing/graphics/PV3-3FoamReader/vtkPV3Foam/vtkPV3FoamConvertLagrangianFields.H rename to applications/utilities/postProcessing/graphics/PV3FoamReader/PV3-3FoamReader/vtkPV3Foam/vtkPV3FoamConvertLagrangianFields.H diff --git a/applications/utilities/postProcessing/graphics/PV3-3FoamReader/vtkPV3Foam/vtkPV3FoamConvertMesh.C b/applications/utilities/postProcessing/graphics/PV3FoamReader/PV3-3FoamReader/vtkPV3Foam/vtkPV3FoamConvertMesh.C similarity index 100% rename from applications/utilities/postProcessing/graphics/PV3-3FoamReader/vtkPV3Foam/vtkPV3FoamConvertMesh.C rename to applications/utilities/postProcessing/graphics/PV3FoamReader/PV3-3FoamReader/vtkPV3Foam/vtkPV3FoamConvertMesh.C diff --git a/applications/utilities/postProcessing/graphics/PV3-3FoamReader/vtkPV3Foam/vtkPV3FoamConvertPatchFaceField.H b/applications/utilities/postProcessing/graphics/PV3FoamReader/PV3-3FoamReader/vtkPV3Foam/vtkPV3FoamConvertPatchFaceField.H similarity index 100% rename from applications/utilities/postProcessing/graphics/PV3-3FoamReader/vtkPV3Foam/vtkPV3FoamConvertPatchFaceField.H rename to applications/utilities/postProcessing/graphics/PV3FoamReader/PV3-3FoamReader/vtkPV3Foam/vtkPV3FoamConvertPatchFaceField.H diff --git a/applications/utilities/postProcessing/graphics/PV3-3FoamReader/vtkPV3Foam/vtkPV3FoamConvertPatchPointField.H b/applications/utilities/postProcessing/graphics/PV3FoamReader/PV3-3FoamReader/vtkPV3Foam/vtkPV3FoamConvertPatchPointField.H similarity index 100% rename from applications/utilities/postProcessing/graphics/PV3-3FoamReader/vtkPV3Foam/vtkPV3FoamConvertPatchPointField.H rename to applications/utilities/postProcessing/graphics/PV3FoamReader/PV3-3FoamReader/vtkPV3Foam/vtkPV3FoamConvertPatchPointField.H diff --git a/applications/utilities/postProcessing/graphics/PV3-3FoamReader/vtkPV3Foam/vtkPV3FoamConvertPointFields.H b/applications/utilities/postProcessing/graphics/PV3FoamReader/PV3-3FoamReader/vtkPV3Foam/vtkPV3FoamConvertPointFields.H similarity index 100% rename from applications/utilities/postProcessing/graphics/PV3-3FoamReader/vtkPV3Foam/vtkPV3FoamConvertPointFields.H rename to applications/utilities/postProcessing/graphics/PV3FoamReader/PV3-3FoamReader/vtkPV3Foam/vtkPV3FoamConvertPointFields.H diff --git a/applications/utilities/postProcessing/graphics/PV3-3FoamReader/vtkPV3Foam/vtkPV3FoamConvertVolFields.H b/applications/utilities/postProcessing/graphics/PV3FoamReader/PV3-3FoamReader/vtkPV3Foam/vtkPV3FoamConvertVolFields.H similarity index 100% rename from applications/utilities/postProcessing/graphics/PV3-3FoamReader/vtkPV3Foam/vtkPV3FoamConvertVolFields.H rename to applications/utilities/postProcessing/graphics/PV3FoamReader/PV3-3FoamReader/vtkPV3Foam/vtkPV3FoamConvertVolFields.H diff --git a/applications/utilities/postProcessing/graphics/PV3-3FoamReader/vtkPV3Foam/vtkPV3FoamI.H b/applications/utilities/postProcessing/graphics/PV3FoamReader/PV3-3FoamReader/vtkPV3Foam/vtkPV3FoamI.H similarity index 100% rename from applications/utilities/postProcessing/graphics/PV3-3FoamReader/vtkPV3Foam/vtkPV3FoamI.H rename to applications/utilities/postProcessing/graphics/PV3FoamReader/PV3-3FoamReader/vtkPV3Foam/vtkPV3FoamI.H diff --git a/applications/utilities/postProcessing/graphics/PV3-3FoamReader/vtkPV3Foam/vtkPV3FoamInsertNextPoint.H b/applications/utilities/postProcessing/graphics/PV3FoamReader/PV3-3FoamReader/vtkPV3Foam/vtkPV3FoamInsertNextPoint.H similarity index 100% rename from applications/utilities/postProcessing/graphics/PV3-3FoamReader/vtkPV3Foam/vtkPV3FoamInsertNextPoint.H rename to applications/utilities/postProcessing/graphics/PV3FoamReader/PV3-3FoamReader/vtkPV3Foam/vtkPV3FoamInsertNextPoint.H diff --git a/applications/utilities/postProcessing/graphics/PV3-3FoamReader/vtkPV3Foam/vtkPV3FoamUpdate.C b/applications/utilities/postProcessing/graphics/PV3FoamReader/PV3-3FoamReader/vtkPV3Foam/vtkPV3FoamUpdate.C similarity index 100% rename from applications/utilities/postProcessing/graphics/PV3-3FoamReader/vtkPV3Foam/vtkPV3FoamUpdate.C rename to applications/utilities/postProcessing/graphics/PV3FoamReader/PV3-3FoamReader/vtkPV3Foam/vtkPV3FoamUpdate.C diff --git a/applications/utilities/postProcessing/graphics/PV3-3FoamReader/vtkPV3Foam/vtkPV3FoamUpdateInformation.C b/applications/utilities/postProcessing/graphics/PV3FoamReader/PV3-3FoamReader/vtkPV3Foam/vtkPV3FoamUpdateInformation.C similarity index 100% rename from applications/utilities/postProcessing/graphics/PV3-3FoamReader/vtkPV3Foam/vtkPV3FoamUpdateInformation.C rename to applications/utilities/postProcessing/graphics/PV3FoamReader/PV3-3FoamReader/vtkPV3Foam/vtkPV3FoamUpdateInformation.C diff --git a/applications/utilities/postProcessing/graphics/PV3-3FoamReader/vtkPV3Foam/vtkPV3FoamUpdateInformationFields.H b/applications/utilities/postProcessing/graphics/PV3FoamReader/PV3-3FoamReader/vtkPV3Foam/vtkPV3FoamUpdateInformationFields.H similarity index 100% rename from applications/utilities/postProcessing/graphics/PV3-3FoamReader/vtkPV3Foam/vtkPV3FoamUpdateInformationFields.H rename to applications/utilities/postProcessing/graphics/PV3FoamReader/PV3-3FoamReader/vtkPV3Foam/vtkPV3FoamUpdateInformationFields.H diff --git a/applications/utilities/postProcessing/graphics/PV3FoamReader/PV3FoamReader/CMakeLists.txt b/applications/utilities/postProcessing/graphics/PV3FoamReader/PV3FoamReader/CMakeLists.txt deleted file mode 100644 index fc69d0e60a..0000000000 --- a/applications/utilities/postProcessing/graphics/PV3FoamReader/PV3FoamReader/CMakeLists.txt +++ /dev/null @@ -1,54 +0,0 @@ - -# create a plugin that adds a reader to the ParaView GUI -# it is added in the file dialog when doing opens/saves. - -# The qrc file is processed by Qt's resource compiler (rcc) -# the qrc file must have a resource prefix of "/ParaViewResources" -# and ParaView will read anything contained under that prefix -# the pqReader.xml file contains xml defining readers with their -# file extensions and descriptions. - -FIND_PACKAGE(ParaView REQUIRED) -INCLUDE(${PARAVIEW_USE_FILE}) - -LINK_DIRECTORIES( - $ENV{FOAM_LIBBIN} -) - -INCLUDE_DIRECTORIES( - $ENV{FOAM_SRC}/OpenFOAM/lnInclude - $ENV{FOAM_SRC}/finiteVolume/lnInclude - ${PROJECT_SOURCE_DIR}/../vtkPV3Foam -) - -ADD_DEFINITIONS( - -D$ENV{WM_PRECISION_OPTION} -) - -# Set output library destination to plugin folder -SET( - LIBRARY_OUTPUT_PATH $ENV{PV_PLUGIN_PATH} - CACHE INTERNAL - "Single output directory for building all libraries." -) - -# Build the server-side plugin -ADD_PARAVIEW_PLUGIN( - PV3FoamReader_SM "1.0" - SERVER_MANAGER_XML PV3FoamReader_SM.xml - SERVER_MANAGER_SOURCES vtkPV3FoamReader.cxx -) - -# Build the client-side plugin -ADD_PARAVIEW_PLUGIN( - PV3FoamReader - "1.0" - GUI_RESOURCES PV3FoamReader.qrc -) - -TARGET_LINK_LIBRARIES( - PV3FoamReader_SM - OpenFOAM - finiteVolume - vtkPV3Foam -) diff --git a/applications/utilities/postProcessing/graphics/PV3FoamReader/PV3FoamReader/PV3FoamReader.qrc b/applications/utilities/postProcessing/graphics/PV3FoamReader/PV3FoamReader/PV3FoamReader.qrc deleted file mode 100644 index 7394bb80df..0000000000 --- a/applications/utilities/postProcessing/graphics/PV3FoamReader/PV3FoamReader/PV3FoamReader.qrc +++ /dev/null @@ -1,5 +0,0 @@ - - - PV3FoamReader.xml - - diff --git a/applications/utilities/postProcessing/graphics/PV3FoamReader/PV3FoamReader/PV3FoamReader.xml b/applications/utilities/postProcessing/graphics/PV3FoamReader/PV3FoamReader/PV3FoamReader.xml deleted file mode 100644 index 5f3408be70..0000000000 --- a/applications/utilities/postProcessing/graphics/PV3FoamReader/PV3FoamReader/PV3FoamReader.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - diff --git a/applications/utilities/postProcessing/graphics/PV3FoamReader/PV3FoamReader/PV3FoamReader_SM.xml b/applications/utilities/postProcessing/graphics/PV3FoamReader/PV3FoamReader/PV3FoamReader_SM.xml deleted file mode 100644 index f2380e2bf3..0000000000 --- a/applications/utilities/postProcessing/graphics/PV3FoamReader/PV3FoamReader/PV3FoamReader_SM.xml +++ /dev/null @@ -1,238 +0,0 @@ - - - - - - - - - - - - - - Available timestep values. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/applications/utilities/postProcessing/graphics/PV3FoamReader/PV3FoamReader/vtkPV3FoamReader.cxx b/applications/utilities/postProcessing/graphics/PV3FoamReader/PV3FoamReader/vtkPV3FoamReader.cxx deleted file mode 100644 index 12872d6143..0000000000 --- a/applications/utilities/postProcessing/graphics/PV3FoamReader/PV3FoamReader/vtkPV3FoamReader.cxx +++ /dev/null @@ -1,600 +0,0 @@ -/*========================================================================= - - Program: Visualization Toolkit - Module: $RCSfile: vtkPV3FoamReader.cxx,v $ - - Copyright (c) Ken Martin, Will Schroeder, Bill Lorensen - All rights reserved. - See Copyright.txt or http://www.kitware.com/Copyright.htm for details. - - This software is distributed WITHOUT ANY WARRANTY; without even - the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - PURPOSE. See the above copyright notice for more information. - -=========================================================================*/ - -#include "vtkPV3FoamReader.h" - -#include "pqApplicationCore.h" -#include "pqRenderView.h" -#include "pqServerManagerModel.h" - -// VTK includes -#include "vtkCallbackCommand.h" -#include "vtkCellArray.h" -#include "vtkCellData.h" -#include "vtkDataArraySelection.h" -#include "vtkDirectory.h" -#include "vtkDoubleArray.h" -#include "vtkErrorCode.h" -#include "vtkFloatArray.h" -#include "vtkInformation.h" -#include "vtkInformationVector.h" -#include "vtkIntArray.h" -#include "vtkMultiBlockDataSet.h" -#include "vtkObjectFactory.h" -#include "vtkPoints.h" -#include "vtkRenderer.h" -#include "vtkSMRenderViewProxy.h" -#include "vtkStreamingDemandDrivenPipeline.h" -#include "vtkStringArray.h" -#include "vtkUnstructuredGrid.h" -#include "vtkUnstructuredGridAlgorithm.h" - -// Foam includes -#include "vtkPV3Foam.H" - - -vtkCxxRevisionMacro(vtkPV3FoamReader, "$Revision: 1.2$"); -vtkStandardNewMacro(vtkPV3FoamReader); - - -vtkPV3FoamReader::vtkPV3FoamReader() -{ - vtkDebugMacro(<<"Constructor"); - - SetNumberOfInputPorts(0); - - FileName = NULL; - foamData_ = NULL; - - CacheMesh = 0; - - UpdateGUI = 1; - UpdateGUIOld = 1; - TimeStep = 0; - TimeStepRange[0] = 0; - TimeStepRange[1] = 0; - - ShowPatchNames = 0; - - TimeSelection = vtkDataArraySelection::New(); - PointFieldSelection = vtkDataArraySelection::New(); - RegionSelection = vtkDataArraySelection::New(); - VolFieldSelection = vtkDataArraySelection::New(); - LagrangianFieldSelection = vtkDataArraySelection::New(); - - // Setup the selection callback to modify this object when an array - // selection is changed. - SelectionObserver = vtkCallbackCommand::New(); - SelectionObserver->SetCallback - ( - &vtkPV3FoamReader::SelectionModifiedCallback - ); - SelectionObserver->SetClientData(this); - - TimeSelection->AddObserver - ( - vtkCommand::ModifiedEvent, - this->SelectionObserver - ); - RegionSelection->AddObserver - ( - vtkCommand::ModifiedEvent, - this->SelectionObserver - ); - VolFieldSelection->AddObserver - ( - vtkCommand::ModifiedEvent, - this->SelectionObserver - ); - PointFieldSelection->AddObserver - ( - vtkCommand::ModifiedEvent, - this->SelectionObserver - ); - LagrangianFieldSelection->AddObserver - ( - vtkCommand::ModifiedEvent, - this->SelectionObserver - ); -} - -vtkPV3FoamReader::~vtkPV3FoamReader() -{ - vtkDebugMacro(<<"Deconstructor"); - - if (foamData_) - { - delete foamData_; - } - - if (FileName) - { - delete [] FileName; - } - - TimeSelection->RemoveObserver(this->SelectionObserver); - RegionSelection->RemoveObserver(this->SelectionObserver); - VolFieldSelection->RemoveObserver(this->SelectionObserver); - PointFieldSelection->RemoveObserver(this->SelectionObserver); - SelectionObserver->Delete(); - - TimeSelection->Delete(); - RegionSelection->Delete(); - VolFieldSelection->Delete(); - PointFieldSelection->Delete(); -} - - -// Do everything except set the output info -int vtkPV3FoamReader::RequestInformation -( - vtkInformation* vtkNotUsed(request), - vtkInformationVector** vtkNotUsed(inputVector), - vtkInformationVector* outputVector -) -{ - vtkDebugMacro(<<"Request Information"); - - if (!FileName) - { - vtkErrorMacro("FileName has to be specified!"); - return 0; - } - - if (!foamData_) - { - vtkDebugMacro("RequestInformation: creating foamData_"); - - vtkInformation* outInfo = outputVector->GetInformationObject(0); - vtkMultiBlockDataSet* output = vtkMultiBlockDataSet::SafeDownCast - ( - outInfo->Get(vtkMultiBlockDataSet::DATA_OBJECT()) - ); - foamData_ = new Foam::vtkPV3Foam(FileName, this, output); - foamData_->UpdateInformation(); - } - else - { - vtkDebugMacro("RequestInformation: updating information"); - - foamData_->UpdateInformation(); - } - - double* timeSteps = foamData_->timeSteps(); - outputVector->GetInformationObject(0)->Set - ( - vtkStreamingDemandDrivenPipeline::TIME_STEPS(), - timeSteps, - foamData_->numberOfTimeSteps() - ); - delete timeSteps; - - return 1; -} - - -// Set the output info -int vtkPV3FoamReader::RequestData -( - vtkInformation* vtkNotUsed(request), - vtkInformationVector** vtkNotUsed(inputVector), - vtkInformationVector* outputVector -) -{ - vtkDebugMacro(<<"RequestData"); - - if (!FileName) - { - vtkErrorMacro("FileName has to be specified!"); - return 0; - } - - vtkInformation* outInfo = outputVector->GetInformationObject(0); - vtkMultiBlockDataSet* output = vtkMultiBlockDataSet::SafeDownCast - ( - outInfo->Get(vtkMultiBlockDataSet::DATA_OBJECT()) - ); - - if - ( - (UpdateGUIOld == GetUpdateGUI()) - || (output->GetNumberOfBlocks() == 0) - ) - { - foamData_->Update(output); - - if (ShowPatchNames == 1) - { - addPatchNamesToView(); - } - else - { - removePatchNamesFromView(); - } - } - UpdateGUIOld = GetUpdateGUI(); - - return 1; -} - - -void vtkPV3FoamReader::addPatchNamesToView() -{ - pqApplicationCore* appCore = pqApplicationCore::instance(); - - // Server manager model for querying items in the server manager - pqServerManagerModel* smModel = appCore->getServerManagerModel(); - - // Get all the pqRenderView instances - QList renderViews = smModel->findItems(); - - for (int viewI=0; viewIaddPatchNames - ( - renderViews[viewI]->getRenderViewProxy()->GetRenderer() - ); - } -} - - -void vtkPV3FoamReader::removePatchNamesFromView() -{ - pqApplicationCore* appCore = pqApplicationCore::instance(); - - // Server manager model for querying items in the server manager - pqServerManagerModel* smModel = appCore->getServerManagerModel(); - - // Get all the pqRenderView instances - QList renderViews = smModel->findItems(); - - for (int viewI=0; viewIremovePatchNames - ( - renderViews[viewI]->getRenderViewProxy()->GetRenderer() - ); - } -} - - -void vtkPV3FoamReader::PrintSelf -( - ostream& os, - vtkIndent indent -) -{ - vtkDebugMacro(<<"PrintSelf"); - - this->Superclass::PrintSelf(os,indent); - os<< indent << "File name: " - << (this->FileName ? this->FileName : "(none)") << "\n"; - os<< indent << "Number of meshes: " << foamData_->numberOfMeshes() << "\n"; - os<< indent << "Number of nodes: " << foamData_->numberOfPoints() << "\n"; - os<< indent << "Number of cells: " << foamData_->numberOfCells() << "\n"; - os<< indent << "Number of time steps: " << foamData_->numberOfTimeSteps() - << endl; - os<< indent << "Time step range: " - << this->TimeStepRange[0] << " - " << this->TimeStepRange[1] - << endl; - os<< indent << "Time step: " << this->TimeStep << endl; - return; -} - - -vtkDataArraySelection* vtkPV3FoamReader::GetTimeSelection() -{ - vtkDebugMacro(<<"GetTimeSelection"); - - return TimeSelection; -} - - -int vtkPV3FoamReader::GetNumberOfTimeArrays() -{ - vtkDebugMacro(<<"GetNumberOf TimeArrays"); - - return TimeSelection->GetNumberOfArrays(); -} - - -const char* vtkPV3FoamReader::GetTimeArrayName -( - int index -) -{ - vtkDebugMacro(<<"GetTimeArrayName"); - - return TimeSelection->GetArrayName(index); -} - - -int vtkPV3FoamReader::GetTimeArrayStatus -( - const char* name -) -{ - vtkDebugMacro(<<"GetTimeArrayStatus"); - - return TimeSelection->ArrayIsEnabled(name); -} - - -void vtkPV3FoamReader::SetTimeArrayStatus -( - const char* name, - int status -) -{ - vtkDebugMacro(<<"SetTimeArrayStatus"); - - if (status) - { - TimeSelection->EnableArray(name); - } - else - { - TimeSelection->DisableArray(name); - } -} - - -vtkDataArraySelection* vtkPV3FoamReader::GetRegionSelection() -{ - vtkDebugMacro(<<"GetRegionSelection"); - - return RegionSelection; -} - - -int vtkPV3FoamReader::GetNumberOfRegionArrays() -{ - vtkDebugMacro(<<"GetNumberOfRegionArrays"); - - return RegionSelection->GetNumberOfArrays(); -} - - -const char* vtkPV3FoamReader::GetRegionArrayName -( - int index -) -{ - vtkDebugMacro(<<"GetRegionArrayName"); - - return RegionSelection->GetArrayName(index); -} - - -int vtkPV3FoamReader::GetRegionArrayStatus -( - const char* name -) -{ - vtkDebugMacro(<<"GetRegionArrayStatus"); - - return RegionSelection->ArrayIsEnabled(name); -} - - -void vtkPV3FoamReader::SetRegionArrayStatus -( - const char* name, - int status -) -{ - vtkDebugMacro(<<"SetRegionArrayStatus"); - - if(status) - { - RegionSelection->EnableArray(name); - } - else - { - RegionSelection->DisableArray(name); - } -} - - -vtkDataArraySelection* vtkPV3FoamReader::GetVolFieldSelection() -{ - vtkDebugMacro(<<"GetVolFieldSelection"); - - return VolFieldSelection; -} - - -int vtkPV3FoamReader::GetNumberOfVolFieldArrays() -{ - vtkDebugMacro(<<"GetNumberOfVolFieldArrays"); - - return VolFieldSelection->GetNumberOfArrays(); -} - - -const char* vtkPV3FoamReader::GetVolFieldArrayName -( - int index -) -{ - vtkDebugMacro(<<"GetVolFieldArrayName"); - - return VolFieldSelection->GetArrayName(index); -} - - -int vtkPV3FoamReader::GetVolFieldArrayStatus -( - const char* name -) -{ - vtkDebugMacro(<<"GetVolFieldArrayStatus"); - - return VolFieldSelection->ArrayIsEnabled(name); -} - - -void vtkPV3FoamReader::SetVolFieldArrayStatus -( - const char* name, - int status -) -{ - vtkDebugMacro(<<"SetVolFieldArrayStatus"); - - if (status) - { - VolFieldSelection->EnableArray(name); - } - else - { - VolFieldSelection->DisableArray(name); - } -} - - -vtkDataArraySelection* vtkPV3FoamReader::GetPointFieldSelection() -{ - vtkDebugMacro(<<"GetPointFieldSelection"); - - return PointFieldSelection; -} - - -int vtkPV3FoamReader::GetNumberOfPointFieldArrays() -{ - vtkDebugMacro(<<"GetNumberOfPointFieldArrays"); - - return PointFieldSelection->GetNumberOfArrays(); -} - - -const char* vtkPV3FoamReader::GetPointFieldArrayName -( - int index -) -{ - vtkDebugMacro(<<"GetPointFieldArrayName"); - - return PointFieldSelection->GetArrayName(index); -} - - -int vtkPV3FoamReader::GetPointFieldArrayStatus -( - const char* name -) -{ - vtkDebugMacro(<<"GetPointFieldArrayStatus"); - - return PointFieldSelection->ArrayIsEnabled(name); -} - - -void vtkPV3FoamReader::SetPointFieldArrayStatus -( - const char* name, - int status -) -{ - vtkDebugMacro(<<"SetPointFieldArrayStatus"); - - if (status) - { - PointFieldSelection->EnableArray(name); - } - else - { - PointFieldSelection->DisableArray(name); - } -} - - -vtkDataArraySelection* vtkPV3FoamReader::GetLagrangianFieldSelection() -{ - vtkDebugMacro(<<"GetLagrangianFieldSelection"); - - return LagrangianFieldSelection; -} - - -int vtkPV3FoamReader::GetNumberOfLagrangianFieldArrays() -{ - vtkDebugMacro(<<"GetNumberOfLagrangianFieldArrays"); - - return LagrangianFieldSelection->GetNumberOfArrays(); -} - - -const char* vtkPV3FoamReader::GetLagrangianFieldArrayName -( - int index -) -{ - vtkDebugMacro(<<"GetLagrangianFieldArrayName"); - - return LagrangianFieldSelection->GetArrayName(index); -} - - -int vtkPV3FoamReader::GetLagrangianFieldArrayStatus -( - const char* name -) -{ - vtkDebugMacro(<<"GetLagrangianFieldArrayStatus"); - - return LagrangianFieldSelection->ArrayIsEnabled(name); -} - - -void vtkPV3FoamReader::SetLagrangianFieldArrayStatus -( - const char* name, - int status -) -{ - vtkDebugMacro(<<"SetLagrangianFieldArrayStatus"); - - if (status) - { - LagrangianFieldSelection->EnableArray(name); - } - else - { - LagrangianFieldSelection->DisableArray(name); - } -} - - -void vtkPV3FoamReader::SelectionModifiedCallback -( - vtkObject*, - unsigned long, - void* clientdata, - void* -) -{ - static_cast(clientdata)->SelectionModified(); -} - - -void vtkPV3FoamReader::SelectionModified() -{ - vtkDebugMacro(<<"SelectionModified"); - - Modified(); -} - diff --git a/applications/utilities/postProcessing/graphics/PV3FoamReader/PV3FoamReader/vtkPV3FoamReader.h b/applications/utilities/postProcessing/graphics/PV3FoamReader/PV3FoamReader/vtkPV3FoamReader.h deleted file mode 100644 index c9875f9673..0000000000 --- a/applications/utilities/postProcessing/graphics/PV3FoamReader/PV3FoamReader/vtkPV3FoamReader.h +++ /dev/null @@ -1,197 +0,0 @@ -/*========================================================================= - - Program: Visualization Toolkit - Module: $RCSfile: vtkPV3FoamReader.h,v $ - - Copyright (c) Ken Martin, Will Schroeder, Bill Lorensen - All rights reserved. - See Copyright.txt or http://www.kitware.com/Copyright.htm for details. - - This software is distributed WITHOUT ANY WARRANTY; without even - the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - PURPOSE. See the above copyright notice for more information. - -=========================================================================*/ -// .NAME vtkPV3FoamReader - reads a dataset in OpenFOAM format -// .SECTION Description -// vtkPV3FoamReader creates an multiblock dataset. It reads a controlDict -// file, mesh information, and time dependent data. The controlDict file -// contains timestep information. The polyMesh folders contain mesh information -// The time folders contain transient data for the cells Each folder can -// contain any number of data files. - -#ifndef __vtkPV3FoamReader_h -#define __vtkPV3FoamReader_h - -#include "vtkMultiBlockDataSetAlgorithm.h" - -// Foam forward declarations -namespace Foam -{ - class vtkPV3Foam; -} - -// VTK forward declarations -class vtkUnstructuredGrid; -class vtkPoints; -class vtkIntArray; -class vtkFloatArray; -class vtkDoubleArray; -class vtkDataArraySelection; -class vtkCallbackCommand; - - -class VTK_IO_EXPORT vtkPV3FoamReader -: - public vtkMultiBlockDataSetAlgorithm -{ -public: - - static vtkPV3FoamReader* New(); - - vtkTypeRevisionMacro - ( - vtkPV3FoamReader, - vtkMultiBlockDataSetAlgorithm - ); - - void PrintSelf - ( - ostream& os, - vtkIndent indent - ); - - // Description: - // Set/Get the filename. - vtkSetStringMacro(FileName); - vtkGetStringMacro(FileName); - - // GUI update control - vtkSetMacro(UpdateGUI, int); - vtkGetMacro(UpdateGUI, int); - - // FOAM mesh caching control - vtkSetMacro(CacheMesh, int); - vtkGetMacro(CacheMesh, int); - - // FOAM read sets control - vtkSetMacro(IncludeSets, int); - vtkGetMacro(IncludeSets, int); - - // FOAM patch names control - vtkSetMacro(ShowPatchNames, int); - vtkGetMacro(ShowPatchNames, int); - - // Time-step slider control - vtkSetMacro(TimeStep, int); - vtkGetMacro(TimeStep, int); - vtkSetVector2Macro(TimeStepRange, int); - vtkGetVector2Macro(TimeStepRange, int); - - // Time selection list control - vtkDataArraySelection* GetTimeSelection(); - int GetNumberOfTimeArrays(); - const char* GetTimeArrayName(int index); - int GetTimeArrayStatus(const char* name); - void SetTimeArrayStatus(const char* name, int status); - - - // Region selection list control - vtkDataArraySelection* GetRegionSelection(); - int GetNumberOfRegionArrays(); - const char* GetRegionArrayName(int index); - int GetRegionArrayStatus(const char* name); - void SetRegionArrayStatus(const char* name, int status); - - // volField selection list control - vtkDataArraySelection* GetVolFieldSelection(); - int GetNumberOfVolFieldArrays(); - const char* GetVolFieldArrayName(int index); - int GetVolFieldArrayStatus(const char* name); - void SetVolFieldArrayStatus(const char* name, int status); - - // pointField selection list control - vtkDataArraySelection* GetPointFieldSelection(); - int GetNumberOfPointFieldArrays(); - const char* GetPointFieldArrayName(int index); - int GetPointFieldArrayStatus(const char* name); - void SetPointFieldArrayStatus(const char* name, int status); - - // lagrangianField selection list control - vtkDataArraySelection* GetLagrangianFieldSelection(); - int GetNumberOfLagrangianFieldArrays(); - const char* GetLagrangianFieldArrayName(int index); - int GetLagrangianFieldArrayStatus(const char* name); - void SetLagrangianFieldArrayStatus(const char* name, int status); - - // Callback registered with the SelectionObserver - // for all the selection lists - static void SelectionModifiedCallback - ( - vtkObject* caller, - unsigned long eid, - void* clientdata, - void* calldata - ); - - void SelectionModified(); - - -protected: - - vtkPV3FoamReader(); - ~vtkPV3FoamReader(); - - char* FileName; - - virtual int RequestData - ( - vtkInformation*, - vtkInformationVector**, - vtkInformationVector* - ); - - virtual int RequestInformation - ( - vtkInformation*, - vtkInformationVector**, - vtkInformationVector* - ); - - // The observer to modify this object when the array selections - // are modified - vtkCallbackCommand* SelectionObserver; - - -private: - - vtkPV3FoamReader(const vtkPV3FoamReader&); // Not implemented. - void operator=(const vtkPV3FoamReader&); // Not implemented. - - //- Add patch names to the view - void addPatchNamesToView(); - - //- Remove patch names from the view - void removePatchNamesFromView(); - - int CacheMesh; - int IncludeSets; - int ShowPatchNames; - - int UpdateGUI; - int UpdateGUIOld; - int TimeStep; - int TimeStepRange[2]; - - vtkDataArraySelection* TimeSelection; - vtkDataArraySelection* RegionSelection; - vtkDataArraySelection* VolFieldSelection; - vtkDataArraySelection* PointFieldSelection; - vtkDataArraySelection* LagrangianFieldSelection; - - //BTX - Foam::vtkPV3Foam* foamData_; - //ETX -}; - -#endif diff --git a/applications/utilities/postProcessing/graphics/PV3FoamReader/vtkPV3Foam/Make/files b/applications/utilities/postProcessing/graphics/PV3FoamReader/vtkPV3Foam/Make/files deleted file mode 100755 index d42dd9492d..0000000000 --- a/applications/utilities/postProcessing/graphics/PV3FoamReader/vtkPV3Foam/Make/files +++ /dev/null @@ -1,11 +0,0 @@ -vtkPV3Foam.C -vtkPV3FoamAddVolumeMesh.C -vtkPV3FoamAddLagrangianMesh.C -vtkPV3FoamAddPatchMesh.C -vtkPV3FoamAddFaceSetMesh.C -vtkPV3FoamAddPointSetMesh.C -vtkPV3FoamUpdate.C -vtkPV3FoamUpdateInformation.C -vtkPV3FoamConvertMesh.C - -LIB = $(FOAM_LIBBIN)/libvtkPV3Foam diff --git a/applications/utilities/postProcessing/graphics/PV3FoamReader/vtkPV3Foam/Make/options b/applications/utilities/postProcessing/graphics/PV3FoamReader/vtkPV3Foam/Make/options deleted file mode 100755 index b40ecb51d7..0000000000 --- a/applications/utilities/postProcessing/graphics/PV3FoamReader/vtkPV3Foam/Make/options +++ /dev/null @@ -1,17 +0,0 @@ -EXE_INC = \ - -I$(LIB_SRC)/finiteVolume/lnInclude \ - -I$(LIB_SRC)/lagrangian/basic/lnInclude \ - -I$(LIB_SRC)/meshTools/lnInclude \ - -I$(ParaView_DIR)/VTK \ - -I$(ParaView_INST_DIR) \ - -I$(ParaView_INST_DIR)/VTK \ - -I$(ParaView_INST_DIR)/VTK/Common \ - -I$(ParaView_INST_DIR)/VTK/Filtering \ - -I$(ParaView_INST_DIR)/VTK/Rendering \ - -I../PV3FoamReader - -LIB_LIBS = \ - -lfiniteVolume \ - -llagrangian \ - -lmeshTools \ - $(GLIBS) diff --git a/applications/utilities/postProcessing/graphics/PV3FoamReader/vtkPV3Foam/vtkDataArrayTemplateImplicit.txx b/applications/utilities/postProcessing/graphics/PV3FoamReader/vtkPV3Foam/vtkDataArrayTemplateImplicit.txx deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/applications/utilities/postProcessing/graphics/PV3FoamReader/vtkPV3Foam/vtkPV3Foam.C b/applications/utilities/postProcessing/graphics/PV3FoamReader/vtkPV3Foam/vtkPV3Foam.C deleted file mode 100644 index 126b5b428d..0000000000 --- a/applications/utilities/postProcessing/graphics/PV3FoamReader/vtkPV3Foam/vtkPV3Foam.C +++ /dev/null @@ -1,803 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | - \\ / A nd | Copyright (C) 1991-2007 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 2 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, write to the Free Software Foundation, - Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -\*---------------------------------------------------------------------------*/ - -#include "vtkPV3Foam.H" - -// Foam includes -#include "argList.H" -#include "Time.H" -#include "IOobjectList.H" -#include "fvMesh.H" -#include "vtkPV3FoamReader.h" -#include "patchZones.H" - -// VTK includes -#include "vtkCharArray.h" -#include "vtkDataArraySelection.h" -#include "vtkDataSet.h" -#include "vtkFieldData.h" -#include "vtkInformation.h" -#include "vtkMultiBlockDataSet.h" -#include "vtkRenderer.h" -#include "vtkTextActor.h" -#include "vtkTextProperty.h" -#include "vtkUnstructuredGrid.h" - -// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // - -defineTypeNameAndDebug(Foam::vtkPV3Foam, 0); - -// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // - -#include "vtkPV3FoamAddFields.H" - -#include "vtkPV3FoamUpdateInformationFields.H" - - -void Foam::vtkPV3Foam::AddToBlock -( - vtkMultiBlockDataSet* output, - unsigned int blockNo, - unsigned int datasetNo, - vtkDataSet* dataset, - const char* datasetName -) -{ - vtkDataObject* blockDO = output->GetBlock(blockNo); - vtkMultiBlockDataSet* block = vtkMultiBlockDataSet::SafeDownCast(blockDO); - if (blockDO && !block) - { - FatalErrorIn("Foam::vtkPV3Foam::AddToBlock") - << "Block already has a vtkDataSet assigned to it" << nl << endl; - return; - } - - if (!block) - { - block = vtkMultiBlockDataSet::New(); - output->SetBlock(blockNo, block); - block->Delete(); - } - - block->SetBlock(datasetNo, dataset); - block->GetMetaData(datasetNo)->Set - ( - vtkCompositeDataSet::NAME(), datasetName - ); -} - - -vtkDataSet* Foam::vtkPV3Foam::GetDataSetFromBlock -( - vtkMultiBlockDataSet* output, - unsigned int blockNo, - unsigned int datasetNo -) -{ - vtkDataObject* blockDO = output->GetBlock(blockNo); - vtkMultiBlockDataSet* block = vtkMultiBlockDataSet::SafeDownCast(blockDO); - if (block) - { - return vtkDataSet::SafeDownCast(block->GetBlock(datasetNo)); - } - - return 0; -} - - -Foam::label Foam::vtkPV3Foam::GetNumberOfDataSets -( - vtkMultiBlockDataSet* output, - unsigned int blockNo -) -{ - vtkDataObject* blockDO = output->GetBlock(blockNo); - vtkMultiBlockDataSet* block = vtkMultiBlockDataSet::SafeDownCast(blockDO); - if (block) - { - return block->GetNumberOfBlocks(); - } - - return 0; -} - - -void Foam::vtkPV3Foam::resetCounters() -{ - // Reset data size counts - lagrangianDataSize_ = 0; - patchDataSize_ = 0; - cellSetDataSize_ = 0; - faceSetDataSize_ = 0; - pointSetDataSize_ = 0; - - // Reset region ids - idRegionVolume_ = -1; - idRegionLagrangian_ = -1; - idRegionPatches_ = -1; - idRegionCellSets_ = -1; - idRegionFaceSets_ = -1; - idRegionPointSets_ = -1; -} - - -void Foam::vtkPV3Foam::SetBlockName -( - vtkMultiBlockDataSet* blocks, - const int id, - const char* name -) -{ - if (debug) - { - Info<< "entered Foam::vtkPV3Foam::setBlockName" << endl; - } - - if (blocks->GetMetaData(id) != NULL) - { - blocks->GetMetaData(id)->Set(vtkCompositeDataSet::NAME(), name); - } -} - - -void Foam::vtkPV3Foam::setSelectedTime -( - Time& runTime, - vtkPV3FoamReader* reader -) -{ - if (debug) - { - Info<< "entered Foam::vtkPV3Foam::setSelectedTime" << endl; - } - - // Get times list - instantList times = runTime.times(); - int timeIndex = min(max(reader->GetTimeStep() + 1, 0), times.size() - 1); - - // If this is the first call timeIndex will be 0 ("constant") - // so reset to the first time step if one exists and deselect every - // element of the selection array - if (timeIndex == 0) - { - timeIndex = min(1, times.size() - 1); - reader->GetTimeSelection()->DisableAllArrays(); - } - - label selectedTimeIndex = -1; - const label nSelectedTimes = - reader->GetTimeSelection()->GetNumberOfArrays(); - - // Choose latest time - for (label i=nSelectedTimes - 1; i>=0; i--) - { - if (reader->GetTimeSelection()->GetArraySetting(i)) - { - word timeName = string::validate - ( - reader->GetTimeSelection()->GetArrayName(i) - ); - - forAll(times, j) - { - if (times[j].name() == timeName) - { - selectedTimeIndex = j; - break; - } - } - break; - } - } - - if (selectedTimeIndex != -1) - { - timeIndex = min(selectedTimeIndex, times.size() - 1); - } - - if (debug) - { - Info<< "Selecting time " << times[timeIndex].name() << endl; - } - - runTime.setTime(times[timeIndex], timeIndex); - - times = runTime.times(); - - // set time step slider range - reader->SetTimeStepRange(0, max(times.size() - 2, 0)); - reader->SetTimeStep(timeIndex); // TODO - does nothing??? - - // reset the time steps ... - reader->GetTimeSelection()->RemoveAllArrays(); - - forAll (times, timeI) - { - reader->GetTimeSelection()->AddArray(times[timeI].name().c_str()); - } - - - // Disable all the time selections (which are all selected by default) ... - reader->GetTimeSelection()->DisableAllArrays(); - - // But maintain the selection made previously - if (selectedTimeIndex != -1 && selectedTimeIndex < times.size()) - { - reader->GetTimeSelection()->EnableArray - (times[selectedTimeIndex].name().c_str()); - } -} - - -void Foam::vtkPV3Foam::updateSelectedRegions() -{ - if (debug) - { - Info<< "entered Foam::vtkPV3Foam::updateSelectedRegions" << endl; - } - - const label nRegions = reader_->GetRegionSelection()->GetNumberOfArrays(); - - selectedRegions_.setSize(nRegions); - selectedRegionDatasetIds_.setSize(nRegions); - - // Read the selected patches and add to the region list - for (int i=0; iGetRegionSelection() - ->GetArraySetting(i); - selectedRegionDatasetIds_[i] = -1; - if (debug) - { - Info<< "region" << i << " selected = " << selectedRegions_[i] - << endl; - } - } -} - - -Foam::wordList Foam::vtkPV3Foam::getSelectedArrayEntries -( - vtkDataArraySelection* arraySelection -) -{ - if (debug) - { - Info<< "entered Foam::vtkPV3Foam::getSelectedArrayEntries" << endl; - } - const label nArrays = arraySelection->GetNumberOfArrays(); - wordList selections(nArrays); - label j = 0; - for (label i=0; iGetArraySetting(i)) - { - selections[j] = arraySelection->GetArrayName(i); - if (debug) - { - Info<< "Active array: " << selections[j] << " index: " << j - << endl; - } - j++; - } - } - - // Fill non-selected arrays with 'default' value - for (label k=j; kGetNumberOfArrays(); - - // Reset all current entries to 'not selected' - arraySelection->DisableAllArrays(); - - // Loop through entries, setting values from selectedEntries - forAll (selectedEntries, entryI) - { - if (debug) - { - Info<< "selectedEntries[entryI] = " << selectedEntries[entryI] - << endl; - } - - for (label i=0; i - ( - arraySelection->GetArrayName(i) - ); - if (arrayName == selectedEntries[entryI]) - { - if (debug) - { - Info<< "enabling array: " << arrayName << " Index = " << i - << endl; - } - - arraySelection->EnableArray - ( - arrayName.c_str() - ); - break; - } - } - } -} - - -// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // - -Foam::vtkPV3Foam::vtkPV3Foam -( - const char* const FileName, - vtkPV3FoamReader* reader, - vtkMultiBlockDataSet* output -) -: - reader_(reader), - argsPtr_(NULL), - dbPtr_(NULL), - meshPtr_(NULL), - patchTextActorsPtrs_(0), - nMesh_(0) -{ - if (debug) - { - Info<< "entered Foam::vtkPV3Foam::vtkPV3Foam" << endl; - } - - // Set paths - fileName fullCasePath(fileName(FileName).path()); - - if (!dir(fullCasePath)) - { - return; - } - - char* argvStrings[3]; - argvStrings[0] = new char[12]; - strcpy(argvStrings[0], "/vtkPV3Foam"); - argvStrings[1] = new char[6]; - strcpy(argvStrings[1], "-case"); - argvStrings[2] = new char[fullCasePath.size() + 1]; - strcpy(argvStrings[2], fullCasePath.c_str()); - - int argc = 3; - char** argv = &argvStrings[0]; - argsPtr_.reset(new argList(argc, argv)); - - for (int i=0; iGetIncludeSets()) - { - convertMeshCellSet(output); - - convertMeshFaceSet(output); - - convertMeshPointSet(output); - } - - // Update fields - updateVolFields(output); - - updatePointFields(output); - - updateLagrangianFields(output); - - if (debug) - { - Info<< "Number of data sets after update" << nl - << " VOLUME = " << GetNumberOfDataSets(output, VOLUME) << nl - << " LAGRANGIAN = " << GetNumberOfDataSets(output, LAGRANGIAN) - << nl << " CELLSET = " << GetNumberOfDataSets(output, CELLSET) - << nl << " FACESET = " << GetNumberOfDataSets(output, FACESET) - << nl << " POINTSET = " << GetNumberOfDataSets(output, POINTSET) - << endl; - } -} - - -double* Foam::vtkPV3Foam::timeSteps() -{ - if (dbPtr_.valid()) - { - const instantList foamTimes = - dbPtr_().findTimes(dbPtr_().path().path()); - double* ts = new double[foamTimes.size()]; - - for (int i = 0; i < foamTimes.size(); i++) - { - ts[i] = foamTimes[i].value(); - if (debug) - { - Info<< "found time = " << ts[i] << endl; - } - } - return ts; - } - else - { - return NULL; - } -} - - -void Foam::vtkPV3Foam::addPatchNames(vtkRenderer* renderer) -{ - if (debug) - { - Info<< "addPatchNames()" << endl; - } - - // Remove any patch names previously added to the renderer - removePatchNames(renderer); - - const fvMesh& mesh = *meshPtr_; - const polyBoundaryMesh& pbMesh = mesh.boundaryMesh(); - - // Find the total number of zones - // Each zone will take the patch name - - // Number of zones per patch - labelList nZones(pbMesh.size(), 0); - - // Per global zone number the average face centre position - DynamicList zoneCentre(pbMesh.size()); - - if (debug) - { - Info<< "determining patch zones" << endl; - } - - // Loop through all patches to determine zones, and centre of each zone - forAll(pbMesh, patchI) - { - const polyPatch& pp = pbMesh[patchI]; - - // Only include the patch if it is selected - if (reader_->GetRegionArrayStatus(pp.name().c_str()) == 1) - { - const labelListList& edgeFaces = pp.edgeFaces(); - const vectorField& n = pp.faceNormals(); - - boolList featEdge(pp.nEdges(), false); - - forAll(edgeFaces, edgeI) - { - const labelList& eFaces = edgeFaces[edgeI]; - - if (eFaces.size() != 2) - { - featEdge[edgeI] = true; - } - else if (mag(n[eFaces[0]] & n[eFaces[1]]) < 0.5) - { - featEdge[edgeI] = true; - } - } - - // Do topological analysis of patch. Determine disconnected regions - patchZones pZones(pp, featEdge); - - nZones[patchI] = pZones.nZones(); - - labelList zoneNFaces(pZones.nZones(), 0); - - // Save start of information for current patch - label patchStart = zoneCentre.size(); - - // Create storage for additional zone centres - forAll(zoneNFaces, zoneI) - { - zoneCentre.append(vector::zero); - } - - // Do averaging per individual zone - - forAll(pp, faceI) - { - label zoneI = pZones[faceI]; - zoneCentre[patchStart+zoneI] += pp[faceI].centre(pp.points()); - zoneNFaces[zoneI]++; - } - - for (label i=0; iGetRegionArrayStatus(pp.name().c_str()) == 1) - { - for (label i=0; iRemoveViewProp(patchTextActorsPtrs_[patchI]); - } - patchTextActorsPtrs_.setSize(0); -} - - -int Foam::vtkPV3Foam::numberOfTimeSteps() -{ - if (dbPtr_.valid()) - { - return dbPtr_().times().size(); - } - else - { - return 0; - } -} - - -int Foam::vtkPV3Foam::numberOfPoints() -{ - if (meshPtr_) - { - return meshPtr_->nPoints(); - } - else - { - return 0; - } -} - - -int Foam::vtkPV3Foam::numberOfCells() -{ - if (meshPtr_) - { - return meshPtr_->nCells(); - } - { - return 0; - } -} - - -int Foam::vtkPV3Foam::numberOfMeshes() const -{ - return nMesh_; -} - - -// ************************************************************************* // diff --git a/applications/utilities/postProcessing/graphics/PV3FoamReader/vtkPV3Foam/vtkPV3Foam.H b/applications/utilities/postProcessing/graphics/PV3FoamReader/vtkPV3Foam/vtkPV3Foam.H deleted file mode 100644 index a2c392bfda..0000000000 --- a/applications/utilities/postProcessing/graphics/PV3FoamReader/vtkPV3Foam/vtkPV3Foam.H +++ /dev/null @@ -1,568 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | - \\ / A nd | Copyright (C) 1991-2007 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 2 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, write to the Free Software Foundation, - Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -Class - vtkPV3Foam - -Description - -SourceFiles - interpolatePointToCell.C - interpolatePointToCell.H - vtkPV3Foam.C - vtkPV3Foam.H - vtkPV3FoamAddFaceSetMesh.C - vtkPV3FoamAddFields.H - vtkPV3FoamAddLagrangianMesh.C - vtkPV3FoamAddPatchMesh.C - vtkPV3FoamAddPointSetMesh.C - vtkPV3FoamAddVolumeMesh.C - vtkPV3FoamConvertLagrangianFields.H - vtkPV3FoamConvertMesh.C - vtkPV3FoamConvertPatchFaceField.H - vtkPV3FoamConvertPatchPointField.H - vtkPV3FoamConvertPointFields.H - vtkPV3FoamConvertVolFields.H - vtkPV3FoamInsertNextPoint.H - vtkPV3FoamUpdate.C - vtkPV3FoamUpdateInformation.C - vtkPV3FoamUpdateInformationFields.H - - // Needed by VTK? - vtkDataArrayTemplateImplicit.txx - -\*---------------------------------------------------------------------------*/ - -#ifndef vtkPV3Foam_H -#define vtkPV3Foam_H - -#include "className.H" -#include "fileName.H" -#include "volPointInterpolation.H" - - -// * * * * * * * * * * * * * Forward Declarations * * * * * * * * * * * * * // - -class vtkDataArraySelection; -class vtkDataSet; -class vtkMultiBlockDataSet; -class vtkPoints; -class vtkPV3FoamReader; -class vtkRenderer; -class vtkTextActor; -class vtkUnstructuredGrid; - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -namespace Foam -{ - -// Foam class forward declarations -class argList; -class Time; -class fvMesh; -class IOobjectList; -class polyPatch; -class faceSet; -class pointSet; -class WordList; - -template -class IOField; - -template -class List; - -/*---------------------------------------------------------------------------*\ - Class vtkPV3Foam Declaration -\*---------------------------------------------------------------------------*/ - -class vtkPV3Foam -{ - // Private data - - //BTX - //- Indices for datasets in vtkMultiBlockDataSet - enum - { - VOLUME = 0, // internal mesh AND patches - LAGRANGIAN = 1, - CELLSET = 2, - FACESET = 3, - POINTSET = 4 - }; - //ETX - - //- Indices of (first instance of) various regions - int idRegionVolume_; - int idRegionLagrangian_; - int idRegionPatches_; - int idRegionCellSets_; - int idRegionFaceSets_; - int idRegionPointSets_; - - //- Access to the controlling vtkPV3FoamReader - vtkPV3FoamReader* reader_; - - //- Selected regions - // [0] = internal mesh, then lagrangian, patches, and sets - boolList selectedRegions_; - - //- Selected regions indices in each respective block - labelList selectedRegionDatasetIds_; - - //- Foam argument handler - autoPtr argsPtr_; - - //- Path to root and case - fileName rootPath_; - fileName casePath_; - - //- Foam time control - autoPtr