diff --git a/applications/utilities/postProcessing/graphics/PV398Readers/PV398FoamReader/vtkPV398Foam/Make/files b/applications/utilities/postProcessing/graphics/PV398Readers/PV398FoamReader/vtkPV398Foam/Make/files deleted file mode 100644 index df6c4a0d23..0000000000 --- a/applications/utilities/postProcessing/graphics/PV398Readers/PV398FoamReader/vtkPV398Foam/Make/files +++ /dev/null @@ -1,11 +0,0 @@ -vtkPV398Foam.C -vtkPV398FoamFields.C -vtkPV398FoamMesh.C -vtkPV398FoamMeshLagrangian.C -vtkPV398FoamMeshSet.C -vtkPV398FoamMeshVolume.C -vtkPV398FoamMeshZone.C -vtkPV398FoamUpdateInfo.C -vtkPV398FoamUtils.C - -LIB = $(FOAM_LIBBIN)/libvtkPV398Foam diff --git a/applications/utilities/postProcessing/graphics/PV398Readers/PV398blockMeshReader/vtkPV398blockMesh/Make/files b/applications/utilities/postProcessing/graphics/PV398Readers/PV398blockMeshReader/vtkPV398blockMesh/Make/files deleted file mode 100644 index dce0b1f543..0000000000 --- a/applications/utilities/postProcessing/graphics/PV398Readers/PV398blockMeshReader/vtkPV398blockMesh/Make/files +++ /dev/null @@ -1,5 +0,0 @@ -vtkPV398blockMesh.C -vtkPV398blockMeshConvert.C -vtkPV398blockMeshUtils.C - -LIB = $(FOAM_LIBBIN)/libvtkPV398blockMesh diff --git a/applications/utilities/postProcessing/graphics/PV398Readers/vtkPV398Readers/Make/files b/applications/utilities/postProcessing/graphics/PV398Readers/vtkPV398Readers/Make/files deleted file mode 100644 index 2b5d071cb3..0000000000 --- a/applications/utilities/postProcessing/graphics/PV398Readers/vtkPV398Readers/Make/files +++ /dev/null @@ -1,3 +0,0 @@ -vtkPV398Readers.C - -LIB = $(FOAM_LIBBIN)/libvtkPV398Readers diff --git a/applications/utilities/postProcessing/graphics/PV3Readers/Allwmake b/applications/utilities/postProcessing/graphics/PV3Readers/Allwmake index 03b352116e..54026dc9ef 100755 --- a/applications/utilities/postProcessing/graphics/PV3Readers/Allwmake +++ b/applications/utilities/postProcessing/graphics/PV3Readers/Allwmake @@ -2,7 +2,7 @@ cd ${0%/*} || exit 1 # run from this directory #set -x -if [ "$ParaView_VERSION" != "3.98.1" ] +if [ "$ParaView_VERSION" != "4.0.1" ] then if [ -d "$ParaView_DIR" -a -r "$ParaView_DIR" ] then diff --git a/applications/utilities/postProcessing/graphics/PV398Readers/Allwclean b/applications/utilities/postProcessing/graphics/PV4Readers/Allwclean similarity index 63% rename from applications/utilities/postProcessing/graphics/PV398Readers/Allwclean rename to applications/utilities/postProcessing/graphics/PV4Readers/Allwclean index ba4eb0a015..f1171eb61e 100755 --- a/applications/utilities/postProcessing/graphics/PV398Readers/Allwclean +++ b/applications/utilities/postProcessing/graphics/PV4Readers/Allwclean @@ -2,8 +2,8 @@ cd ${0%/*} || exit 1 # run from this directory set -x -wclean libso vtkPV398Readers -PV398blockMeshReader/Allwclean -PV398FoamReader/Allwclean +wclean libso vtkPV4Readers +PV4blockMeshReader/Allwclean +PV4FoamReader/Allwclean # ----------------------------------------------------------------- end-of-file diff --git a/applications/utilities/postProcessing/graphics/PV398Readers/Allwmake b/applications/utilities/postProcessing/graphics/PV4Readers/Allwmake similarity index 70% rename from applications/utilities/postProcessing/graphics/PV398Readers/Allwmake rename to applications/utilities/postProcessing/graphics/PV4Readers/Allwmake index 1469999cb6..99d54fef06 100755 --- a/applications/utilities/postProcessing/graphics/PV398Readers/Allwmake +++ b/applications/utilities/postProcessing/graphics/PV4Readers/Allwmake @@ -2,7 +2,7 @@ cd ${0%/*} || exit 1 # run from this directory #set -x -if [ "$ParaView_VERSION" == "3.98.1" ] +if [ "$ParaView_VERSION" == "4.0.1" ] then if [ -d "$ParaView_DIR" -a -r "$ParaView_DIR" ] then @@ -14,14 +14,14 @@ if [ "$ParaView_VERSION" == "3.98.1" ] # ensure CMake gets the correct C++ compiler [ -n "$WM_CXX" ] && export CXX="$WM_CXX" - wmake libso vtkPV398Readers - PV398blockMeshReader/Allwmake - PV398FoamReader/Allwmake + wmake libso vtkPV4Readers + PV4blockMeshReader/Allwmake + PV4FoamReader/Allwmake else echo "ERROR: ParaView not found in $ParaView_DIR" fi else - echo "WARN: PV398 readers not building: ParaView_VERSION=$ParaView_VERSION" + echo "WARN: PV4 readers not building: ParaView_VERSION=$ParaView_VERSION" fi # ----------------------------------------------------------------- end-of-file diff --git a/applications/utilities/postProcessing/graphics/PV398Readers/PV398FoamReader/Allwclean b/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/Allwclean similarity index 65% rename from applications/utilities/postProcessing/graphics/PV398Readers/PV398FoamReader/Allwclean rename to applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/Allwclean index eda9ee566b..39520be1ab 100755 --- a/applications/utilities/postProcessing/graphics/PV398Readers/PV398FoamReader/Allwclean +++ b/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/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/libPV398FoamReader* 2>/dev/null +rm -f $FOAM_LIBBIN/libPV4FoamReader* 2>/dev/null -rm -rf PV398FoamReader/Make -wclean libso vtkPV398Foam +rm -rf PV4FoamReader/Make +wclean libso vtkPV4Foam # ----------------------------------------------------------------- end-of-file diff --git a/applications/utilities/postProcessing/graphics/PV398Readers/PV398FoamReader/Allwmake b/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/Allwmake similarity index 85% rename from applications/utilities/postProcessing/graphics/PV398Readers/PV398FoamReader/Allwmake rename to applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/Allwmake index 77786eb58e..dd88afc029 100755 --- a/applications/utilities/postProcessing/graphics/PV398Readers/PV398FoamReader/Allwmake +++ b/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/Allwmake @@ -4,9 +4,9 @@ set -x if [ -d "$ParaView_DIR" -a -r "$ParaView_DIR" ] then - wmake libso vtkPV398Foam + wmake libso vtkPV4Foam ( - cd PV398FoamReader + cd PV4FoamReader mkdir -p Make/$WM_OPTIONS > /dev/null 2>&1 cd Make/$WM_OPTIONS cmake ../.. diff --git a/applications/utilities/postProcessing/graphics/PV398Readers/PV398FoamReader/PV398FoamReader/CMakeLists.txt b/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/PV4FoamReader/CMakeLists.txt similarity index 72% rename from applications/utilities/postProcessing/graphics/PV398Readers/PV398FoamReader/PV398FoamReader/CMakeLists.txt rename to applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/PV4FoamReader/CMakeLists.txt index be5c2185b5..ed835d3b47 100644 --- a/applications/utilities/postProcessing/graphics/PV398Readers/PV398FoamReader/PV398FoamReader/CMakeLists.txt +++ b/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/PV4FoamReader/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}/../vtkPV398Foam + ${PROJECT_SOURCE_DIR}/../vtkPV4Foam ) ADD_DEFINITIONS( @@ -41,45 +41,45 @@ SET( # # Extend the auto-generated panel -QT4_WRAP_CPP(MOC_SRCS pqPV398FoamReaderPanel.h) +QT4_WRAP_CPP(MOC_SRCS pqPV4FoamReaderPanel.h) ADD_PARAVIEW_OBJECT_PANEL(IFACES IFACE_SRCS - CLASS_NAME pqPV398FoamReaderPanel - XML_NAME PV398FoamReader # name of SourceProxy in *SM.xml + CLASS_NAME pqPV4FoamReaderPanel + XML_NAME PV4FoamReader # name of SourceProxy in *SM.xml XML_GROUP sources ) ADD_PARAVIEW_PLUGIN( - PV398FoamReader_SM "1.0" - SERVER_MANAGER_XML PV398FoamReader_SM.xml - SERVER_MANAGER_SOURCES vtkPV398FoamReader.cxx + PV4FoamReader_SM "1.0" + SERVER_MANAGER_XML PV4FoamReader_SM.xml + SERVER_MANAGER_SOURCES vtkPV4FoamReader.cxx GUI_INTERFACES ${IFACES} - GUI_SOURCES pqPV398FoamReaderPanel.cxx + GUI_SOURCES pqPV4FoamReaderPanel.cxx ${MOC_SRCS} ${UI_SRCS} ${IFACE_SRCS} - GUI_RESOURCE_FILES PV398FoamReader.xml + GUI_RESOURCE_FILES PV4FoamReader.xml ) # # # # Define the server-side portion of the reader plugin # # # ADD_PARAVIEW_PLUGIN( -# PV398FoamReader_SM "1.0" -# SERVER_MANAGER_XML PV398FoamReader_SM.xml -# SERVER_MANAGER_SOURCES vtkPV398FoamReader.cxx +# PV4FoamReader_SM "1.0" +# SERVER_MANAGER_XML PV4FoamReader_SM.xml +# SERVER_MANAGER_SOURCES vtkPV4FoamReader.cxx # ) # # # # Define the client-side portion of the reader plugin # # # ADD_PARAVIEW_PLUGIN( -# PV398FoamReader "1.0" +# PV4FoamReader "1.0" # GUI_RESOURCES PV3FoamReader.qrc # ) # TARGET_LINK_LIBRARIES( - PV398FoamReader_SM + PV4FoamReader_SM OpenFOAM finiteVolume - vtkPV398Foam + vtkPV4Foam ) #----------------------------------------------------------------------------- diff --git a/applications/utilities/postProcessing/graphics/PV398Readers/PV398FoamReader/PV398FoamReader/PV398FoamReader.qrc b/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/PV4FoamReader/PV4FoamReader.qrc similarity index 64% rename from applications/utilities/postProcessing/graphics/PV398Readers/PV398FoamReader/PV398FoamReader/PV398FoamReader.qrc rename to applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/PV4FoamReader/PV4FoamReader.qrc index 8f22c858df..c5bfc27b71 100644 --- a/applications/utilities/postProcessing/graphics/PV398Readers/PV398FoamReader/PV398FoamReader/PV398FoamReader.qrc +++ b/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/PV4FoamReader/PV4FoamReader.qrc @@ -1,5 +1,5 @@ - PV398FoamReader.xml + PV4FoamReader.xml diff --git a/applications/utilities/postProcessing/graphics/PV398Readers/PV398FoamReader/PV398FoamReader/PV398FoamReader.xml b/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/PV4FoamReader/PV4FoamReader.xml similarity index 79% rename from applications/utilities/postProcessing/graphics/PV398Readers/PV398FoamReader/PV398FoamReader/PV398FoamReader.xml rename to applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/PV4FoamReader/PV4FoamReader.xml index 866ef557b2..bb940768de 100644 --- a/applications/utilities/postProcessing/graphics/PV398Readers/PV398FoamReader/PV398FoamReader/PV398FoamReader.xml +++ b/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/PV4FoamReader/PV4FoamReader.xml @@ -1,5 +1,5 @@ - diff --git a/applications/utilities/postProcessing/graphics/PV398Readers/PV398FoamReader/PV398FoamReader/PV398FoamReader_SM.xml b/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/PV4FoamReader/PV4FoamReader_SM.xml similarity index 99% rename from applications/utilities/postProcessing/graphics/PV398Readers/PV398FoamReader/PV398FoamReader/PV398FoamReader_SM.xml rename to applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/PV4FoamReader/PV4FoamReader_SM.xml index 73849a78c9..8f39ac67b7 100644 --- a/applications/utilities/postProcessing/graphics/PV398Readers/PV398FoamReader/PV398FoamReader/PV398FoamReader_SM.xml +++ b/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/PV4FoamReader/PV4FoamReader_SM.xml @@ -1,8 +1,8 @@ + name="PV4FoamReader" + class="vtkPV4FoamReader"> @@ -50,7 +50,7 @@ License // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -pqPV398FoamReaderPanel::pqPV398FoamReaderPanel +pqPV4FoamReaderPanel::pqPV4FoamReaderPanel ( pqProxy *proxy, QWidget *p @@ -339,7 +339,7 @@ pqPV398FoamReaderPanel::pqPV398FoamReaderPanel // * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * * // -void pqPV398FoamReaderPanel::CacheMeshToggled() +void pqPV4FoamReaderPanel::CacheMeshToggled() { vtkSMIntVectorProperty::SafeDownCast ( @@ -348,7 +348,7 @@ void pqPV398FoamReaderPanel::CacheMeshToggled() } -void pqPV398FoamReaderPanel::RefreshPressed() +void pqPV4FoamReaderPanel::RefreshPressed() { // update everything vtkSMIntVectorProperty::SafeDownCast @@ -363,7 +363,7 @@ void pqPV398FoamReaderPanel::RefreshPressed() } -void pqPV398FoamReaderPanel::ZeroTimeToggled() +void pqPV4FoamReaderPanel::ZeroTimeToggled() { vtkSMIntVectorProperty::SafeDownCast ( @@ -374,7 +374,7 @@ void pqPV398FoamReaderPanel::ZeroTimeToggled() } -void pqPV398FoamReaderPanel::ShowPatchNamesToggled() +void pqPV4FoamReaderPanel::ShowPatchNamesToggled() { vtkSMIntVectorProperty::SafeDownCast ( @@ -391,7 +391,7 @@ void pqPV398FoamReaderPanel::ShowPatchNamesToggled() } -void pqPV398FoamReaderPanel::ShowGroupsOnlyToggled() +void pqPV4FoamReaderPanel::ShowGroupsOnlyToggled() { vtkSMProperty* prop; @@ -407,7 +407,7 @@ void pqPV398FoamReaderPanel::ShowGroupsOnlyToggled() } -void pqPV398FoamReaderPanel::IncludeSetsToggled() +void pqPV4FoamReaderPanel::IncludeSetsToggled() { vtkSMProperty* prop; @@ -423,7 +423,7 @@ void pqPV398FoamReaderPanel::IncludeSetsToggled() } -void pqPV398FoamReaderPanel::IncludeZonesToggled() +void pqPV4FoamReaderPanel::IncludeZonesToggled() { vtkSMProperty* prop; @@ -439,7 +439,7 @@ void pqPV398FoamReaderPanel::IncludeZonesToggled() } -void pqPV398FoamReaderPanel::ExtrapolatePatchesToggled() +void pqPV4FoamReaderPanel::ExtrapolatePatchesToggled() { vtkSMProperty* prop; @@ -452,7 +452,7 @@ void pqPV398FoamReaderPanel::ExtrapolatePatchesToggled() } -void pqPV398FoamReaderPanel::InterpolateVolFieldsToggled() +void pqPV4FoamReaderPanel::InterpolateVolFieldsToggled() { vtkSMProperty* prop; diff --git a/applications/utilities/postProcessing/graphics/PV398Readers/PV398FoamReader/PV398FoamReader/pqPV398FoamReaderPanel.h b/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/PV4FoamReader/pqPV4FoamReaderPanel.h similarity index 89% rename from applications/utilities/postProcessing/graphics/PV398Readers/PV398FoamReader/PV398FoamReader/pqPV398FoamReaderPanel.h rename to applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/PV4FoamReader/pqPV4FoamReaderPanel.h index 17c1b88893..3f641e271d 100644 --- a/applications/utilities/postProcessing/graphics/PV398Readers/PV398FoamReader/PV398FoamReader/pqPV398FoamReaderPanel.h +++ b/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/PV4FoamReader/pqPV4FoamReaderPanel.h @@ -22,19 +22,19 @@ License along with OpenFOAM. If not, see . Class - pqPV398FoamReaderPanel + pqPV4FoamReaderPanel Description GUI modifications for the ParaView reader panel - A custom panel for the PV398FoamReader. + A custom panel for the PV4FoamReader. SourceFiles - pqPV398FoamReaderPanel.cxx + pqPV4FoamReaderPanel.cxx \*---------------------------------------------------------------------------*/ -#ifndef pqPV398FoamReaderPanel_h -#define pqPV398FoamReaderPanel_h +#ifndef pqPV4FoamReaderPanel_h +#define pqPV4FoamReaderPanel_h #include "pqAutoGeneratedObjectPanel.h" @@ -51,10 +51,10 @@ class vtkSMSourceProxy; /*---------------------------------------------------------------------------*\ - Class pqPV398FoamReaderPanel Declaration + Class pqPV4FoamReaderPanel Declaration \*---------------------------------------------------------------------------*/ -class pqPV398FoamReaderPanel +class pqPV4FoamReaderPanel : public pqAutoGeneratedObjectPanel { @@ -105,11 +105,11 @@ public: // Constructors //- Construct from components - pqPV398FoamReaderPanel(pqProxy*, QWidget*); + pqPV4FoamReaderPanel(pqProxy*, QWidget*); //- Destructor - // virtual ~pqPV398FoamReaderPanel(); + // virtual ~pqPV4FoamReaderPanel(); }; diff --git a/applications/utilities/postProcessing/graphics/PV398Readers/PV398FoamReader/PV398FoamReader/vtkPV398FoamReader.cxx b/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/PV4FoamReader/vtkPV4FoamReader.cxx similarity index 85% rename from applications/utilities/postProcessing/graphics/PV398Readers/PV398FoamReader/PV398FoamReader/vtkPV398FoamReader.cxx rename to applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/PV4FoamReader/vtkPV4FoamReader.cxx index 435e5d5127..176895b668 100644 --- a/applications/utilities/postProcessing/graphics/PV398Readers/PV398FoamReader/PV398FoamReader/vtkPV398FoamReader.cxx +++ b/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/PV4FoamReader/vtkPV4FoamReader.cxx @@ -22,7 +22,7 @@ License along with OpenFOAM. If not, see . \*---------------------------------------------------------------------------*/ -#include "vtkPV398FoamReader.h" +#include "vtkPV4FoamReader.h" #include "pqApplicationCore.h" #include "pqRenderView.h" @@ -40,18 +40,18 @@ License #include "vtkStringArray.h" // OpenFOAM includes -#include "vtkPV398Foam.H" +#include "vtkPV4Foam.H" #undef EXPERIMENTAL_TIME_CACHING // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // -vtkStandardNewMacro(vtkPV398FoamReader); +vtkStandardNewMacro(vtkPV4FoamReader); // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -vtkPV398FoamReader::vtkPV398FoamReader() +vtkPV4FoamReader::vtkPV4FoamReader() { Debug = 0; vtkDebugMacro(<<"Constructor"); @@ -63,7 +63,7 @@ vtkPV398FoamReader::vtkPV398FoamReader() output0_ = NULL; -#ifdef VTKPV398FOAM_DUALPORT +#ifdef VTKPV4FOAM_DUALPORT // Add second output for the Lagrangian this->SetNumberOfOutputPorts(2); vtkMultiBlockDataSet *lagrangian = vtkMultiBlockDataSet::New(); @@ -100,7 +100,7 @@ vtkPV398FoamReader::vtkPV398FoamReader() SelectionObserver = vtkCallbackCommand::New(); SelectionObserver->SetCallback ( - &vtkPV398FoamReader::SelectionModifiedCallback + &vtkPV4FoamReader::SelectionModifiedCallback ); SelectionObserver->SetClientData(this); @@ -129,7 +129,7 @@ vtkPV398FoamReader::vtkPV398FoamReader() // * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // -vtkPV398FoamReader::~vtkPV398FoamReader() +vtkPV4FoamReader::~vtkPV4FoamReader() { vtkDebugMacro(<<"Deconstructor"); @@ -168,7 +168,7 @@ vtkPV398FoamReader::~vtkPV398FoamReader() // * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * * // // Do everything except set the output info -int vtkPV398FoamReader::RequestInformation +int vtkPV4FoamReader::RequestInformation ( vtkInformation* vtkNotUsed(request), vtkInformationVector** vtkNotUsed(inputVector), @@ -177,7 +177,7 @@ int vtkPV398FoamReader::RequestInformation { vtkDebugMacro(<<"RequestInformation"); - if (Foam::vtkPV398Foam::debug) + if (Foam::vtkPV4Foam::debug) { cout<<"REQUEST_INFORMATION\n"; } @@ -190,7 +190,7 @@ int vtkPV398FoamReader::RequestInformation int nInfo = outputVector->GetNumberOfInformationObjects(); - if (Foam::vtkPV398Foam::debug) + if (Foam::vtkPV4Foam::debug) { cout<<"RequestInformation with " << nInfo << " item(s)\n"; for (int infoI = 0; infoI < nInfo; ++infoI) @@ -201,7 +201,7 @@ int vtkPV398FoamReader::RequestInformation if (!foamData_) { - foamData_ = new Foam::vtkPV398Foam(FileName, this); + foamData_ = new Foam::vtkPV4Foam(FileName, this); } else { @@ -238,7 +238,7 @@ int vtkPV398FoamReader::RequestInformation timeRange[0] = timeSteps[0]; timeRange[1] = timeSteps[nTimeSteps-1]; - if (Foam::vtkPV398Foam::debug > 1) + if (Foam::vtkPV4Foam::debug > 1) { cout<<"nTimeSteps " << nTimeSteps << "\n" <<"timeRange " << timeRange[0] << " to " << timeRange[1] @@ -268,7 +268,7 @@ int vtkPV398FoamReader::RequestInformation // Set the output info -int vtkPV398FoamReader::RequestData +int vtkPV4FoamReader::RequestData ( vtkInformation* vtkNotUsed(request), vtkInformationVector** vtkNotUsed(inputVector), @@ -292,7 +292,7 @@ int vtkPV398FoamReader::RequestData int nInfo = outputVector->GetNumberOfInformationObjects(); - if (Foam::vtkPV398Foam::debug) + if (Foam::vtkPV4Foam::debug) { cout<<"RequestData with " << nInfo << " item(s)\n"; for (int infoI = 0; infoI < nInfo; ++infoI) @@ -310,7 +310,7 @@ int vtkPV398FoamReader::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 vtkPV398Foam::setTime() method + // to the vtkPV4Foam::setTime() method for (int infoI = 0; infoI < nInfo; ++infoI) { vtkInformation *outInfo = outputVector->GetInformationObject(infoI); @@ -342,7 +342,7 @@ int vtkPV398FoamReader::RequestData ) ); - if (Foam::vtkPV398Foam::debug) + if (Foam::vtkPV4Foam::debug) { cout<< "update output with " << output->GetNumberOfBlocks() << " blocks\n"; @@ -370,7 +370,7 @@ int vtkPV398FoamReader::RequestData output->ShallowCopy(output0_); } - if (Foam::vtkPV398Foam::debug) + if (Foam::vtkPV4Foam::debug) { if (needsUpdate) { @@ -390,7 +390,7 @@ int vtkPV398FoamReader::RequestData #else -#ifdef VTKPV398FOAM_DUALPORT +#ifdef VTKPV4FOAM_DUALPORT foamData_->Update ( output, @@ -417,13 +417,13 @@ int vtkPV398FoamReader::RequestData } -void vtkPV398FoamReader::SetRefresh(int val) +void vtkPV4FoamReader::SetRefresh(int val) { Modified(); } -void vtkPV398FoamReader::SetIncludeSets(int val) +void vtkPV4FoamReader::SetIncludeSets(int val) { if (IncludeSets != val) { @@ -436,7 +436,7 @@ void vtkPV398FoamReader::SetIncludeSets(int val) } -void vtkPV398FoamReader::SetIncludeZones(int val) +void vtkPV4FoamReader::SetIncludeZones(int val) { if (IncludeZones != val) { @@ -449,7 +449,7 @@ void vtkPV398FoamReader::SetIncludeZones(int val) } -void vtkPV398FoamReader::SetShowPatchNames(int val) +void vtkPV4FoamReader::SetShowPatchNames(int val) { if (ShowPatchNames != val) { @@ -459,7 +459,7 @@ void vtkPV398FoamReader::SetShowPatchNames(int val) } -void vtkPV398FoamReader::SetShowGroupsOnly(int val) +void vtkPV4FoamReader::SetShowGroupsOnly(int val) { if (ShowGroupsOnly != val) { @@ -472,7 +472,7 @@ void vtkPV398FoamReader::SetShowGroupsOnly(int val) } -void vtkPV398FoamReader::updatePatchNamesView(const bool show) +void vtkPV4FoamReader::updatePatchNamesView(const bool show) { pqApplicationCore* appCore = pqApplicationCore::instance(); @@ -506,7 +506,7 @@ void vtkPV398FoamReader::updatePatchNamesView(const bool show) } -void vtkPV398FoamReader::PrintSelf(ostream& os, vtkIndent indent) +void vtkPV4FoamReader::PrintSelf(ostream& os, vtkIndent indent) { vtkDebugMacro(<<"PrintSelf"); @@ -522,7 +522,7 @@ void vtkPV398FoamReader::PrintSelf(ostream& os, vtkIndent indent) } -int vtkPV398FoamReader::GetTimeStep() +int vtkPV4FoamReader::GetTimeStep() { return foamData_ ? foamData_->timeIndex() : -1; } @@ -531,35 +531,35 @@ int vtkPV398FoamReader::GetTimeStep() // ---------------------------------------------------------------------- // Parts selection list control -vtkDataArraySelection* vtkPV398FoamReader::GetPartSelection() +vtkDataArraySelection* vtkPV4FoamReader::GetPartSelection() { vtkDebugMacro(<<"GetPartSelection"); return PartSelection; } -int vtkPV398FoamReader::GetNumberOfPartArrays() +int vtkPV4FoamReader::GetNumberOfPartArrays() { vtkDebugMacro(<<"GetNumberOfPartArrays"); return PartSelection->GetNumberOfArrays(); } -const char* vtkPV398FoamReader::GetPartArrayName(int index) +const char* vtkPV4FoamReader::GetPartArrayName(int index) { vtkDebugMacro(<<"GetPartArrayName"); return PartSelection->GetArrayName(index); } -int vtkPV398FoamReader::GetPartArrayStatus(const char* name) +int vtkPV4FoamReader::GetPartArrayStatus(const char* name) { vtkDebugMacro(<<"GetPartArrayStatus"); return PartSelection->ArrayIsEnabled(name); } -void vtkPV398FoamReader::SetPartArrayStatus(const char* name, int status) +void vtkPV4FoamReader::SetPartArrayStatus(const char* name, int status) { vtkDebugMacro("Set mesh part \"" << name << "\" status to: " << status); @@ -577,35 +577,35 @@ void vtkPV398FoamReader::SetPartArrayStatus(const char* name, int status) // ---------------------------------------------------------------------- // volField selection list control -vtkDataArraySelection* vtkPV398FoamReader::GetVolFieldSelection() +vtkDataArraySelection* vtkPV4FoamReader::GetVolFieldSelection() { vtkDebugMacro(<<"GetVolFieldSelection"); return VolFieldSelection; } -int vtkPV398FoamReader::GetNumberOfVolFieldArrays() +int vtkPV4FoamReader::GetNumberOfVolFieldArrays() { vtkDebugMacro(<<"GetNumberOfVolFieldArrays"); return VolFieldSelection->GetNumberOfArrays(); } -const char* vtkPV398FoamReader::GetVolFieldArrayName(int index) +const char* vtkPV4FoamReader::GetVolFieldArrayName(int index) { vtkDebugMacro(<<"GetVolFieldArrayName"); return VolFieldSelection->GetArrayName(index); } -int vtkPV398FoamReader::GetVolFieldArrayStatus(const char* name) +int vtkPV4FoamReader::GetVolFieldArrayStatus(const char* name) { vtkDebugMacro(<<"GetVolFieldArrayStatus"); return VolFieldSelection->ArrayIsEnabled(name); } -void vtkPV398FoamReader::SetVolFieldArrayStatus(const char* name, int status) +void vtkPV4FoamReader::SetVolFieldArrayStatus(const char* name, int status) { vtkDebugMacro(<<"SetVolFieldArrayStatus"); if (status) @@ -622,35 +622,35 @@ void vtkPV398FoamReader::SetVolFieldArrayStatus(const char* name, int status) // ---------------------------------------------------------------------- // pointField selection list control -vtkDataArraySelection* vtkPV398FoamReader::GetPointFieldSelection() +vtkDataArraySelection* vtkPV4FoamReader::GetPointFieldSelection() { vtkDebugMacro(<<"GetPointFieldSelection"); return PointFieldSelection; } -int vtkPV398FoamReader::GetNumberOfPointFieldArrays() +int vtkPV4FoamReader::GetNumberOfPointFieldArrays() { vtkDebugMacro(<<"GetNumberOfPointFieldArrays"); return PointFieldSelection->GetNumberOfArrays(); } -const char* vtkPV398FoamReader::GetPointFieldArrayName(int index) +const char* vtkPV4FoamReader::GetPointFieldArrayName(int index) { vtkDebugMacro(<<"GetPointFieldArrayName"); return PointFieldSelection->GetArrayName(index); } -int vtkPV398FoamReader::GetPointFieldArrayStatus(const char* name) +int vtkPV4FoamReader::GetPointFieldArrayStatus(const char* name) { vtkDebugMacro(<<"GetPointFieldArrayStatus"); return PointFieldSelection->ArrayIsEnabled(name); } -void vtkPV398FoamReader::SetPointFieldArrayStatus(const char* name, int status) +void vtkPV4FoamReader::SetPointFieldArrayStatus(const char* name, int status) { vtkDebugMacro(<<"SetPointFieldArrayStatus"); if (status) @@ -667,35 +667,35 @@ void vtkPV398FoamReader::SetPointFieldArrayStatus(const char* name, int status) // ---------------------------------------------------------------------- // lagrangianField selection list control -vtkDataArraySelection* vtkPV398FoamReader::GetLagrangianFieldSelection() +vtkDataArraySelection* vtkPV4FoamReader::GetLagrangianFieldSelection() { vtkDebugMacro(<<"GetLagrangianFieldSelection"); return LagrangianFieldSelection; } -int vtkPV398FoamReader::GetNumberOfLagrangianFieldArrays() +int vtkPV4FoamReader::GetNumberOfLagrangianFieldArrays() { vtkDebugMacro(<<"GetNumberOfLagrangianFieldArrays"); return LagrangianFieldSelection->GetNumberOfArrays(); } -const char* vtkPV398FoamReader::GetLagrangianFieldArrayName(int index) +const char* vtkPV4FoamReader::GetLagrangianFieldArrayName(int index) { vtkDebugMacro(<<"GetLagrangianFieldArrayName"); return LagrangianFieldSelection->GetArrayName(index); } -int vtkPV398FoamReader::GetLagrangianFieldArrayStatus(const char* name) +int vtkPV4FoamReader::GetLagrangianFieldArrayStatus(const char* name) { vtkDebugMacro(<<"GetLagrangianFieldArrayStatus"); return LagrangianFieldSelection->ArrayIsEnabled(name); } -void vtkPV398FoamReader::SetLagrangianFieldArrayStatus +void vtkPV4FoamReader::SetLagrangianFieldArrayStatus ( const char* name, int status @@ -715,7 +715,7 @@ void vtkPV398FoamReader::SetLagrangianFieldArrayStatus // ---------------------------------------------------------------------- -void vtkPV398FoamReader::SelectionModifiedCallback +void vtkPV4FoamReader::SelectionModifiedCallback ( vtkObject*, unsigned long, @@ -723,18 +723,18 @@ void vtkPV398FoamReader::SelectionModifiedCallback void* ) { - static_cast(clientdata)->SelectionModified(); + static_cast(clientdata)->SelectionModified(); } -void vtkPV398FoamReader::SelectionModified() +void vtkPV4FoamReader::SelectionModified() { vtkDebugMacro(<<"SelectionModified"); Modified(); } -int vtkPV398FoamReader::FillOutputPortInformation +int vtkPV4FoamReader::FillOutputPortInformation ( int port, vtkInformation* info diff --git a/applications/utilities/postProcessing/graphics/PV398Readers/PV398FoamReader/PV398FoamReader/vtkPV398FoamReader.h b/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/PV4FoamReader/vtkPV4FoamReader.h similarity index 92% rename from applications/utilities/postProcessing/graphics/PV398Readers/PV398FoamReader/PV398FoamReader/vtkPV398FoamReader.h rename to applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/PV4FoamReader/vtkPV4FoamReader.h index 21415bc440..0b898e3a9c 100644 --- a/applications/utilities/postProcessing/graphics/PV398Readers/PV398FoamReader/PV398FoamReader/vtkPV398FoamReader.h +++ b/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/PV4FoamReader/vtkPV4FoamReader.h @@ -22,21 +22,21 @@ License along with OpenFOAM. If not, see . Class - vtkPV398FoamReader + vtkPV4FoamReader Description reads a dataset in OpenFOAM format - vtkPV398blockMeshReader creates an multiblock dataset. + vtkPV4blockMeshReader creates an multiblock dataset. It uses the OpenFOAM infrastructure (fvMesh, etc) to handle mesh and field data. SourceFiles - vtkPV398blockMeshReader.cxx + vtkPV4blockMeshReader.cxx \*---------------------------------------------------------------------------*/ -#ifndef vtkPV398FoamReader_h -#define vtkPV398FoamReader_h +#ifndef vtkPV4FoamReader_h +#define vtkPV4FoamReader_h // VTK includes #include "vtkMultiBlockDataSetAlgorithm.h" @@ -50,23 +50,23 @@ class vtkCallbackCommand; // OpenFOAM forward declarations namespace Foam { - class vtkPV398Foam; + class vtkPV4Foam; } /*---------------------------------------------------------------------------*\ - Class vtkPV398FoamReader Declaration + Class vtkPV4FoamReader Declaration \*---------------------------------------------------------------------------*/ -class vtkPV398FoamReader +class vtkPV4FoamReader : public vtkMultiBlockDataSetAlgorithm { public: - vtkTypeMacro(vtkPV398FoamReader, vtkMultiBlockDataSetAlgorithm); + vtkTypeMacro(vtkPV4FoamReader, vtkMultiBlockDataSetAlgorithm); void PrintSelf(ostream&, vtkIndent); - static vtkPV398FoamReader* New(); + static vtkPV4FoamReader* New(); // Description: // Get the current timestep and the timestep range. @@ -184,10 +184,10 @@ public: protected: //- Construct null - vtkPV398FoamReader(); + vtkPV4FoamReader(); //- Destructor - ~vtkPV398FoamReader(); + ~vtkPV4FoamReader(); //- Return information about mesh, times, etc without loading anything virtual int RequestInformation @@ -218,10 +218,10 @@ protected: private: //- Disallow default bitwise copy construct - vtkPV398FoamReader(const vtkPV398FoamReader&); + vtkPV4FoamReader(const vtkPV4FoamReader&); //- Disallow default bitwise assignment - void operator=(const vtkPV398FoamReader&); + void operator=(const vtkPV4FoamReader&); //- Add/remove patch names to/from the view void updatePatchNamesView(const bool show); @@ -251,7 +251,7 @@ private: vtkMultiBlockDataSet* output0_; //BTX - Foam::vtkPV398Foam* foamData_; + Foam::vtkPV4Foam* foamData_; //ETX }; diff --git a/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/Make/files b/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/Make/files new file mode 100644 index 0000000000..548c4b8a93 --- /dev/null +++ b/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/Make/files @@ -0,0 +1,11 @@ +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/PV398Readers/PV398FoamReader/vtkPV398Foam/Make/options b/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/Make/options similarity index 81% rename from applications/utilities/postProcessing/graphics/PV398Readers/PV398FoamReader/vtkPV398Foam/Make/options rename to applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/Make/options index 3b0bb17b3b..1ed6a9e569 100644 --- a/applications/utilities/postProcessing/graphics/PV398Readers/PV398FoamReader/vtkPV398Foam/Make/options +++ b/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/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../../vtkPV398Readers/lnInclude \ - -I../PV398FoamReader \ + -I../../vtkPV4Readers/lnInclude \ + -I../PV4FoamReader \ -I$(ParaView_INCLUDE_DIR) \ $(shell \ test -f $(ParaView_INCLUDE_DIR)/vtkPolyhedron.h && \ @@ -17,5 +17,5 @@ LIB_LIBS = \ -lfiniteVolume \ -lgenericPatchFields \ -llagrangian \ - -L$(FOAM_LIBBIN) -lvtkPV398Readers \ + -L$(FOAM_LIBBIN) -lvtkPV4Readers \ $(GLIBS) diff --git a/applications/utilities/postProcessing/graphics/PV398Readers/PV398FoamReader/vtkPV398Foam/vtkDataArrayTemplateImplicit.txx b/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/vtkDataArrayTemplateImplicit.txx similarity index 100% rename from applications/utilities/postProcessing/graphics/PV398Readers/PV398FoamReader/vtkPV398Foam/vtkDataArrayTemplateImplicit.txx rename to applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/vtkDataArrayTemplateImplicit.txx diff --git a/applications/utilities/postProcessing/graphics/PV398Readers/PV398FoamReader/vtkPV398Foam/vtkOpenFOAMPoints.H b/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/vtkOpenFOAMPoints.H similarity index 99% rename from applications/utilities/postProcessing/graphics/PV398Readers/PV398FoamReader/vtkPV398Foam/vtkOpenFOAMPoints.H rename to applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/vtkOpenFOAMPoints.H index aa0391408e..a41fe2730d 100644 --- a/applications/utilities/postProcessing/graphics/PV398Readers/PV398FoamReader/vtkPV398Foam/vtkOpenFOAMPoints.H +++ b/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/vtkOpenFOAMPoints.H @@ -22,7 +22,7 @@ License along with OpenFOAM. If not, see . InClass - vtkPV398Foam + vtkPV4Foam \*---------------------------------------------------------------------------*/ diff --git a/applications/utilities/postProcessing/graphics/PV398Readers/PV398FoamReader/vtkPV398Foam/vtkOpenFOAMTupleRemap.H b/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/vtkOpenFOAMTupleRemap.H similarity index 99% rename from applications/utilities/postProcessing/graphics/PV398Readers/PV398FoamReader/vtkPV398Foam/vtkOpenFOAMTupleRemap.H rename to applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/vtkOpenFOAMTupleRemap.H index f5057359e6..b8358b57fe 100644 --- a/applications/utilities/postProcessing/graphics/PV398Readers/PV398FoamReader/vtkPV398Foam/vtkOpenFOAMTupleRemap.H +++ b/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/vtkOpenFOAMTupleRemap.H @@ -22,7 +22,7 @@ License along with OpenFOAM. If not, see . InClass - vtkPV398Foam + vtkPV4Foam \*---------------------------------------------------------------------------*/ diff --git a/applications/utilities/postProcessing/graphics/PV398Readers/PV398FoamReader/vtkPV398Foam/vtkPV398Foam.C b/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/vtkPV4Foam.C similarity index 92% rename from applications/utilities/postProcessing/graphics/PV398Readers/PV398FoamReader/vtkPV398Foam/vtkPV398Foam.C rename to applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/vtkPV4Foam.C index 54848ccc26..960883af34 100644 --- a/applications/utilities/postProcessing/graphics/PV398Readers/PV398FoamReader/vtkPV398Foam/vtkPV398Foam.C +++ b/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/vtkPV4Foam.C @@ -23,8 +23,8 @@ License \*---------------------------------------------------------------------------*/ -#include "vtkPV398Foam.H" -#include "vtkPV398FoamReader.h" +#include "vtkPV4Foam.H" +#include "vtkPV4FoamReader.h" // OpenFOAM includes #include "fvMesh.H" @@ -42,16 +42,16 @@ License namespace Foam { -defineTypeNameAndDebug(vtkPV398Foam, 0); +defineTypeNameAndDebug(vtkPV4Foam, 0); } // * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // -#include "vtkPV398FoamAddToSelection.H" -#include "vtkPV398FoamUpdateInfoFields.H" +#include "vtkPV4FoamAddToSelection.H" +#include "vtkPV4FoamUpdateInfoFields.H" -void Foam::vtkPV398Foam::resetCounters() +void Foam::vtkPV4Foam::resetCounters() { // Reset array range information (ids and sizes) arrayRangeVolume_.reset(); @@ -66,7 +66,7 @@ void Foam::vtkPV398Foam::resetCounters() } -void Foam::vtkPV398Foam::reduceMemory() +void Foam::vtkPV4Foam::reduceMemory() { forAll(regionPolyDecomp_, i) { @@ -91,7 +91,7 @@ void Foam::vtkPV398Foam::reduceMemory() } -int Foam::vtkPV398Foam::setTime(int nRequest, const double requestTimes[]) +int Foam::vtkPV4Foam::setTime(int nRequest, const double requestTimes[]) { Time& runTime = dbPtr_(); @@ -116,7 +116,7 @@ int Foam::vtkPV398Foam::setTime(int nRequest, const double requestTimes[]) if (debug) { - Info<< " Foam::vtkPV398Foam::setTime("; + Info<< " Foam::vtkPV4Foam::setTime("; for (int requestI = 0; requestI < nRequest; ++requestI) { if (requestI) @@ -160,7 +160,7 @@ int Foam::vtkPV398Foam::setTime(int nRequest, const double requestTimes[]) if (debug) { - Info<< " Foam::vtkPV398Foam::setTime() - selectedTime=" + Info<< " Foam::vtkPV4Foam::setTime() - selectedTime=" << Times[nearestIndex].name() << " index=" << timeIndex_ << "/" << Times.size() << " meshChanged=" << Switch(meshChanged_) @@ -171,11 +171,11 @@ int Foam::vtkPV398Foam::setTime(int nRequest, const double requestTimes[]) } -void Foam::vtkPV398Foam::updateMeshPartsStatus() +void Foam::vtkPV4Foam::updateMeshPartsStatus() { if (debug) { - Info<< " Foam::vtkPV398Foam::updateMeshPartsStatus" << endl; + Info<< " Foam::vtkPV4Foam::updateMeshPartsStatus" << endl; } vtkDataArraySelection* selection = reader_->GetPartSelection(); @@ -212,17 +212,17 @@ void Foam::vtkPV398Foam::updateMeshPartsStatus() } if (debug) { - Info<< " Foam::vtkPV398Foam::updateMeshPartsStatus" << endl; + Info<< " Foam::vtkPV4Foam::updateMeshPartsStatus" << endl; } } // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -Foam::vtkPV398Foam::vtkPV398Foam +Foam::vtkPV4Foam::vtkPV4Foam ( const char* const FileName, - vtkPV398FoamReader* reader + vtkPV4FoamReader* reader ) : reader_(reader), @@ -245,7 +245,7 @@ Foam::vtkPV398Foam::vtkPV398Foam { if (debug) { - Info<< "Foam::vtkPV398Foam::vtkPV398Foam - " << FileName << endl; + Info<< "Foam::vtkPV4Foam::vtkPV4Foam - " << FileName << endl; printMemory(); } @@ -329,11 +329,11 @@ Foam::vtkPV398Foam::vtkPV398Foam // * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // -Foam::vtkPV398Foam::~vtkPV398Foam() +Foam::vtkPV4Foam::~vtkPV4Foam() { if (debug) { - Info<< " Foam::vtkPV398Foam::~vtkPV398Foam" << endl; + Info<< " Foam::vtkPV4Foam::~vtkPV4Foam" << endl; } delete meshPtr_; @@ -342,11 +342,11 @@ Foam::vtkPV398Foam::~vtkPV398Foam() // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -void Foam::vtkPV398Foam::updateInfo() +void Foam::vtkPV4Foam::updateInfo() { if (debug) { - Info<< " Foam::vtkPV398Foam::updateInfo" + Info<< " Foam::vtkPV4Foam::updateInfo" << " [meshPtr=" << (meshPtr_ ? "set" : "NULL") << "] timeIndex=" << timeIndex_ << endl; } @@ -409,17 +409,17 @@ void Foam::vtkPV398Foam::updateInfo() { // just for debug info getSelectedArrayEntries(partSelection); - Info<< " Foam::vtkPV398Foam::updateInfo" << endl; + Info<< " Foam::vtkPV4Foam::updateInfo" << endl; } } -void Foam::vtkPV398Foam::updateFoamMesh() +void Foam::vtkPV4Foam::updateFoamMesh() { if (debug) { - Info<< " Foam::vtkPV398Foam::updateFoamMesh" << endl; + Info<< " Foam::vtkPV4Foam::updateFoamMesh" << endl; printMemory(); } @@ -463,13 +463,13 @@ void Foam::vtkPV398Foam::updateFoamMesh() if (debug) { - Info<< " Foam::vtkPV398Foam::updateFoamMesh" << endl; + Info<< " Foam::vtkPV4Foam::updateFoamMesh" << endl; printMemory(); } } -void Foam::vtkPV398Foam::Update +void Foam::vtkPV4Foam::Update ( vtkMultiBlockDataSet* output, vtkMultiBlockDataSet* lagrangianOutput @@ -477,7 +477,7 @@ void Foam::vtkPV398Foam::Update { if (debug) { - cout<< " Foam::vtkPV398Foam::Update - output with " + cout<< " Foam::vtkPV4Foam::Update - output with " << output->GetNumberOfBlocks() << " and " << lagrangianOutput->GetNumberOfBlocks() << " blocks\n"; output->Print(cout); @@ -518,7 +518,7 @@ void Foam::vtkPV398Foam::Update reader_->UpdateProgress(0.7); } -#ifdef VTKPV398FOAM_DUALPORT +#ifdef VTKPV4FOAM_DUALPORT // restart port1 at block=0 blockNo = 0; #endif @@ -540,7 +540,7 @@ void Foam::vtkPV398Foam::Update } -void Foam::vtkPV398Foam::CleanUp() +void Foam::vtkPV4Foam::CleanUp() { // reclaim some memory reduceMemory(); @@ -548,7 +548,7 @@ void Foam::vtkPV398Foam::CleanUp() } -double* Foam::vtkPV398Foam::findTimes(int& nTimeSteps) +double* Foam::vtkPV4Foam::findTimes(int& nTimeSteps) { int nTimes = 0; double* tsteps = NULL; @@ -621,7 +621,7 @@ double* Foam::vtkPV398Foam::findTimes(int& nTimeSteps) } -void Foam::vtkPV398Foam::renderPatchNames +void Foam::vtkPV4Foam::renderPatchNames ( vtkRenderer* renderer, const bool show @@ -819,7 +819,7 @@ void Foam::vtkPV398Foam::renderPatchNames } -void Foam::vtkPV398Foam::PrintSelf(ostream& os, vtkIndent indent) const +void Foam::vtkPV4Foam::PrintSelf(ostream& os, vtkIndent indent) const { os << indent << "Number of nodes: " << (meshPtr_ ? meshPtr_->nPoints() : 0) << "\n"; diff --git a/applications/utilities/postProcessing/graphics/PV398Readers/PV398FoamReader/vtkPV398Foam/vtkPV398Foam.H b/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/vtkPV4Foam.H similarity index 94% rename from applications/utilities/postProcessing/graphics/PV398Readers/PV398FoamReader/vtkPV398Foam/vtkPV398Foam.H rename to applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/vtkPV4Foam.H index e692fda6df..bd5c22a22f 100644 --- a/applications/utilities/postProcessing/graphics/PV398Readers/PV398FoamReader/vtkPV398Foam/vtkPV398Foam.H +++ b/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/vtkPV4Foam.H @@ -22,39 +22,39 @@ License along with OpenFOAM. If not, see . Class - Foam::vtkPV398Foam + Foam::vtkPV4Foam Description Provides a reader interface for OpenFOAM to VTK interaction. SourceFiles - vtkPV398Foam.C - vtkPV398Foam.H - vtkPV398FoamFields.C - vtkPV398FoamMesh.C - vtkPV398FoamMeshLagrangian.C - vtkPV398FoamTemplates.C - vtkPV398FoamMeshSet.C - vtkPV398FoamMeshVolume.C - vtkPV398FoamMeshZone.C - vtkPV398FoamFaceField.H - vtkPV398FoamLagrangianFields.H - vtkPV398FoamPatchField.H - vtkPV398FoamPointFields.H - vtkPV398FoamPoints.H - vtkPV398FoamUpdateInfo.C - vtkPV398FoamUpdateInfoFields.H - vtkPV398FoamUtils.C - vtkPV398FoamVolFields.H - vtkPV398FoamAddToSelection.H + 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 // Needed by VTK: vtkDataArrayTemplateImplicit.txx \*---------------------------------------------------------------------------*/ -#ifndef vtkPV398Foam_H -#define vtkPV398Foam_H +#ifndef vtkPV4Foam_H +#define vtkPV4Foam_H // do not include legacy strstream headers #ifndef VTK_EXCLUDE_STRSTREAM_HEADERS @@ -69,14 +69,14 @@ SourceFiles #include "PrimitivePatchInterpolation.H" #include "volPointInterpolation.H" -#undef VTKPV398FOAM_DUALPORT +#undef VTKPV4FOAM_DUALPORT // * * * * * * * * * * * * * Forward Declarations * * * * * * * * * * * * * // class vtkDataArraySelection; class vtkDataSet; class vtkPoints; -class vtkPV398FoamReader; +class vtkPV4FoamReader; class vtkRenderer; class vtkTextActor; class vtkMultiBlockDataSet; @@ -102,10 +102,10 @@ template class IOField; template class List; /*---------------------------------------------------------------------------*\ - Class vtkPV398Foam Declaration + Class vtkPV4Foam Declaration \*---------------------------------------------------------------------------*/ -class vtkPV398Foam +class vtkPV4Foam { // Private classes @@ -246,8 +246,8 @@ class vtkPV398Foam // Private Data - //- Access to the controlling vtkPV398FoamReader - vtkPV398FoamReader* reader_; + //- Access to the controlling vtkPV4FoamReader + vtkPV4FoamReader* reader_; //- OpenFOAM time control autoPtr