diff --git a/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/Make/files b/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/Make/files deleted file mode 100644 index 548c4b8a93..0000000000 --- a/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/Make/files +++ /dev/null @@ -1,11 +0,0 @@ -vtkPV4Foam.C -vtkPV4FoamFields.C -vtkPV4FoamMesh.C -vtkPV4FoamMeshLagrangian.C -vtkPV4FoamMeshSet.C -vtkPV4FoamMeshVolume.C -vtkPV4FoamMeshZone.C -vtkPV4FoamUpdateInfo.C -vtkPV4FoamUtils.C - -LIB = $(FOAM_LIBBIN)/libvtkPV4Foam diff --git a/applications/utilities/postProcessing/graphics/PV4Readers/PV4blockMeshReader/vtkPV4blockMesh/Make/files b/applications/utilities/postProcessing/graphics/PV4Readers/PV4blockMeshReader/vtkPV4blockMesh/Make/files deleted file mode 100644 index 510637fa3f..0000000000 --- a/applications/utilities/postProcessing/graphics/PV4Readers/PV4blockMeshReader/vtkPV4blockMesh/Make/files +++ /dev/null @@ -1,5 +0,0 @@ -vtkPV4blockMesh.C -vtkPV4blockMeshConvert.C -vtkPV4blockMeshUtils.C - -LIB = $(FOAM_LIBBIN)/libvtkPV4blockMesh diff --git a/applications/utilities/postProcessing/graphics/PV4Readers/vtkPV4Readers/Make/files b/applications/utilities/postProcessing/graphics/PV4Readers/vtkPV4Readers/Make/files deleted file mode 100644 index 39feee713d..0000000000 --- a/applications/utilities/postProcessing/graphics/PV4Readers/vtkPV4Readers/Make/files +++ /dev/null @@ -1,3 +0,0 @@ -vtkPV4Readers.C - -LIB = $(FOAM_LIBBIN)/libvtkPV4Readers diff --git a/applications/utilities/postProcessing/graphics/PV4Readers/Allwclean b/applications/utilities/postProcessing/graphics/PVReaders/Allwclean similarity index 65% rename from applications/utilities/postProcessing/graphics/PV4Readers/Allwclean rename to applications/utilities/postProcessing/graphics/PVReaders/Allwclean index 524a715f44..ac21c736e2 100755 --- a/applications/utilities/postProcessing/graphics/PV4Readers/Allwclean +++ b/applications/utilities/postProcessing/graphics/PVReaders/Allwclean @@ -2,8 +2,8 @@ cd ${0%/*} || exit 1 # Run from this directory set -x -wclean libso vtkPV4Readers -PV4blockMeshReader/Allwclean -PV4FoamReader/Allwclean +wclean libso vtkPVReaders +PVblockMeshReader/Allwclean +PVFoamReader/Allwclean # ----------------------------------------------------------------- end-of-file diff --git a/applications/utilities/postProcessing/graphics/PV4Readers/Allwmake b/applications/utilities/postProcessing/graphics/PVReaders/Allwmake similarity index 76% rename from applications/utilities/postProcessing/graphics/PV4Readers/Allwmake rename to applications/utilities/postProcessing/graphics/PVReaders/Allwmake index 135dd56a18..6108a18d81 100755 --- a/applications/utilities/postProcessing/graphics/PV4Readers/Allwmake +++ b/applications/utilities/postProcessing/graphics/PVReaders/Allwmake @@ -14,15 +14,15 @@ case "$ParaView_VERSION" in # ensure CMake gets the correct C++ compiler [ -n "$WM_CXX" ] && export CXX="$WM_CXX" - wmake libso vtkPV4Readers - PV4blockMeshReader/Allwmake - PV4FoamReader/Allwmake + wmake libso vtkPVReaders + PVblockMeshReader/Allwmake + PVFoamReader/Allwmake else echo "ERROR: ParaView not found in $ParaView_DIR" fi ;; *) - echo "WARN: PV4 readers not building: ParaView_VERSION=$ParaView_VERSION" + echo "WARN: PV readers not building: ParaView_VERSION=$ParaView_VERSION" ;; esac diff --git a/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/Allwclean b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/Allwclean similarity index 66% rename from applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/Allwclean rename to applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/Allwclean index b6ef33f863..abe861cba0 100755 --- a/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/Allwclean +++ b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/Allwclean @@ -3,9 +3,9 @@ cd ${0%/*} || exit 1 # Run from this directory set -x # deal with client/server vs combined plugins -rm -f $FOAM_LIBBIN/libPV4FoamReader* 2>/dev/null +rm -f $FOAM_LIBBIN/libPVFoamReader* 2>/dev/null -rm -rf PV4FoamReader/Make -wclean libso vtkPV4Foam +rm -rf PVFoamReader/Make +wclean libso vtkPVFoam # ----------------------------------------------------------------- end-of-file diff --git a/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/Allwmake b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/Allwmake similarity index 86% rename from applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/Allwmake rename to applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/Allwmake index 0728cf9f6a..aff103a023 100755 --- a/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/Allwmake +++ b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/Allwmake @@ -4,9 +4,9 @@ set -x if [ -d "$ParaView_DIR" -a -r "$ParaView_DIR" ] then - wmake libso vtkPV4Foam + wmake libso vtkPVFoam ( - cd PV4FoamReader + cd PVFoamReader mkdir -p Make/$WM_OPTIONS > /dev/null 2>&1 cd Make/$WM_OPTIONS cmake ../.. diff --git a/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/PV4FoamReader/CMakeLists.txt b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/PVFoamReader/CMakeLists.txt similarity index 81% rename from applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/PV4FoamReader/CMakeLists.txt rename to applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/PVFoamReader/CMakeLists.txt index d5a6c168b3..fbaedcfb30 100644 --- a/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/PV4FoamReader/CMakeLists.txt +++ b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/PVFoamReader/CMakeLists.txt @@ -21,7 +21,7 @@ INCLUDE_DIRECTORIES( $ENV{WM_PROJECT_DIR}/src/OpenFOAM/lnInclude $ENV{WM_PROJECT_DIR}/src/OSspecific/$ENV{WM_OSTYPE}/lnInclude $ENV{WM_PROJECT_DIR}/src/finiteVolume/lnInclude - ${PROJECT_SOURCE_DIR}/../vtkPV4Foam + ${PROJECT_SOURCE_DIR}/../vtkPVFoam ) ADD_DEFINITIONS( @@ -43,11 +43,11 @@ SET( # # Extend the auto-generated panel -QT4_WRAP_CPP(MOC_SRCS pqPV4FoamReaderPanel.h) +QT4_WRAP_CPP(MOC_SRCS pqPVFoamReaderPanel.h) ADD_PARAVIEW_OBJECT_PANEL(IFACES IFACE_SRCS - CLASS_NAME pqPV4FoamReaderPanel - XML_NAME PV4FoamReader # name of SourceProxy in *SM.xml + CLASS_NAME pqPVFoamReaderPanel + XML_NAME PVFoamReader # name of SourceProxy in *SM.xml XML_GROUP sources ) @@ -55,19 +55,19 @@ IF("${PARAVIEW_VERSION_MINOR}" EQUAL 0) ADD_PARAVIEW_PLUGIN( PVFoamReader_SM "1.0" SERVER_MANAGER_XML PVFoamReader_SM.xml - SERVER_MANAGER_SOURCES vtkPV4FoamReader.cxx + SERVER_MANAGER_SOURCES vtkPVFoamReader.cxx GUI_INTERFACES ${IFACES} - GUI_SOURCES pqPV4FoamReaderPanel.cxx + GUI_SOURCES pqPVFoamReaderPanel.cxx ${MOC_SRCS} ${UI_SRCS} ${IFACE_SRCS} - GUI_RESOURCE_FILES PV4FoamReader.xml + GUI_RESOURCE_FILES PVFoamReader.xml ) ELSE("${PARAVIEW_VERSION_MINOR}" EQUAL 0) ADD_PARAVIEW_PLUGIN( PVFoamReader_SM "1.0" SERVER_MANAGER_XML PVFoamReader_SM.xml - SERVER_MANAGER_SOURCES vtkPV4FoamReader.cxx + SERVER_MANAGER_SOURCES vtkPVFoamReader.cxx GUI_INTERFACES ${IFACES} - GUI_SOURCES pqPV4FoamReaderPanel.cxx + GUI_SOURCES pqPVFoamReaderPanel.cxx ${MOC_SRCS} ${UI_SRCS} ${IFACE_SRCS} ) ENDIF("${PARAVIEW_VERSION_MINOR}" EQUAL 0) @@ -77,7 +77,7 @@ TARGET_LINK_LIBRARIES( LINK_PUBLIC OpenFOAM finiteVolume - vtkPV4Foam + vtkPVFoam ) #----------------------------------------------------------------------------- diff --git a/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/PV4FoamReader/PV4FoamReader.qrc b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/PVFoamReader/PVFoamReader.qrc similarity index 65% rename from applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/PV4FoamReader/PV4FoamReader.qrc rename to applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/PVFoamReader/PVFoamReader.qrc index c5bfc27b71..9bb30ea5c0 100644 --- a/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/PV4FoamReader/PV4FoamReader.qrc +++ b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/PVFoamReader/PVFoamReader.qrc @@ -1,5 +1,5 @@ - PV4FoamReader.xml + PVFoamReader.xml diff --git a/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/PV4FoamReader/PV4FoamReader.xml b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/PVFoamReader/PVFoamReader.xml similarity index 80% rename from applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/PV4FoamReader/PV4FoamReader.xml rename to applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/PVFoamReader/PVFoamReader.xml index bb940768de..aef46449b3 100644 --- a/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/PV4FoamReader/PV4FoamReader.xml +++ b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/PVFoamReader/PVFoamReader.xml @@ -1,5 +1,5 @@ - diff --git a/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/PV4FoamReader/PVFoamReader_SM.xml b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/PVFoamReader/PVFoamReader_SM.xml similarity index 99% rename from applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/PV4FoamReader/PVFoamReader_SM.xml rename to applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/PVFoamReader/PVFoamReader_SM.xml index c0e92cfb77..69bcfc0962 100644 --- a/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/PV4FoamReader/PVFoamReader_SM.xml +++ b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/PVFoamReader/PVFoamReader_SM.xml @@ -1,8 +1,8 @@ + name="PVFoamReader" + class="vtkPVFoamReader"> @@ -50,7 +50,7 @@ License // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -pqPV4FoamReaderPanel::pqPV4FoamReaderPanel +pqPVFoamReaderPanel::pqPVFoamReaderPanel ( pqProxy *proxy, QWidget *p @@ -356,7 +356,7 @@ pqPV4FoamReaderPanel::pqPV4FoamReaderPanel // * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * * // -void pqPV4FoamReaderPanel::CacheMeshToggled() +void pqPVFoamReaderPanel::CacheMeshToggled() { vtkSMIntVectorProperty::SafeDownCast ( @@ -365,7 +365,7 @@ void pqPV4FoamReaderPanel::CacheMeshToggled() } -void pqPV4FoamReaderPanel::RefreshPressed() +void pqPVFoamReaderPanel::RefreshPressed() { // update everything vtkSMIntVectorProperty::SafeDownCast @@ -380,7 +380,7 @@ void pqPV4FoamReaderPanel::RefreshPressed() } -void pqPV4FoamReaderPanel::ZeroTimeToggled() +void pqPVFoamReaderPanel::ZeroTimeToggled() { vtkSMIntVectorProperty::SafeDownCast ( @@ -391,7 +391,7 @@ void pqPV4FoamReaderPanel::ZeroTimeToggled() } -void pqPV4FoamReaderPanel::ShowPatchNamesToggled() +void pqPVFoamReaderPanel::ShowPatchNamesToggled() { vtkSMIntVectorProperty::SafeDownCast ( @@ -408,7 +408,7 @@ void pqPV4FoamReaderPanel::ShowPatchNamesToggled() } -void pqPV4FoamReaderPanel::ShowGroupsOnlyToggled() +void pqPVFoamReaderPanel::ShowGroupsOnlyToggled() { vtkSMProperty* prop; @@ -424,7 +424,7 @@ void pqPV4FoamReaderPanel::ShowGroupsOnlyToggled() } -void pqPV4FoamReaderPanel::IncludeSetsToggled() +void pqPVFoamReaderPanel::IncludeSetsToggled() { vtkSMProperty* prop; @@ -440,7 +440,7 @@ void pqPV4FoamReaderPanel::IncludeSetsToggled() } -void pqPV4FoamReaderPanel::IncludeZonesToggled() +void pqPVFoamReaderPanel::IncludeZonesToggled() { vtkSMProperty* prop; @@ -456,7 +456,7 @@ void pqPV4FoamReaderPanel::IncludeZonesToggled() } -void pqPV4FoamReaderPanel::ExtrapolatePatchesToggled() +void pqPVFoamReaderPanel::ExtrapolatePatchesToggled() { vtkSMProperty* prop; @@ -469,7 +469,7 @@ void pqPV4FoamReaderPanel::ExtrapolatePatchesToggled() } -void pqPV4FoamReaderPanel::InterpolateVolFieldsToggled() +void pqPVFoamReaderPanel::InterpolateVolFieldsToggled() { vtkSMProperty* prop; diff --git a/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/PV4FoamReader/pqPV4FoamReaderPanel.h b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/PVFoamReader/pqPVFoamReaderPanel.h similarity index 87% rename from applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/PV4FoamReader/pqPV4FoamReaderPanel.h rename to applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/PVFoamReader/pqPVFoamReaderPanel.h index 3f641e271d..2bdeaa6028 100644 --- a/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/PV4FoamReader/pqPV4FoamReaderPanel.h +++ b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/PVFoamReader/pqPVFoamReaderPanel.h @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -22,19 +22,19 @@ License along with OpenFOAM. If not, see . Class - pqPV4FoamReaderPanel + pqPVFoamReaderPanel Description GUI modifications for the ParaView reader panel - A custom panel for the PV4FoamReader. + A custom panel for the PVFoamReader. SourceFiles - pqPV4FoamReaderPanel.cxx + pqPVFoamReaderPanel.cxx \*---------------------------------------------------------------------------*/ -#ifndef pqPV4FoamReaderPanel_h -#define pqPV4FoamReaderPanel_h +#ifndef pqPVFoamReaderPanel_h +#define pqPVFoamReaderPanel_h #include "pqAutoGeneratedObjectPanel.h" @@ -51,10 +51,10 @@ class vtkSMSourceProxy; /*---------------------------------------------------------------------------*\ - Class pqPV4FoamReaderPanel Declaration + Class pqPVFoamReaderPanel Declaration \*---------------------------------------------------------------------------*/ -class pqPV4FoamReaderPanel +class pqPVFoamReaderPanel : public pqAutoGeneratedObjectPanel { @@ -105,11 +105,11 @@ public: // Constructors //- Construct from components - pqPV4FoamReaderPanel(pqProxy*, QWidget*); + pqPVFoamReaderPanel(pqProxy*, QWidget*); //- Destructor - // virtual ~pqPV4FoamReaderPanel(); + // virtual ~pqPVFoamReaderPanel(); }; diff --git a/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/PV4FoamReader/vtkPV4FoamReader.cxx b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/PVFoamReader/vtkPVFoamReader.cxx similarity index 85% rename from applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/PV4FoamReader/vtkPV4FoamReader.cxx rename to applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/PVFoamReader/vtkPVFoamReader.cxx index 176895b668..0398421065 100644 --- a/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/PV4FoamReader/vtkPV4FoamReader.cxx +++ b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/PVFoamReader/vtkPVFoamReader.cxx @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -22,7 +22,7 @@ License along with OpenFOAM. If not, see . \*---------------------------------------------------------------------------*/ -#include "vtkPV4FoamReader.h" +#include "vtkPVFoamReader.h" #include "pqApplicationCore.h" #include "pqRenderView.h" @@ -40,18 +40,18 @@ License #include "vtkStringArray.h" // OpenFOAM includes -#include "vtkPV4Foam.H" +#include "vtkPVFoam.H" #undef EXPERIMENTAL_TIME_CACHING // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // -vtkStandardNewMacro(vtkPV4FoamReader); +vtkStandardNewMacro(vtkPVFoamReader); // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -vtkPV4FoamReader::vtkPV4FoamReader() +vtkPVFoamReader::vtkPVFoamReader() { Debug = 0; vtkDebugMacro(<<"Constructor"); @@ -63,7 +63,7 @@ vtkPV4FoamReader::vtkPV4FoamReader() output0_ = NULL; -#ifdef VTKPV4FOAM_DUALPORT +#ifdef VTKPVFOAM_DUALPORT // Add second output for the Lagrangian this->SetNumberOfOutputPorts(2); vtkMultiBlockDataSet *lagrangian = vtkMultiBlockDataSet::New(); @@ -100,7 +100,7 @@ vtkPV4FoamReader::vtkPV4FoamReader() SelectionObserver = vtkCallbackCommand::New(); SelectionObserver->SetCallback ( - &vtkPV4FoamReader::SelectionModifiedCallback + &vtkPVFoamReader::SelectionModifiedCallback ); SelectionObserver->SetClientData(this); @@ -129,7 +129,7 @@ vtkPV4FoamReader::vtkPV4FoamReader() // * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // -vtkPV4FoamReader::~vtkPV4FoamReader() +vtkPVFoamReader::~vtkPVFoamReader() { vtkDebugMacro(<<"Deconstructor"); @@ -168,7 +168,7 @@ vtkPV4FoamReader::~vtkPV4FoamReader() // * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * * // // Do everything except set the output info -int vtkPV4FoamReader::RequestInformation +int vtkPVFoamReader::RequestInformation ( vtkInformation* vtkNotUsed(request), vtkInformationVector** vtkNotUsed(inputVector), @@ -177,7 +177,7 @@ int vtkPV4FoamReader::RequestInformation { vtkDebugMacro(<<"RequestInformation"); - if (Foam::vtkPV4Foam::debug) + if (Foam::vtkPVFoam::debug) { cout<<"REQUEST_INFORMATION\n"; } @@ -190,7 +190,7 @@ int vtkPV4FoamReader::RequestInformation int nInfo = outputVector->GetNumberOfInformationObjects(); - if (Foam::vtkPV4Foam::debug) + if (Foam::vtkPVFoam::debug) { cout<<"RequestInformation with " << nInfo << " item(s)\n"; for (int infoI = 0; infoI < nInfo; ++infoI) @@ -201,7 +201,7 @@ int vtkPV4FoamReader::RequestInformation if (!foamData_) { - foamData_ = new Foam::vtkPV4Foam(FileName, this); + foamData_ = new Foam::vtkPVFoam(FileName, this); } else { @@ -238,7 +238,7 @@ int vtkPV4FoamReader::RequestInformation timeRange[0] = timeSteps[0]; timeRange[1] = timeSteps[nTimeSteps-1]; - if (Foam::vtkPV4Foam::debug > 1) + if (Foam::vtkPVFoam::debug > 1) { cout<<"nTimeSteps " << nTimeSteps << "\n" <<"timeRange " << timeRange[0] << " to " << timeRange[1] @@ -268,7 +268,7 @@ int vtkPV4FoamReader::RequestInformation // Set the output info -int vtkPV4FoamReader::RequestData +int vtkPVFoamReader::RequestData ( vtkInformation* vtkNotUsed(request), vtkInformationVector** vtkNotUsed(inputVector), @@ -292,7 +292,7 @@ int vtkPV4FoamReader::RequestData int nInfo = outputVector->GetNumberOfInformationObjects(); - if (Foam::vtkPV4Foam::debug) + if (Foam::vtkPVFoam::debug) { cout<<"RequestData with " << nInfo << " item(s)\n"; for (int infoI = 0; infoI < nInfo; ++infoI) @@ -310,7 +310,7 @@ int vtkPV4FoamReader::RequestData // taking port0 as the lead for other outputs would be nice, but fails when // a filter is added - we need to check everything // but since PREVIOUS_UPDATE_TIME_STEPS() is protected, relay the logic - // to the vtkPV4Foam::setTime() method + // to the vtkPVFoam::setTime() method for (int infoI = 0; infoI < nInfo; ++infoI) { vtkInformation *outInfo = outputVector->GetInformationObject(infoI); @@ -342,7 +342,7 @@ int vtkPV4FoamReader::RequestData ) ); - if (Foam::vtkPV4Foam::debug) + if (Foam::vtkPVFoam::debug) { cout<< "update output with " << output->GetNumberOfBlocks() << " blocks\n"; @@ -370,7 +370,7 @@ int vtkPV4FoamReader::RequestData output->ShallowCopy(output0_); } - if (Foam::vtkPV4Foam::debug) + if (Foam::vtkPVFoam::debug) { if (needsUpdate) { @@ -390,7 +390,7 @@ int vtkPV4FoamReader::RequestData #else -#ifdef VTKPV4FOAM_DUALPORT +#ifdef VTKPVFOAM_DUALPORT foamData_->Update ( output, @@ -417,13 +417,13 @@ int vtkPV4FoamReader::RequestData } -void vtkPV4FoamReader::SetRefresh(int val) +void vtkPVFoamReader::SetRefresh(int val) { Modified(); } -void vtkPV4FoamReader::SetIncludeSets(int val) +void vtkPVFoamReader::SetIncludeSets(int val) { if (IncludeSets != val) { @@ -436,7 +436,7 @@ void vtkPV4FoamReader::SetIncludeSets(int val) } -void vtkPV4FoamReader::SetIncludeZones(int val) +void vtkPVFoamReader::SetIncludeZones(int val) { if (IncludeZones != val) { @@ -449,7 +449,7 @@ void vtkPV4FoamReader::SetIncludeZones(int val) } -void vtkPV4FoamReader::SetShowPatchNames(int val) +void vtkPVFoamReader::SetShowPatchNames(int val) { if (ShowPatchNames != val) { @@ -459,7 +459,7 @@ void vtkPV4FoamReader::SetShowPatchNames(int val) } -void vtkPV4FoamReader::SetShowGroupsOnly(int val) +void vtkPVFoamReader::SetShowGroupsOnly(int val) { if (ShowGroupsOnly != val) { @@ -472,7 +472,7 @@ void vtkPV4FoamReader::SetShowGroupsOnly(int val) } -void vtkPV4FoamReader::updatePatchNamesView(const bool show) +void vtkPVFoamReader::updatePatchNamesView(const bool show) { pqApplicationCore* appCore = pqApplicationCore::instance(); @@ -506,7 +506,7 @@ void vtkPV4FoamReader::updatePatchNamesView(const bool show) } -void vtkPV4FoamReader::PrintSelf(ostream& os, vtkIndent indent) +void vtkPVFoamReader::PrintSelf(ostream& os, vtkIndent indent) { vtkDebugMacro(<<"PrintSelf"); @@ -522,7 +522,7 @@ void vtkPV4FoamReader::PrintSelf(ostream& os, vtkIndent indent) } -int vtkPV4FoamReader::GetTimeStep() +int vtkPVFoamReader::GetTimeStep() { return foamData_ ? foamData_->timeIndex() : -1; } @@ -531,35 +531,35 @@ int vtkPV4FoamReader::GetTimeStep() // ---------------------------------------------------------------------- // Parts selection list control -vtkDataArraySelection* vtkPV4FoamReader::GetPartSelection() +vtkDataArraySelection* vtkPVFoamReader::GetPartSelection() { vtkDebugMacro(<<"GetPartSelection"); return PartSelection; } -int vtkPV4FoamReader::GetNumberOfPartArrays() +int vtkPVFoamReader::GetNumberOfPartArrays() { vtkDebugMacro(<<"GetNumberOfPartArrays"); return PartSelection->GetNumberOfArrays(); } -const char* vtkPV4FoamReader::GetPartArrayName(int index) +const char* vtkPVFoamReader::GetPartArrayName(int index) { vtkDebugMacro(<<"GetPartArrayName"); return PartSelection->GetArrayName(index); } -int vtkPV4FoamReader::GetPartArrayStatus(const char* name) +int vtkPVFoamReader::GetPartArrayStatus(const char* name) { vtkDebugMacro(<<"GetPartArrayStatus"); return PartSelection->ArrayIsEnabled(name); } -void vtkPV4FoamReader::SetPartArrayStatus(const char* name, int status) +void vtkPVFoamReader::SetPartArrayStatus(const char* name, int status) { vtkDebugMacro("Set mesh part \"" << name << "\" status to: " << status); @@ -577,35 +577,35 @@ void vtkPV4FoamReader::SetPartArrayStatus(const char* name, int status) // ---------------------------------------------------------------------- // volField selection list control -vtkDataArraySelection* vtkPV4FoamReader::GetVolFieldSelection() +vtkDataArraySelection* vtkPVFoamReader::GetVolFieldSelection() { vtkDebugMacro(<<"GetVolFieldSelection"); return VolFieldSelection; } -int vtkPV4FoamReader::GetNumberOfVolFieldArrays() +int vtkPVFoamReader::GetNumberOfVolFieldArrays() { vtkDebugMacro(<<"GetNumberOfVolFieldArrays"); return VolFieldSelection->GetNumberOfArrays(); } -const char* vtkPV4FoamReader::GetVolFieldArrayName(int index) +const char* vtkPVFoamReader::GetVolFieldArrayName(int index) { vtkDebugMacro(<<"GetVolFieldArrayName"); return VolFieldSelection->GetArrayName(index); } -int vtkPV4FoamReader::GetVolFieldArrayStatus(const char* name) +int vtkPVFoamReader::GetVolFieldArrayStatus(const char* name) { vtkDebugMacro(<<"GetVolFieldArrayStatus"); return VolFieldSelection->ArrayIsEnabled(name); } -void vtkPV4FoamReader::SetVolFieldArrayStatus(const char* name, int status) +void vtkPVFoamReader::SetVolFieldArrayStatus(const char* name, int status) { vtkDebugMacro(<<"SetVolFieldArrayStatus"); if (status) @@ -622,35 +622,35 @@ void vtkPV4FoamReader::SetVolFieldArrayStatus(const char* name, int status) // ---------------------------------------------------------------------- // pointField selection list control -vtkDataArraySelection* vtkPV4FoamReader::GetPointFieldSelection() +vtkDataArraySelection* vtkPVFoamReader::GetPointFieldSelection() { vtkDebugMacro(<<"GetPointFieldSelection"); return PointFieldSelection; } -int vtkPV4FoamReader::GetNumberOfPointFieldArrays() +int vtkPVFoamReader::GetNumberOfPointFieldArrays() { vtkDebugMacro(<<"GetNumberOfPointFieldArrays"); return PointFieldSelection->GetNumberOfArrays(); } -const char* vtkPV4FoamReader::GetPointFieldArrayName(int index) +const char* vtkPVFoamReader::GetPointFieldArrayName(int index) { vtkDebugMacro(<<"GetPointFieldArrayName"); return PointFieldSelection->GetArrayName(index); } -int vtkPV4FoamReader::GetPointFieldArrayStatus(const char* name) +int vtkPVFoamReader::GetPointFieldArrayStatus(const char* name) { vtkDebugMacro(<<"GetPointFieldArrayStatus"); return PointFieldSelection->ArrayIsEnabled(name); } -void vtkPV4FoamReader::SetPointFieldArrayStatus(const char* name, int status) +void vtkPVFoamReader::SetPointFieldArrayStatus(const char* name, int status) { vtkDebugMacro(<<"SetPointFieldArrayStatus"); if (status) @@ -667,35 +667,35 @@ void vtkPV4FoamReader::SetPointFieldArrayStatus(const char* name, int status) // ---------------------------------------------------------------------- // lagrangianField selection list control -vtkDataArraySelection* vtkPV4FoamReader::GetLagrangianFieldSelection() +vtkDataArraySelection* vtkPVFoamReader::GetLagrangianFieldSelection() { vtkDebugMacro(<<"GetLagrangianFieldSelection"); return LagrangianFieldSelection; } -int vtkPV4FoamReader::GetNumberOfLagrangianFieldArrays() +int vtkPVFoamReader::GetNumberOfLagrangianFieldArrays() { vtkDebugMacro(<<"GetNumberOfLagrangianFieldArrays"); return LagrangianFieldSelection->GetNumberOfArrays(); } -const char* vtkPV4FoamReader::GetLagrangianFieldArrayName(int index) +const char* vtkPVFoamReader::GetLagrangianFieldArrayName(int index) { vtkDebugMacro(<<"GetLagrangianFieldArrayName"); return LagrangianFieldSelection->GetArrayName(index); } -int vtkPV4FoamReader::GetLagrangianFieldArrayStatus(const char* name) +int vtkPVFoamReader::GetLagrangianFieldArrayStatus(const char* name) { vtkDebugMacro(<<"GetLagrangianFieldArrayStatus"); return LagrangianFieldSelection->ArrayIsEnabled(name); } -void vtkPV4FoamReader::SetLagrangianFieldArrayStatus +void vtkPVFoamReader::SetLagrangianFieldArrayStatus ( const char* name, int status @@ -715,7 +715,7 @@ void vtkPV4FoamReader::SetLagrangianFieldArrayStatus // ---------------------------------------------------------------------- -void vtkPV4FoamReader::SelectionModifiedCallback +void vtkPVFoamReader::SelectionModifiedCallback ( vtkObject*, unsigned long, @@ -723,18 +723,18 @@ void vtkPV4FoamReader::SelectionModifiedCallback void* ) { - static_cast(clientdata)->SelectionModified(); + static_cast(clientdata)->SelectionModified(); } -void vtkPV4FoamReader::SelectionModified() +void vtkPVFoamReader::SelectionModified() { vtkDebugMacro(<<"SelectionModified"); Modified(); } -int vtkPV4FoamReader::FillOutputPortInformation +int vtkPVFoamReader::FillOutputPortInformation ( int port, vtkInformation* info diff --git a/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/PV4FoamReader/vtkPV4FoamReader.h b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/PVFoamReader/vtkPVFoamReader.h similarity index 92% rename from applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/PV4FoamReader/vtkPV4FoamReader.h rename to applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/PVFoamReader/vtkPVFoamReader.h index 0b898e3a9c..d29b80e1ff 100644 --- a/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/PV4FoamReader/vtkPV4FoamReader.h +++ b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/PVFoamReader/vtkPVFoamReader.h @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -22,21 +22,21 @@ License along with OpenFOAM. If not, see . Class - vtkPV4FoamReader + vtkPVFoamReader Description reads a dataset in OpenFOAM format - vtkPV4blockMeshReader creates an multiblock dataset. + vtkPVblockMeshReader creates an multiblock dataset. It uses the OpenFOAM infrastructure (fvMesh, etc) to handle mesh and field data. SourceFiles - vtkPV4blockMeshReader.cxx + vtkPVblockMeshReader.cxx \*---------------------------------------------------------------------------*/ -#ifndef vtkPV4FoamReader_h -#define vtkPV4FoamReader_h +#ifndef vtkPVFoamReader_h +#define vtkPVFoamReader_h // VTK includes #include "vtkMultiBlockDataSetAlgorithm.h" @@ -50,23 +50,23 @@ class vtkCallbackCommand; // OpenFOAM forward declarations namespace Foam { - class vtkPV4Foam; + class vtkPVFoam; } /*---------------------------------------------------------------------------*\ - Class vtkPV4FoamReader Declaration + Class vtkPVFoamReader Declaration \*---------------------------------------------------------------------------*/ -class vtkPV4FoamReader +class vtkPVFoamReader : public vtkMultiBlockDataSetAlgorithm { public: - vtkTypeMacro(vtkPV4FoamReader, vtkMultiBlockDataSetAlgorithm); + vtkTypeMacro(vtkPVFoamReader, vtkMultiBlockDataSetAlgorithm); void PrintSelf(ostream&, vtkIndent); - static vtkPV4FoamReader* New(); + static vtkPVFoamReader* New(); // Description: // Get the current timestep and the timestep range. @@ -184,10 +184,10 @@ public: protected: //- Construct null - vtkPV4FoamReader(); + vtkPVFoamReader(); //- Destructor - ~vtkPV4FoamReader(); + ~vtkPVFoamReader(); //- Return information about mesh, times, etc without loading anything virtual int RequestInformation @@ -218,10 +218,10 @@ protected: private: //- Disallow default bitwise copy construct - vtkPV4FoamReader(const vtkPV4FoamReader&); + vtkPVFoamReader(const vtkPVFoamReader&); //- Disallow default bitwise assignment - void operator=(const vtkPV4FoamReader&); + void operator=(const vtkPVFoamReader&); //- Add/remove patch names to/from the view void updatePatchNamesView(const bool show); @@ -251,7 +251,7 @@ private: vtkMultiBlockDataSet* output0_; //BTX - Foam::vtkPV4Foam* foamData_; + Foam::vtkPVFoam* foamData_; //ETX }; diff --git a/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/Make/files b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/Make/files new file mode 100644 index 0000000000..b26829761d --- /dev/null +++ b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/Make/files @@ -0,0 +1,11 @@ +vtkPVFoam.C +vtkPVFoamFields.C +vtkPVFoamMesh.C +vtkPVFoamMeshLagrangian.C +vtkPVFoamMeshSet.C +vtkPVFoamMeshVolume.C +vtkPVFoamMeshZone.C +vtkPVFoamUpdateInfo.C +vtkPVFoamUtils.C + +LIB = $(FOAM_LIBBIN)/libvtkPVFoam diff --git a/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/Make/options b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/Make/options similarity index 83% rename from applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/Make/options rename to applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/Make/options index 648b1d5d3f..cb6127c483 100644 --- a/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/Make/options +++ b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/Make/options @@ -4,8 +4,8 @@ EXE_INC = \ -I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/lagrangian/basic/lnInclude \ - -I../../vtkPV4Readers/lnInclude \ - -I../PV4FoamReader \ + -I../../vtkPVReaders/lnInclude \ + -I../PVFoamReader \ -I$(ParaView_INCLUDE_DIR) \ -I$(ParaView_INCLUDE_DIR)/vtkkwiml \ $(shell \ @@ -18,5 +18,5 @@ LIB_LIBS = \ -lfiniteVolume \ -lgenericPatchFields \ -llagrangian \ - -L$(FOAM_LIBBIN) -lvtkPV4Readers \ + -L$(FOAM_LIBBIN) -lvtkPVReaders \ $(GLIBS) diff --git a/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/vtkOpenFOAMPoints.H b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkOpenFOAMPoints.H similarity index 96% rename from applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/vtkOpenFOAMPoints.H rename to applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkOpenFOAMPoints.H index a41fe2730d..2a45d73b2a 100644 --- a/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/vtkOpenFOAMPoints.H +++ b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkOpenFOAMPoints.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -22,7 +22,7 @@ License along with OpenFOAM. If not, see . InClass - vtkPV4Foam + vtkPVFoam \*---------------------------------------------------------------------------*/ diff --git a/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/vtkOpenFOAMTupleRemap.H b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkOpenFOAMTupleRemap.H similarity index 96% rename from applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/vtkOpenFOAMTupleRemap.H rename to applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkOpenFOAMTupleRemap.H index b8358b57fe..610eac4f34 100644 --- a/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/vtkOpenFOAMTupleRemap.H +++ b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkOpenFOAMTupleRemap.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -22,7 +22,7 @@ License along with OpenFOAM. If not, see . InClass - vtkPV4Foam + vtkPVFoam \*---------------------------------------------------------------------------*/ diff --git a/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/vtkPV4Foam.C b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoam.C similarity index 93% rename from applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/vtkPV4Foam.C rename to applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoam.C index cf7170a738..2bfefc267c 100644 --- a/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/vtkPV4Foam.C +++ b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoam.C @@ -23,8 +23,8 @@ License \*---------------------------------------------------------------------------*/ -#include "vtkPV4Foam.H" -#include "vtkPV4FoamReader.h" +#include "vtkPVFoam.H" +#include "vtkPVFoamReader.h" // OpenFOAM includes #include "fvMesh.H" @@ -42,16 +42,16 @@ License namespace Foam { -defineTypeNameAndDebug(vtkPV4Foam, 0); +defineTypeNameAndDebug(vtkPVFoam, 0); } // * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // -#include "vtkPV4FoamAddToSelection.H" -#include "vtkPV4FoamUpdateInfoFields.H" +#include "vtkPVFoamAddToSelection.H" +#include "vtkPVFoamUpdateInfoFields.H" -void Foam::vtkPV4Foam::resetCounters() +void Foam::vtkPVFoam::resetCounters() { // Reset array range information (ids and sizes) arrayRangeVolume_.reset(); @@ -66,7 +66,7 @@ void Foam::vtkPV4Foam::resetCounters() } -void Foam::vtkPV4Foam::reduceMemory() +void Foam::vtkPVFoam::reduceMemory() { forAll(regionPolyDecomp_, i) { @@ -91,7 +91,7 @@ void Foam::vtkPV4Foam::reduceMemory() } -int Foam::vtkPV4Foam::setTime(int nRequest, const double requestTimes[]) +int Foam::vtkPVFoam::setTime(int nRequest, const double requestTimes[]) { Time& runTime = dbPtr_(); @@ -116,7 +116,7 @@ int Foam::vtkPV4Foam::setTime(int nRequest, const double requestTimes[]) if (debug) { - Info<< " Foam::vtkPV4Foam::setTime("; + Info<< " Foam::vtkPVFoam::setTime("; for (int requestI = 0; requestI < nRequest; ++requestI) { if (requestI) @@ -160,7 +160,7 @@ int Foam::vtkPV4Foam::setTime(int nRequest, const double requestTimes[]) if (debug) { - Info<< " Foam::vtkPV4Foam::setTime() - selectedTime=" + Info<< " Foam::vtkPVFoam::setTime() - selectedTime=" << Times[nearestIndex].name() << " index=" << timeIndex_ << "/" << Times.size() << " meshChanged=" << Switch(meshChanged_) @@ -171,11 +171,11 @@ int Foam::vtkPV4Foam::setTime(int nRequest, const double requestTimes[]) } -void Foam::vtkPV4Foam::updateMeshPartsStatus() +void Foam::vtkPVFoam::updateMeshPartsStatus() { if (debug) { - Info<< " Foam::vtkPV4Foam::updateMeshPartsStatus" << endl; + Info<< " Foam::vtkPVFoam::updateMeshPartsStatus" << endl; } vtkDataArraySelection* selection = reader_->GetPartSelection(); @@ -212,17 +212,17 @@ void Foam::vtkPV4Foam::updateMeshPartsStatus() } if (debug) { - Info<< " Foam::vtkPV4Foam::updateMeshPartsStatus" << endl; + Info<< " Foam::vtkPVFoam::updateMeshPartsStatus" << endl; } } // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -Foam::vtkPV4Foam::vtkPV4Foam +Foam::vtkPVFoam::vtkPVFoam ( const char* const FileName, - vtkPV4FoamReader* reader + vtkPVFoamReader* reader ) : reader_(reader), @@ -245,7 +245,7 @@ Foam::vtkPV4Foam::vtkPV4Foam { if (debug) { - Info<< "Foam::vtkPV4Foam::vtkPV4Foam - " << FileName << endl; + Info<< "Foam::vtkPVFoam::vtkPVFoam - " << FileName << endl; printMemory(); } @@ -329,11 +329,11 @@ Foam::vtkPV4Foam::vtkPV4Foam // * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // -Foam::vtkPV4Foam::~vtkPV4Foam() +Foam::vtkPVFoam::~vtkPVFoam() { if (debug) { - Info<< " Foam::vtkPV4Foam::~vtkPV4Foam" << endl; + Info<< " Foam::vtkPVFoam::~vtkPVFoam" << endl; } delete meshPtr_; @@ -342,11 +342,11 @@ Foam::vtkPV4Foam::~vtkPV4Foam() // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -void Foam::vtkPV4Foam::updateInfo() +void Foam::vtkPVFoam::updateInfo() { if (debug) { - Info<< " Foam::vtkPV4Foam::updateInfo" + Info<< " Foam::vtkPVFoam::updateInfo" << " [meshPtr=" << (meshPtr_ ? "set" : "NULL") << "] timeIndex=" << timeIndex_ << endl; } @@ -409,17 +409,17 @@ void Foam::vtkPV4Foam::updateInfo() { // just for debug info getSelectedArrayEntries(partSelection); - Info<< " Foam::vtkPV4Foam::updateInfo" << endl; + Info<< " Foam::vtkPVFoam::updateInfo" << endl; } } -void Foam::vtkPV4Foam::updateFoamMesh() +void Foam::vtkPVFoam::updateFoamMesh() { if (debug) { - Info<< " Foam::vtkPV4Foam::updateFoamMesh" << endl; + Info<< " Foam::vtkPVFoam::updateFoamMesh" << endl; printMemory(); } @@ -463,13 +463,13 @@ void Foam::vtkPV4Foam::updateFoamMesh() if (debug) { - Info<< " Foam::vtkPV4Foam::updateFoamMesh" << endl; + Info<< " Foam::vtkPVFoam::updateFoamMesh" << endl; printMemory(); } } -void Foam::vtkPV4Foam::Update +void Foam::vtkPVFoam::Update ( vtkMultiBlockDataSet* output, vtkMultiBlockDataSet* lagrangianOutput @@ -477,7 +477,7 @@ void Foam::vtkPV4Foam::Update { if (debug) { - cout<< " Foam::vtkPV4Foam::Update - output with " + cout<< " Foam::vtkPVFoam::Update - output with " << output->GetNumberOfBlocks() << " and " << lagrangianOutput->GetNumberOfBlocks() << " blocks\n"; output->Print(cout); @@ -518,7 +518,7 @@ void Foam::vtkPV4Foam::Update reader_->UpdateProgress(0.7); } -#ifdef VTKPV4FOAM_DUALPORT +#ifdef VTKPVFOAM_DUALPORT // restart port1 at block=0 blockNo = 0; #endif @@ -540,7 +540,7 @@ void Foam::vtkPV4Foam::Update } -void Foam::vtkPV4Foam::CleanUp() +void Foam::vtkPVFoam::CleanUp() { // reclaim some memory reduceMemory(); @@ -548,7 +548,7 @@ void Foam::vtkPV4Foam::CleanUp() } -double* Foam::vtkPV4Foam::findTimes(int& nTimeSteps) +double* Foam::vtkPVFoam::findTimes(int& nTimeSteps) { int nTimes = 0; double* tsteps = NULL; @@ -621,7 +621,7 @@ double* Foam::vtkPV4Foam::findTimes(int& nTimeSteps) } -void Foam::vtkPV4Foam::renderPatchNames +void Foam::vtkPVFoam::renderPatchNames ( vtkRenderer* renderer, const bool show @@ -819,7 +819,7 @@ void Foam::vtkPV4Foam::renderPatchNames } -void Foam::vtkPV4Foam::PrintSelf(ostream& os, vtkIndent indent) const +void Foam::vtkPVFoam::PrintSelf(ostream& os, vtkIndent indent) const { os << indent << "Number of nodes: " << (meshPtr_ ? meshPtr_->nPoints() : 0) << "\n"; diff --git a/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/vtkPV4Foam.H b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoam.H similarity index 95% rename from applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/vtkPV4Foam.H rename to applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoam.H index b177df59f6..9c154e46e9 100644 --- a/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/vtkPV4Foam.H +++ b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoam.H @@ -22,39 +22,39 @@ License along with OpenFOAM. If not, see . Class - Foam::vtkPV4Foam + Foam::vtkPVFoam Description Provides a reader interface for OpenFOAM to VTK interaction. SourceFiles - vtkPV4Foam.C - vtkPV4Foam.H - vtkPV4FoamFields.C - vtkPV4FoamMesh.C - vtkPV4FoamMeshLagrangian.C - vtkPV4FoamTemplates.C - vtkPV4FoamMeshSet.C - vtkPV4FoamMeshVolume.C - vtkPV4FoamMeshZone.C - vtkPV4FoamFaceField.H - vtkPV4FoamLagrangianFields.H - vtkPV4FoamPatchField.H - vtkPV4FoamPointFields.H - vtkPV4FoamPoints.H - vtkPV4FoamUpdateInfo.C - vtkPV4FoamUpdateInfoFields.H - vtkPV4FoamUtils.C - vtkPV4FoamVolFields.H - vtkPV4FoamAddToSelection.H + vtkPVFoam.C + vtkPVFoam.H + vtkPVFoamFields.C + vtkPVFoamMesh.C + vtkPVFoamMeshLagrangian.C + vtkPVFoamTemplates.C + vtkPVFoamMeshSet.C + vtkPVFoamMeshVolume.C + vtkPVFoamMeshZone.C + vtkPVFoamFaceField.H + vtkPVFoamLagrangianFields.H + vtkPVFoamPatchField.H + vtkPVFoamPointFields.H + vtkPVFoamPoints.H + vtkPVFoamUpdateInfo.C + vtkPVFoamUpdateInfoFields.H + vtkPVFoamUtils.C + vtkPVFoamVolFields.H + vtkPVFoamAddToSelection.H // Needed by VTK: vtkDataArrayTemplateImplicit.txx \*---------------------------------------------------------------------------*/ -#ifndef vtkPV4Foam_H -#define vtkPV4Foam_H +#ifndef vtkPVFoam_H +#define vtkPVFoam_H // do not include legacy strstream headers #ifndef VTK_EXCLUDE_STRSTREAM_HEADERS @@ -69,14 +69,14 @@ SourceFiles #include "PrimitivePatchInterpolation.H" #include "volPointInterpolation.H" -#undef VTKPV4FOAM_DUALPORT +#undef VTKPVFOAM_DUALPORT // * * * * * * * * * * * * * Forward Declarations * * * * * * * * * * * * * // class vtkDataArraySelection; class vtkDataSet; class vtkPoints; -class vtkPV4FoamReader; +class vtkPVFoamReader; class vtkRenderer; class vtkTextActor; class vtkMultiBlockDataSet; @@ -102,10 +102,10 @@ template class IOField; template class List; /*---------------------------------------------------------------------------*\ - Class vtkPV4Foam Declaration + Class vtkPVFoam Declaration \*---------------------------------------------------------------------------*/ -class vtkPV4Foam +class vtkPVFoam { // Private classes @@ -246,8 +246,8 @@ class vtkPV4Foam // Private Data - //- Access to the controlling vtkPV4FoamReader - vtkPV4FoamReader* reader_; + //- Access to the controlling vtkPVFoamReader + vtkPVFoamReader* reader_; //- OpenFOAM time control autoPtr