zhyang-dev/openfoam
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/openfoam.git synced 2025-11-28 03:28:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Renamed PV4Readers -> PVReaders to avoid confusion when compiling the reader for ParaView-5

Browse Source
This commit is contained in:
Henry Weller
2016-02-10 21:12:49 +00:00
parent 629508a85a
commit 69b59b6586
58 changed files with 536 additions and 536 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/Make/files
View File

@ -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

5
applications/utilities/postProcessing/graphics/PV4Readers/PV4blockMeshReader/vtkPV4blockMesh/Make/files
View File

@ -1,5 +0,0 @@
vtkPV4blockMesh.C
vtkPV4blockMeshConvert.C
vtkPV4blockMeshUtils.C
LIB = $(FOAM_LIBBIN)/libvtkPV4blockMesh

3
applications/utilities/postProcessing/graphics/PV4Readers/vtkPV4Readers/Make/files
View File

@ -1,3 +0,0 @@
vtkPV4Readers.C
LIB = $(FOAM_LIBBIN)/libvtkPV4Readers

6
applications/utilities/postProcessing/graphics/PV4Readers/Allwclean → applications/utilities/postProcessing/graphics/PVReaders/Allwclean
View File

@ -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

8
applications/utilities/postProcessing/graphics/PV4Readers/Allwmake → applications/utilities/postProcessing/graphics/PVReaders/Allwmake
View File

@ -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

6
applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/Allwclean → applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/Allwclean
View File

@ -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

4
applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/Allwmake → applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/Allwmake
View File

@ -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 ../..

20
applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/PV4FoamReader/CMakeLists.txt → applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/PVFoamReader/CMakeLists.txt
View File

@ -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
)
#-----------------------------------------------------------------------------

2
applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/PV4FoamReader/PV4FoamReader.qrc → applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/PVFoamReader/PVFoamReader.qrc
View File

@ -1,5 +1,5 @@
<RCC>
<qresource prefix="/ParaViewResources" >
<file>PV4FoamReader.xml</file>
<file>PVFoamReader.xml</file>
</qresource>
</RCC>

2
applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/PV4FoamReader/PV4FoamReader.xml → applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/PVFoamReader/PVFoamReader.xml
View File

@ -1,5 +1,5 @@
<ParaViewReaders>
<Reader name="PV4FoamReader"
<Reader name="PVFoamReader"
extensions="OpenFOAM"
file_description="OpenFOAM Reader">
</Reader>

4
applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/PV4FoamReader/PVFoamReader_SM.xml → applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/PVFoamReader/PVFoamReader_SM.xml
View File

@ -1,8 +1,8 @@
<ServerManagerConfiguration>
<ProxyGroup name="sources">
<SourceProxy
name="PV4FoamReader"
class="vtkPV4FoamReader">
name="PVFoamReader"
class="vtkPVFoamReader">
<!-- File name - compulsory -->
<StringVectorProperty

24
applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/PV4FoamReader/pqPV4FoamReaderPanel.cxx → applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/PVFoamReader/pqPVFoamReaderPanel.cxx
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -23,7 +23,7 @@ License
\*---------------------------------------------------------------------------*/
#include "pqPV4FoamReaderPanel.h"
#include "pqPVFoamReaderPanel.h"
// QT
#include <QGridLayout>
@ -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;

20
applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/PV4FoamReader/pqPV4FoamReaderPanel.h → applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/PVFoamReader/pqPVFoamReaderPanel.h
View File

@ -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 <http://www.gnu.org/licenses/>.
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();
};

102
applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/PV4FoamReader/vtkPV4FoamReader.cxx → applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/PVFoamReader/vtkPVFoamReader.cxx
View File

@ -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 <http://www.gnu.org/licenses/>.
\*---------------------------------------------------------------------------*/
#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<vtkPV4FoamReader*>(clientdata)->SelectionModified();
static_cast<vtkPVFoamReader*>(clientdata)->SelectionModified();
}
void vtkPV4FoamReader::SelectionModified()
void vtkPVFoamReader::SelectionModified()
{
vtkDebugMacro(<<"SelectionModified");
Modified();
}
int vtkPV4FoamReader::FillOutputPortInformation
int vtkPVFoamReader::FillOutputPortInformation
(
int port,
vtkInformation* info

32
applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/PV4FoamReader/vtkPV4FoamReader.h → applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/PVFoamReader/vtkPVFoamReader.h
View File

@ -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 <http://www.gnu.org/licenses/>.
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
};

11
applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/Make/files Normal file
View File

@ -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

6
applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/Make/options → applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/Make/options
View File

@ -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)

4
applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/vtkOpenFOAMPoints.H → applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkOpenFOAMPoints.H
View File

@ -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 <http://www.gnu.org/licenses/>.
InClass
vtkPV4Foam
vtkPVFoam
\*---------------------------------------------------------------------------*/

4
applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/vtkOpenFOAMTupleRemap.H → applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkOpenFOAMTupleRemap.H
View File

@ -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 <http://www.gnu.org/licenses/>.
InClass
vtkPV4Foam
vtkPVFoam
\*---------------------------------------------------------------------------*/

62
applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/vtkPV4Foam.C → applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoam.C
View File

@ -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<< "<beg> Foam::vtkPV4Foam::setTime(";
Info<< "<beg> 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<< "<end> Foam::vtkPV4Foam::setTime() - selectedTime="
Info<< "<end> 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<< "<beg> Foam::vtkPV4Foam::updateMeshPartsStatus" << endl;
Info<< "<beg> Foam::vtkPVFoam::updateMeshPartsStatus" << endl;
}
vtkDataArraySelection* selection = reader_->GetPartSelection();
@ -212,17 +212,17 @@ void Foam::vtkPV4Foam::updateMeshPartsStatus()
}
if (debug)
{
Info<< "<end> Foam::vtkPV4Foam::updateMeshPartsStatus" << endl;
Info<< "<end> 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<< "<end> Foam::vtkPV4Foam::~vtkPV4Foam" << endl;
Info<< "<end> 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<< "<beg> Foam::vtkPV4Foam::updateInfo"
Info<< "<beg> 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<< "<end> Foam::vtkPV4Foam::updateInfo" << endl;
Info<< "<end> Foam::vtkPVFoam::updateInfo" << endl;
}
}
void Foam::vtkPV4Foam::updateFoamMesh()
void Foam::vtkPVFoam::updateFoamMesh()
{
if (debug)
{
Info<< "<beg> Foam::vtkPV4Foam::updateFoamMesh" << endl;
Info<< "<beg> Foam::vtkPVFoam::updateFoamMesh" << endl;
printMemory();
}
@ -463,13 +463,13 @@ void Foam::vtkPV4Foam::updateFoamMesh()
if (debug)
{
Info<< "<end> Foam::vtkPV4Foam::updateFoamMesh" << endl;
Info<< "<end> 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<< "<beg> Foam::vtkPV4Foam::Update - output with "
cout<< "<beg> 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";

70
applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/vtkPV4Foam.H → applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoam.H
View File

@ -22,39 +22,39 @@ License
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
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 Type> class IOField;
template<class Type> 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<Time> dbPtr_;
@ -652,31 +652,31 @@ class vtkPV4Foam
//- Disallow default bitwise copy construct
vtkPV4Foam(const vtkPV4Foam&);
vtkPVFoam(const vtkPVFoam&);
//- Disallow default bitwise assignment
void operator=(const vtkPV4Foam&);
void operator=(const vtkPVFoam&);
public:
//- Static data members
ClassName("vtkPV4Foam");
ClassName("vtkPVFoam");
// Constructors
//- Construct from components
vtkPV4Foam
vtkPVFoam
(
const char* const FileName,
vtkPV4FoamReader* reader
vtkPVFoamReader* reader
);
//- Destructor
~vtkPV4Foam();
~vtkPVFoam();
// Member Functions
@ -731,7 +731,7 @@ public:
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
#ifdef NoRepository
#include "vtkPV4FoamTemplates.C"
#include "vtkPVFoamTemplates.C"
#endif
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

8
applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/vtkPV4FoamAddToSelection.H → applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamAddToSelection.H
View File

@ -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
@ -23,8 +23,8 @@ License
\*---------------------------------------------------------------------------*/
#ifndef vtkPV4FoamAddToSelection_H
#define vtkPV4FoamAddToSelection_H
#ifndef vtkPVFoamAddToSelection_H
#define vtkPVFoamAddToSelection_H
// OpenFOAM includes
#include "IOobjectList.H"
@ -36,7 +36,7 @@ License
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
template<class Type>
Foam::label Foam::vtkPV4Foam::addToSelection
Foam::label Foam::vtkPVFoam::addToSelection
(
vtkDataArraySelection *select,
const IOobjectList& objectLst,

10
applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/vtkPV4FoamFaceField.H → applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamFaceField.H
View File

@ -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,12 +22,12 @@ License
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
InClass
vtkPV4Foam
vtkPVFoam
\*---------------------------------------------------------------------------*/
#ifndef vtkPV4FoamFaceField_H
#define vtkPV4FoamFaceField_H
#ifndef vtkPVFoamFaceField_H
#define vtkPVFoamFaceField_H
// VTK includes
#include "vtkCellData.h"
@ -40,7 +40,7 @@ InClass
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
template<class Type>
void Foam::vtkPV4Foam::convertFaceField
void Foam::vtkPVFoam::convertFaceField
(
const GeometricField<Type, fvPatchField, volMesh>& tf,
vtkMultiBlockDataSet* output,

30
applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/vtkPV4FoamFields.C → applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamFields.C
View File

@ -23,11 +23,11 @@ License
\*---------------------------------------------------------------------------*/
#include "vtkPV4Foam.H"
#include "vtkPVFoam.H"
// OpenFOAM includes
#include "IOobjectList.H"
#include "vtkPV4FoamReader.h"
#include "vtkPVFoamReader.h"
// VTK includes
#include "vtkDataArraySelection.h"
@ -36,12 +36,12 @@ License
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
#include "vtkPV4FoamVolFields.H"
#include "vtkPV4FoamPointFields.H"
#include "vtkPV4FoamLagrangianFields.H"
#include "vtkPVFoamVolFields.H"
#include "vtkPVFoamPointFields.H"
#include "vtkPVFoamLagrangianFields.H"
void Foam::vtkPV4Foam::pruneObjectList
void Foam::vtkPVFoam::pruneObjectList
(
IOobjectList& objects,
const wordHashSet& selected
@ -64,7 +64,7 @@ void Foam::vtkPV4Foam::pruneObjectList
}
void Foam::vtkPV4Foam::convertVolFields
void Foam::vtkPVFoam::convertVolFields
(
vtkMultiBlockDataSet* output
)
@ -93,7 +93,7 @@ void Foam::vtkPV4Foam::convertVolFields
if (debug)
{
Info<< "<beg> Foam::vtkPV4Foam::convertVolFields" << nl
Info<< "<beg> Foam::vtkPVFoam::convertVolFields" << nl
<< "converting OpenFOAM volume fields" << endl;
forAllConstIter(IOobjectList, objects, iter)
{
@ -145,13 +145,13 @@ void Foam::vtkPV4Foam::convertVolFields
if (debug)
{
Info<< "<end> Foam::vtkPV4Foam::convertVolFields" << endl;
Info<< "<end> Foam::vtkPVFoam::convertVolFields" << endl;
printMemory();
}
}
void Foam::vtkPV4Foam::convertPointFields
void Foam::vtkPVFoam::convertPointFields
(
vtkMultiBlockDataSet* output
)
@ -184,7 +184,7 @@ void Foam::vtkPV4Foam::convertPointFields
if (debug)
{
Info<< "<beg> Foam::vtkPV4Foam::convertPointFields" << nl
Info<< "<beg> Foam::vtkPVFoam::convertPointFields" << nl
<< "converting OpenFOAM volume fields -> point fields" << endl;
forAllConstIter(IOobjectList, objects, iter)
{
@ -221,13 +221,13 @@ void Foam::vtkPV4Foam::convertPointFields
if (debug)
{
Info<< "<end> Foam::vtkPV4Foam::convertPointFields" << endl;
Info<< "<end> Foam::vtkPVFoam::convertPointFields" << endl;
printMemory();
}
}
void Foam::vtkPV4Foam::convertLagrangianFields
void Foam::vtkPVFoam::convertLagrangianFields
(
vtkMultiBlockDataSet* output
)
@ -247,7 +247,7 @@ void Foam::vtkPV4Foam::convertLagrangianFields
if (debug)
{
Info<< "<beg> Foam::vtkPV4Foam::convertLagrangianFields" << endl;
Info<< "<beg> Foam::vtkPVFoam::convertLagrangianFields" << endl;
printMemory();
}
@ -316,7 +316,7 @@ void Foam::vtkPV4Foam::convertLagrangianFields
if (debug)
{
Info<< "<end> Foam::vtkPV4Foam::convertLagrangianFields" << endl;
Info<< "<end> Foam::vtkPVFoam::convertLagrangianFields" << endl;
printMemory();
}
}

12
applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/vtkPV4FoamLagrangianFields.H → applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamLagrangianFields.H
View File

@ -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,12 +22,12 @@ License
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
InClass
vtkPV4Foam
vtkPVFoam
\*---------------------------------------------------------------------------*/
#ifndef vtkPV4FoamLagrangianFields_H
#define vtkPV4FoamLagrangianFields_H
#ifndef vtkPVFoamLagrangianFields_H
#define vtkPVFoamLagrangianFields_H
#include "Cloud.H"
@ -36,7 +36,7 @@ InClass
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
template<class Type>
void Foam::vtkPV4Foam::convertLagrangianFields
void Foam::vtkPVFoam::convertLagrangianFields
(
const IOobjectList& objects,
vtkMultiBlockDataSet* output,
@ -58,7 +58,7 @@ void Foam::vtkPV4Foam::convertLagrangianFields
template<class Type>
void Foam::vtkPV4Foam::convertLagrangianField
void Foam::vtkPVFoam::convertLagrangianField
(
const IOField<Type>& tf,
vtkMultiBlockDataSet* output,

60
applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/vtkPV4FoamMesh.C → applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamMesh.C
View File

@ -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
@ -23,14 +23,14 @@ License
\*---------------------------------------------------------------------------*/
#include "vtkPV4Foam.H"
#include "vtkPVFoam.H"
// OpenFOAM includes
#include "cellSet.H"
#include "faceSet.H"
#include "pointSet.H"
#include "fvMeshSubset.H"
#include "vtkPV4FoamReader.h"
#include "vtkPVFoamReader.h"
#include "uindirectPrimitivePatch.H"
// VTK includes
@ -41,7 +41,7 @@ License
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
void Foam::vtkPV4Foam::convertMeshVolume
void Foam::vtkPVFoam::convertMeshVolume
(
vtkMultiBlockDataSet* output,
int& blockNo
@ -57,7 +57,7 @@ void Foam::vtkPV4Foam::convertMeshVolume
if (debug)
{
Info<< "<beg> Foam::vtkPV4Foam::convertMeshVolume" << endl;
Info<< "<beg> Foam::vtkPVFoam::convertMeshVolume" << endl;
printMemory();
}
@ -95,13 +95,13 @@ void Foam::vtkPV4Foam::convertMeshVolume
if (debug)
{
Info<< "<end> Foam::vtkPV4Foam::convertMeshVolume" << endl;
Info<< "<end> Foam::vtkPVFoam::convertMeshVolume" << endl;
printMemory();
}
}
void Foam::vtkPV4Foam::convertMeshLagrangian
void Foam::vtkPVFoam::convertMeshLagrangian
(
vtkMultiBlockDataSet* output,
int& blockNo
@ -114,7 +114,7 @@ void Foam::vtkPV4Foam::convertMeshLagrangian
if (debug)
{
Info<< "<beg> Foam::vtkPV4Foam::convertMeshLagrangian" << endl;
Info<< "<beg> Foam::vtkPVFoam::convertMeshLagrangian" << endl;
printMemory();
}
@ -146,13 +146,13 @@ void Foam::vtkPV4Foam::convertMeshLagrangian
if (debug)
{
Info<< "<end> Foam::vtkPV4Foam::convertMeshLagrangian" << endl;
Info<< "<end> Foam::vtkPVFoam::convertMeshLagrangian" << endl;
printMemory();
}
}
void Foam::vtkPV4Foam::convertMeshPatches
void Foam::vtkPVFoam::convertMeshPatches
(
vtkMultiBlockDataSet* output,
int& blockNo
@ -166,7 +166,7 @@ void Foam::vtkPV4Foam::convertMeshPatches
if (debug)
{
Info<< "<beg> Foam::vtkPV4Foam::convertMeshPatches" << endl;
Info<< "<beg> Foam::vtkPVFoam::convertMeshPatches" << endl;
printMemory();
}
@ -235,13 +235,13 @@ void Foam::vtkPV4Foam::convertMeshPatches
if (debug)
{
Info<< "<end> Foam::vtkPV4Foam::convertMeshPatches" << endl;
Info<< "<end> Foam::vtkPVFoam::convertMeshPatches" << endl;
printMemory();
}
}
void Foam::vtkPV4Foam::convertMeshCellZones
void Foam::vtkPVFoam::convertMeshCellZones
(
vtkMultiBlockDataSet* output,
int& blockNo
@ -262,7 +262,7 @@ void Foam::vtkPV4Foam::convertMeshCellZones
if (debug)
{
Info<< "<beg> Foam::vtkPV4Foam::convertMeshCellZones" << endl;
Info<< "<beg> Foam::vtkPVFoam::convertMeshCellZones" << endl;
printMemory();
}
@ -324,13 +324,13 @@ void Foam::vtkPV4Foam::convertMeshCellZones
if (debug)
{
Info<< "<end> Foam::vtkPV4Foam::convertMeshCellZones" << endl;
Info<< "<end> Foam::vtkPVFoam::convertMeshCellZones" << endl;
printMemory();
}
}
void Foam::vtkPV4Foam::convertMeshCellSets
void Foam::vtkPVFoam::convertMeshCellSets
(
vtkMultiBlockDataSet* output,
int& blockNo
@ -346,7 +346,7 @@ void Foam::vtkPV4Foam::convertMeshCellSets
if (debug)
{
Info<< "<beg> Foam::vtkPV4Foam::convertMeshCellSets" << endl;
Info<< "<beg> Foam::vtkPVFoam::convertMeshCellSets" << endl;
printMemory();
}
@ -406,13 +406,13 @@ void Foam::vtkPV4Foam::convertMeshCellSets
if (debug)
{
Info<< "<end> Foam::vtkPV4Foam::convertMeshCellSets" << endl;
Info<< "<end> Foam::vtkPVFoam::convertMeshCellSets" << endl;
printMemory();
}
}
void Foam::vtkPV4Foam::convertMeshFaceZones
void Foam::vtkPVFoam::convertMeshFaceZones
(
vtkMultiBlockDataSet* output,
int& blockNo
@ -430,7 +430,7 @@ void Foam::vtkPV4Foam::convertMeshFaceZones
if (debug)
{
Info<< "<beg> Foam::vtkPV4Foam::convertMeshFaceZones" << endl;
Info<< "<beg> Foam::vtkPVFoam::convertMeshFaceZones" << endl;
printMemory();
}
@ -470,13 +470,13 @@ void Foam::vtkPV4Foam::convertMeshFaceZones
if (debug)
{
Info<< "<end> Foam::vtkPV4Foam::convertMeshFaceZones" << endl;
Info<< "<end> Foam::vtkPVFoam::convertMeshFaceZones" << endl;
printMemory();
}
}
void Foam::vtkPV4Foam::convertMeshFaceSets
void Foam::vtkPVFoam::convertMeshFaceSets
(
vtkMultiBlockDataSet* output,
int& blockNo
@ -489,7 +489,7 @@ void Foam::vtkPV4Foam::convertMeshFaceSets
if (debug)
{
Info<< "<beg> Foam::vtkPV4Foam::convertMeshFaceSets" << endl;
Info<< "<beg> Foam::vtkPVFoam::convertMeshFaceSets" << endl;
printMemory();
}
@ -527,13 +527,13 @@ void Foam::vtkPV4Foam::convertMeshFaceSets
if (debug)
{
Info<< "<end> Foam::vtkPV4Foam::convertMeshFaceSets" << endl;
Info<< "<end> Foam::vtkPVFoam::convertMeshFaceSets" << endl;
printMemory();
}
}
void Foam::vtkPV4Foam::convertMeshPointZones
void Foam::vtkPVFoam::convertMeshPointZones
(
vtkMultiBlockDataSet* output,
int& blockNo
@ -546,7 +546,7 @@ void Foam::vtkPV4Foam::convertMeshPointZones
if (debug)
{
Info<< "<beg> Foam::vtkPV4Foam::convertMeshPointZones" << endl;
Info<< "<beg> Foam::vtkPVFoam::convertMeshPointZones" << endl;
printMemory();
}
@ -582,14 +582,14 @@ void Foam::vtkPV4Foam::convertMeshPointZones
if (debug)
{
Info<< "<end> Foam::vtkPV4Foam::convertMeshPointZones" << endl;
Info<< "<end> Foam::vtkPVFoam::convertMeshPointZones" << endl;
printMemory();
}
}
void Foam::vtkPV4Foam::convertMeshPointSets
void Foam::vtkPVFoam::convertMeshPointSets
(
vtkMultiBlockDataSet* output,
int& blockNo
@ -602,7 +602,7 @@ void Foam::vtkPV4Foam::convertMeshPointSets
if (debug)
{
Info<< "<beg> Foam::vtkPV4Foam::convertMeshPointSets" << endl;
Info<< "<beg> Foam::vtkPVFoam::convertMeshPointSets" << endl;
printMemory();
}
@ -640,7 +640,7 @@ void Foam::vtkPV4Foam::convertMeshPointSets
if (debug)
{
Info<< "<end> Foam::vtkPV4Foam::convertMeshPointSets" << endl;
Info<< "<end> Foam::vtkPVFoam::convertMeshPointSets" << endl;
printMemory();
}
}

10
applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/vtkPV4FoamMeshLagrangian.C → applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamMeshLagrangian.C
View File

@ -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
@ -23,7 +23,7 @@ License
\*---------------------------------------------------------------------------*/
#include "vtkPV4Foam.H"
#include "vtkPVFoam.H"
// OpenFOAM includes
#include "Cloud.H"
@ -39,7 +39,7 @@ License
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
vtkPolyData* Foam::vtkPV4Foam::lagrangianVTKMesh
vtkPolyData* Foam::vtkPVFoam::lagrangianVTKMesh
(
const fvMesh& mesh,
const word& cloudName
@ -49,7 +49,7 @@ vtkPolyData* Foam::vtkPV4Foam::lagrangianVTKMesh
if (debug)
{
Info<< "<beg> Foam::vtkPV4Foam::lagrangianVTKMesh - timePath "
Info<< "<beg> Foam::vtkPVFoam::lagrangianVTKMesh - timePath "
<< mesh.time().timePath()/cloud::prefix/cloudName << endl;
printMemory();
}
@ -98,7 +98,7 @@ vtkPolyData* Foam::vtkPV4Foam::lagrangianVTKMesh
if (debug)
{
Info<< "<end> Foam::vtkPV4Foam::lagrangianVTKMesh" << endl;
Info<< "<end> Foam::vtkPVFoam::lagrangianVTKMesh" << endl;
printMemory();
}

16
applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/vtkPV4FoamMeshSet.C → applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamMeshSet.C
View File

@ -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
@ -23,7 +23,7 @@ License
\*---------------------------------------------------------------------------*/
#include "vtkPV4Foam.H"
#include "vtkPVFoam.H"
// OpenFOAM includes
#include "faceSet.H"
@ -37,7 +37,7 @@ License
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
vtkPolyData* Foam::vtkPV4Foam::faceSetVTKMesh
vtkPolyData* Foam::vtkPVFoam::faceSetVTKMesh
(
const fvMesh& mesh,
const faceSet& fSet
@ -47,7 +47,7 @@ vtkPolyData* Foam::vtkPV4Foam::faceSetVTKMesh
if (debug)
{
Info<< "<beg> Foam::vtkPV4Foam::faceSetVTKMesh" << endl;
Info<< "<beg> Foam::vtkPVFoam::faceSetVTKMesh" << endl;
printMemory();
}
@ -100,7 +100,7 @@ vtkPolyData* Foam::vtkPV4Foam::faceSetVTKMesh
if (debug)
{
Info<< "<end> Foam::vtkPV4Foam::faceSetVTKMesh" << endl;
Info<< "<end> Foam::vtkPVFoam::faceSetVTKMesh" << endl;
printMemory();
}
@ -108,7 +108,7 @@ vtkPolyData* Foam::vtkPV4Foam::faceSetVTKMesh
}
vtkPolyData* Foam::vtkPV4Foam::pointSetVTKMesh
vtkPolyData* Foam::vtkPVFoam::pointSetVTKMesh
(
const fvMesh& mesh,
const pointSet& pSet
@ -118,7 +118,7 @@ vtkPolyData* Foam::vtkPV4Foam::pointSetVTKMesh
if (debug)
{
Info<< "<beg> Foam::vtkPV4Foam::pointSetVTKMesh" << endl;
Info<< "<beg> Foam::vtkPVFoam::pointSetVTKMesh" << endl;
printMemory();
}
@ -137,7 +137,7 @@ vtkPolyData* Foam::vtkPV4Foam::pointSetVTKMesh
if (debug)
{
Info<< "<end> Foam::vtkPV4Foam::pointSetVTKMesh" << endl;
Info<< "<end> Foam::vtkPVFoam::pointSetVTKMesh" << endl;
printMemory();
}

10
applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/vtkPV4FoamMeshVolume.C → applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamMeshVolume.C
View File

@ -23,8 +23,8 @@ License
\*---------------------------------------------------------------------------*/
#include "vtkPV4Foam.H"
#include "vtkPV4FoamReader.h"
#include "vtkPVFoam.H"
#include "vtkPVFoamReader.h"
// OpenFOAM includes
#include "fvMesh.H"
@ -39,7 +39,7 @@ License
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
vtkUnstructuredGrid* Foam::vtkPV4Foam::volumeVTKMesh
vtkUnstructuredGrid* Foam::vtkPVFoam::volumeVTKMesh
(
const fvMesh& mesh,
polyDecomp& decompInfo
@ -56,7 +56,7 @@ vtkUnstructuredGrid* Foam::vtkPV4Foam::volumeVTKMesh
if (debug)
{
Info<< "<beg> Foam::vtkPV4Foam::volumeVTKMesh" << endl;
Info<< "<beg> Foam::vtkPVFoam::volumeVTKMesh" << endl;
printMemory();
}
@ -469,7 +469,7 @@ vtkUnstructuredGrid* Foam::vtkPV4Foam::volumeVTKMesh
if (debug)
{
Info<< "<end> Foam::vtkPV4Foam::volumeVTKMesh" << endl;
Info<< "<end> Foam::vtkPVFoam::volumeVTKMesh" << endl;
printMemory();
}

10
applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/vtkPV4FoamMeshZone.C → applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamMeshZone.C
View File

@ -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
@ -23,7 +23,7 @@ License
\*---------------------------------------------------------------------------*/
#include "vtkPV4Foam.H"
#include "vtkPVFoam.H"
// OpenFOAM includes
#include "vtkOpenFOAMPoints.H"
@ -35,7 +35,7 @@ License
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
vtkPolyData* Foam::vtkPV4Foam::pointZoneVTKMesh
vtkPolyData* Foam::vtkPVFoam::pointZoneVTKMesh
(
const fvMesh& mesh,
const labelList& pointLabels
@ -45,7 +45,7 @@ vtkPolyData* Foam::vtkPV4Foam::pointZoneVTKMesh
if (debug)
{
Info<< "<beg> Foam::vtkPV4Foam::pointZoneVTKMesh" << endl;
Info<< "<beg> Foam::vtkPVFoam::pointZoneVTKMesh" << endl;
printMemory();
}
@ -64,7 +64,7 @@ vtkPolyData* Foam::vtkPV4Foam::pointZoneVTKMesh
if (debug)
{
Info<< "<beg> Foam::vtkPV4Foam::pointZoneVTKMesh" << endl;
Info<< "<beg> Foam::vtkPVFoam::pointZoneVTKMesh" << endl;
printMemory();
}

12
applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/vtkPV4FoamPatchField.H → applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamPatchField.H
View File

@ -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,12 +22,12 @@ License
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
InClass
vtkPV4Foam
vtkPVFoam
\*---------------------------------------------------------------------------*/
#ifndef vtkPV4FoamPatchField_H
#define vtkPV4FoamPatchField_H
#ifndef vtkPVFoamPatchField_H
#define vtkPVFoamPatchField_H
// VTK includes
#include "vtkCellData.h"
@ -41,7 +41,7 @@ InClass
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
template<class Type>
void Foam::vtkPV4Foam::convertPatchField
void Foam::vtkPVFoam::convertPatchField
(
const word& name,
const Field<Type>& ptf,
@ -83,7 +83,7 @@ void Foam::vtkPV4Foam::convertPatchField
// as above, but with PointData()
template<class Type>
void Foam::vtkPV4Foam::convertPatchPointField
void Foam::vtkPVFoam::convertPatchPointField
(
const word& name,
const Field<Type>& pptf,

16
applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/vtkPV4FoamPointFields.H → applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamPointFields.H
View File

@ -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,12 +22,12 @@ License
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
InClass
vtkPV4Foam
vtkPVFoam
\*---------------------------------------------------------------------------*/
#ifndef vtkPV4FoamPointFields_H
#define vtkPV4FoamPointFields_H
#ifndef vtkPVFoamPointFields_H
#define vtkPVFoamPointFields_H
// OpenFOAM includes
#include "interpolatePointToCell.H"
@ -37,7 +37,7 @@ InClass
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
template<class Type>
void Foam::vtkPV4Foam::convertPointFields
void Foam::vtkPVFoam::convertPointFields
(
const fvMesh& mesh,
const pointMesh& pMesh,
@ -62,7 +62,7 @@ void Foam::vtkPV4Foam::convertPointFields
if (debug)
{
Info<< "Foam::vtkPV4Foam::convertPointFields : "
Info<< "Foam::vtkPVFoam::convertPointFields : "
<< fieldName << endl;
}
@ -170,7 +170,7 @@ void Foam::vtkPV4Foam::convertPointFields
template<class Type>
void Foam::vtkPV4Foam::convertPointFieldBlock
void Foam::vtkPVFoam::convertPointFieldBlock
(
const GeometricField<Type, pointPatchField, pointMesh>& ptf,
vtkMultiBlockDataSet* output,
@ -199,7 +199,7 @@ void Foam::vtkPV4Foam::convertPointFieldBlock
template<class Type>
void Foam::vtkPV4Foam::convertPointField
void Foam::vtkPVFoam::convertPointField
(
const GeometricField<Type, pointPatchField, pointMesh>& ptf,
const GeometricField<Type, fvPatchField, volMesh>& tf,

10
applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/vtkPV4FoamTemplates.C → applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamTemplates.C
View File

@ -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
@ -23,7 +23,7 @@ License
\*---------------------------------------------------------------------------*/
#include "vtkPV4Foam.H"
#include "vtkPVFoam.H"
// OpenFOAM includes
#include "polyPatch.H"
@ -38,7 +38,7 @@ License
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
template<class PatchType>
vtkPolyData* Foam::vtkPV4Foam::patchVTKMesh
vtkPolyData* Foam::vtkPVFoam::patchVTKMesh
(
const word& name,
const PatchType& p
@ -48,7 +48,7 @@ vtkPolyData* Foam::vtkPV4Foam::patchVTKMesh
if (debug)
{
Info<< "<beg> Foam::vtkPV4Foam::patchVTKMesh - " << name << endl;
Info<< "<beg> Foam::vtkPVFoam::patchVTKMesh - " << name << endl;
printMemory();
}
@ -88,7 +88,7 @@ vtkPolyData* Foam::vtkPV4Foam::patchVTKMesh
if (debug)
{
Info<< "<end> Foam::vtkPV4Foam::patchVTKMesh - " << name << endl;
Info<< "<end> Foam::vtkPVFoam::patchVTKMesh - " << name << endl;
printMemory();
}

50
applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/vtkPV4FoamUpdateInfo.C → applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamUpdateInfo.C
View File

@ -23,7 +23,7 @@ License
\*---------------------------------------------------------------------------*/
#include "vtkPV4Foam.H"
#include "vtkPVFoam.H"
// OpenFOAM includes
#include "cellSet.H"
@ -34,11 +34,11 @@ License
#include "polyBoundaryMeshEntries.H"
#include "entry.H"
#include "Cloud.H"
#include "vtkPV4FoamReader.h"
#include "vtkPVFoamReader.h"
// local headers
#include "vtkPV4FoamAddToSelection.H"
#include "vtkPV4FoamUpdateInfoFields.H"
#include "vtkPVFoamAddToSelection.H"
#include "vtkPVFoamUpdateInfoFields.H"
// VTK includes
#include "vtkDataArraySelection.h"
@ -82,7 +82,7 @@ public:
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
template<class ZoneType>
Foam::wordList Foam::vtkPV4Foam::getZoneNames
Foam::wordList Foam::vtkPVFoam::getZoneNames
(
const ZoneMesh<ZoneType, polyMesh>& zmesh
) const
@ -103,7 +103,7 @@ Foam::wordList Foam::vtkPV4Foam::getZoneNames
}
Foam::wordList Foam::vtkPV4Foam::getZoneNames(const word& zoneType) const
Foam::wordList Foam::vtkPVFoam::getZoneNames(const word& zoneType) const
{
wordList names;
@ -139,14 +139,14 @@ Foam::wordList Foam::vtkPV4Foam::getZoneNames(const word& zoneType) const
}
void Foam::vtkPV4Foam::updateInfoInternalMesh
void Foam::vtkPVFoam::updateInfoInternalMesh
(
vtkDataArraySelection* arraySelection
)
{
if (debug)
{
Info<< "<beg> Foam::vtkPV4Foam::updateInfoInternalMesh" << endl;
Info<< "<beg> Foam::vtkPVFoam::updateInfoInternalMesh" << endl;
}
// Determine mesh parts (internalMesh, patches...)
@ -163,19 +163,19 @@ void Foam::vtkPV4Foam::updateInfoInternalMesh
// just for debug info
getSelectedArrayEntries(arraySelection);
Info<< "<end> Foam::vtkPV4Foam::updateInfoInternalMesh" << endl;
Info<< "<end> Foam::vtkPVFoam::updateInfoInternalMesh" << endl;
}
}
void Foam::vtkPV4Foam::updateInfoLagrangian
void Foam::vtkPVFoam::updateInfoLagrangian
(
vtkDataArraySelection* arraySelection
)
{
if (debug)
{
Info<< "<beg> Foam::vtkPV4Foam::updateInfoLagrangian" << nl
Info<< "<beg> Foam::vtkPVFoam::updateInfoLagrangian" << nl
<< " " << dbPtr_->timePath()/cloud::prefix << endl;
}
@ -214,12 +214,12 @@ void Foam::vtkPV4Foam::updateInfoLagrangian
// just for debug info
getSelectedArrayEntries(arraySelection);
Info<< "<end> Foam::vtkPV4Foam::updateInfoLagrangian" << endl;
Info<< "<end> Foam::vtkPVFoam::updateInfoLagrangian" << endl;
}
}
void Foam::vtkPV4Foam::updateInfoPatches
void Foam::vtkPVFoam::updateInfoPatches
(
vtkDataArraySelection* arraySelection,
stringList& enabledEntries
@ -227,7 +227,7 @@ void Foam::vtkPV4Foam::updateInfoPatches
{
if (debug)
{
Info<< "<beg> Foam::vtkPV4Foam::updateInfoPatches"
Info<< "<beg> Foam::vtkPVFoam::updateInfoPatches"
<< " [meshPtr=" << (meshPtr_ ? "set" : "NULL") << "]" << endl;
}
@ -458,12 +458,12 @@ void Foam::vtkPV4Foam::updateInfoPatches
// just for debug info
getSelectedArrayEntries(arraySelection);
Info<< "<end> Foam::vtkPV4Foam::updateInfoPatches" << endl;
Info<< "<end> Foam::vtkPVFoam::updateInfoPatches" << endl;
}
}
void Foam::vtkPV4Foam::updateInfoZones
void Foam::vtkPVFoam::updateInfoZones
(
vtkDataArraySelection* arraySelection
)
@ -475,7 +475,7 @@ void Foam::vtkPV4Foam::updateInfoZones
if (debug)
{
Info<< "<beg> Foam::vtkPV4Foam::updateInfoZones"
Info<< "<beg> Foam::vtkPVFoam::updateInfoZones"
<< " [meshPtr=" << (meshPtr_ ? "set" : "NULL") << "]" << endl;
}
@ -554,12 +554,12 @@ void Foam::vtkPV4Foam::updateInfoZones
// just for debug info
getSelectedArrayEntries(arraySelection);
Info<< "<end> Foam::vtkPV4Foam::updateInfoZones" << endl;
Info<< "<end> Foam::vtkPVFoam::updateInfoZones" << endl;
}
}
void Foam::vtkPV4Foam::updateInfoSets
void Foam::vtkPVFoam::updateInfoSets
(
vtkDataArraySelection* arraySelection
)
@ -571,7 +571,7 @@ void Foam::vtkPV4Foam::updateInfoSets
if (debug)
{
Info<< "<beg> Foam::vtkPV4Foam::updateInfoSets" << endl;
Info<< "<beg> Foam::vtkPVFoam::updateInfoSets" << endl;
}
// Add names of sets. Search for last time directory with a sets
@ -596,7 +596,7 @@ void Foam::vtkPV4Foam::updateInfoSets
if (debug)
{
Info<< " Foam::vtkPV4Foam::updateInfoSets read "
Info<< " Foam::vtkPVFoam::updateInfoSets read "
<< objects.names() << " from " << setsInstance << endl;
}
@ -630,16 +630,16 @@ void Foam::vtkPV4Foam::updateInfoSets
// just for debug info
getSelectedArrayEntries(arraySelection);
Info<< "<end> Foam::vtkPV4Foam::updateInfoSets" << endl;
Info<< "<end> Foam::vtkPVFoam::updateInfoSets" << endl;
}
}
void Foam::vtkPV4Foam::updateInfoLagrangianFields()
void Foam::vtkPVFoam::updateInfoLagrangianFields()
{
if (debug)
{
Info<< "<beg> Foam::vtkPV4Foam::updateInfoLagrangianFields"
Info<< "<beg> Foam::vtkPVFoam::updateInfoLagrangianFields"
<< endl;
}
@ -715,7 +715,7 @@ void Foam::vtkPV4Foam::updateInfoLagrangianFields()
if (debug)
{
Info<< "<end> Foam::vtkPV4Foam::updateInfoLagrangianFields - "
Info<< "<end> Foam::vtkPVFoam::updateInfoLagrangianFields - "
<< "lagrangian objects.size() = " << objects.size() << endl;
}
}

12
applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/vtkPV4FoamUpdateInfoFields.H → applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamUpdateInfoFields.H
View File

@ -22,24 +22,24 @@ License
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
InClass
vtkPV4Foam
vtkPVFoam
\*---------------------------------------------------------------------------*/
#ifndef vtkPV4FoamUpdateInfoFields_H
#define vtkPV4FoamUpdateInfoFields_H
#ifndef vtkPVFoamUpdateInfoFields_H
#define vtkPVFoamUpdateInfoFields_H
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
template<template<class> class patchType, class meshType>
void Foam::vtkPV4Foam::updateInfoFields
void Foam::vtkPVFoam::updateInfoFields
(
vtkDataArraySelection* select
)
{
if (debug)
{
Info<< "<beg> Foam::vtkPV4Foam::updateInfoFields <"
Info<< "<beg> Foam::vtkPVFoam::updateInfoFields <"
<< meshType::Mesh::typeName
<< "> [meshPtr=" << (meshPtr_ ? "set" : "NULL") << "]"
<< endl;
@ -104,7 +104,7 @@ void Foam::vtkPV4Foam::updateInfoFields
if (debug)
{
Info<< "<end> Foam::vtkPV4Foam::updateInfoFields" << endl;
Info<< "<end> Foam::vtkPVFoam::updateInfoFields" << endl;
}
}

26
applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/vtkPV4FoamUtils.C → applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamUtils.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -26,8 +26,8 @@ Description
\*---------------------------------------------------------------------------*/
#include "vtkPV4Foam.H"
#include "vtkPV4FoamReader.h"
#include "vtkPVFoam.H"
#include "vtkPVFoamReader.h"
// OpenFOAM includes
#include "fvMesh.H"
@ -72,7 +72,7 @@ namespace Foam
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
void Foam::vtkPV4Foam::AddToBlock
void Foam::vtkPVFoam::AddToBlock
(
vtkMultiBlockDataSet* output,
vtkDataSet* dataset,
@ -132,7 +132,7 @@ void Foam::vtkPV4Foam::AddToBlock
}
vtkDataSet* Foam::vtkPV4Foam::GetDataSetFromBlock
vtkDataSet* Foam::vtkPVFoam::GetDataSetFromBlock
(
vtkMultiBlockDataSet* output,
const arrayRange& range,
@ -154,7 +154,7 @@ vtkDataSet* Foam::vtkPV4Foam::GetDataSetFromBlock
// ununsed at the moment
Foam::label Foam::vtkPV4Foam::GetNumberOfDataSets
Foam::label Foam::vtkPVFoam::GetNumberOfDataSets
(
vtkMultiBlockDataSet* output,
const arrayRange& range
@ -173,13 +173,13 @@ Foam::label Foam::vtkPV4Foam::GetNumberOfDataSets
}
Foam::word Foam::vtkPV4Foam::getPartName(const int partId)
Foam::word Foam::vtkPVFoam::getPartName(const int partId)
{
return getFirstWord(reader_->GetPartArrayName(partId));
}
Foam::wordHashSet Foam::vtkPV4Foam::getSelected
Foam::wordHashSet Foam::vtkPVFoam::getSelected
(
vtkDataArraySelection* select
)
@ -199,7 +199,7 @@ Foam::wordHashSet Foam::vtkPV4Foam::getSelected
}
Foam::wordHashSet Foam::vtkPV4Foam::getSelected
Foam::wordHashSet Foam::vtkPVFoam::getSelected
(
vtkDataArraySelection* select,
const arrayRange& range
@ -220,7 +220,7 @@ Foam::wordHashSet Foam::vtkPV4Foam::getSelected
}
Foam::stringList Foam::vtkPV4Foam::getSelectedArrayEntries
Foam::stringList Foam::vtkPVFoam::getSelectedArrayEntries
(
vtkDataArraySelection* select
)
@ -259,7 +259,7 @@ Foam::stringList Foam::vtkPV4Foam::getSelectedArrayEntries
}
Foam::stringList Foam::vtkPV4Foam::getSelectedArrayEntries
Foam::stringList Foam::vtkPVFoam::getSelectedArrayEntries
(
vtkDataArraySelection* select,
const arrayRange& range
@ -298,7 +298,7 @@ Foam::stringList Foam::vtkPV4Foam::getSelectedArrayEntries
}
void Foam::vtkPV4Foam::setSelectedArrayEntries
void Foam::vtkPVFoam::setSelectedArrayEntries
(
vtkDataArraySelection* select,
const stringList& selections
@ -326,7 +326,7 @@ void Foam::vtkPV4Foam::setSelectedArrayEntries
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
void Foam::vtkPV4Foam::printMemory()
void Foam::vtkPVFoam::printMemory()
{
memInfo mem;

16
applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/vtkPV4FoamVolFields.H → applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamVolFields.H
View File

@ -22,12 +22,12 @@ License
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
InClass
vtkPV4Foam
vtkPVFoam
\*---------------------------------------------------------------------------*/
#ifndef vtkPV4FoamVolFields_H
#define vtkPV4FoamVolFields_H
#ifndef vtkPVFoamVolFields_H
#define vtkPVFoamVolFields_H
// OpenFOAM includes
#include "emptyFvPatchField.H"
@ -35,15 +35,15 @@ InClass
#include "faceSet.H"
#include "volPointInterpolation.H"
#include "vtkPV4FoamFaceField.H"
#include "vtkPV4FoamPatchField.H"
#include "vtkPVFoamFaceField.H"
#include "vtkPVFoamPatchField.H"
#include "vtkOpenFOAMTupleRemap.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
template<class Type>
void Foam::vtkPV4Foam::convertVolFields
void Foam::vtkPVFoam::convertVolFields
(
const fvMesh& mesh,
const PtrList<PrimitivePatchInterpolation<primitivePatch>>& ppInterpList,
@ -281,7 +281,7 @@ void Foam::vtkPV4Foam::convertVolFields
template<class Type>
void Foam::vtkPV4Foam::convertVolFieldBlock
void Foam::vtkPVFoam::convertVolFieldBlock
(
const GeometricField<Type, fvPatchField, volMesh>& tf,
autoPtr<GeometricField<Type, pointPatchField, pointMesh>>& ptfPtr,
@ -323,7 +323,7 @@ void Foam::vtkPV4Foam::convertVolFieldBlock
template<class Type>
void Foam::vtkPV4Foam::convertVolField
void Foam::vtkPVFoam::convertVolField
(
const GeometricField<Type, fvPatchField, volMesh>& tf,
vtkMultiBlockDataSet* output,

6
applications/utilities/postProcessing/graphics/PV4Readers/PV4blockMeshReader/Allwclean → applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/Allwclean
View File

@ -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/libPV4blockMeshReader* 2>/dev/null
rm -f $FOAM_LIBBIN/libPVblockMeshReader* 2>/dev/null
rm -rf PV4blockMeshReader/Make
wclean libso vtkPV4blockMesh
rm -rf PVblockMeshReader/Make
wclean libso vtkPVblockMesh
# ----------------------------------------------------------------- end-of-file

4
applications/utilities/postProcessing/graphics/PV4Readers/PV4blockMeshReader/Allwmake → applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/Allwmake
View File

@ -4,9 +4,9 @@ set -x
if [ -d "$ParaView_DIR" -a -r "$ParaView_DIR" ]
then
wmake libso vtkPV4blockMesh
wmake libso vtkPVblockMesh
(
cd PV4blockMeshReader
cd PVblockMeshReader
mkdir -p Make/$WM_OPTIONS > /dev/null 2>&1
cd Make/$WM_OPTIONS
cmake ../..

20
applications/utilities/postProcessing/graphics/PV4Readers/PV4blockMeshReader/PV4blockMeshReader/CMakeLists.txt → applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/PVblockMeshReader/CMakeLists.txt
View File

@ -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/meshing/blockMesh/lnInclude
${PROJECT_SOURCE_DIR}/../vtkPV4blockMesh
${PROJECT_SOURCE_DIR}/../vtkPVblockMesh
)
ADD_DEFINITIONS(
@ -42,11 +42,11 @@ SET(
#
# Extend the auto-generated panel
QT4_WRAP_CPP(MOC_SRCS pqPV4blockMeshReaderPanel.h)
QT4_WRAP_CPP(MOC_SRCS pqPVblockMeshReaderPanel.h)
ADD_PARAVIEW_OBJECT_PANEL(IFACES IFACE_SRCS
CLASS_NAME pqPV4blockMeshReaderPanel
XML_NAME PV4blockMeshReader # name of SourceProxy in *SM.xml
CLASS_NAME pqPVblockMeshReaderPanel
XML_NAME PVblockMeshReader # name of SourceProxy in *SM.xml
XML_GROUP sources
)
@ -54,19 +54,19 @@ IF("${PARAVIEW_VERSION_MINOR}" EQUAL 0)
ADD_PARAVIEW_PLUGIN(
PVblockMeshReader_SM "1.0"
SERVER_MANAGER_XML PVblockMeshReader_SM.xml
SERVER_MANAGER_SOURCES vtkPV4blockMeshReader.cxx
SERVER_MANAGER_SOURCES vtkPVblockMeshReader.cxx
GUI_INTERFACES ${IFACES}
GUI_SOURCES pqPV4blockMeshReaderPanel.cxx
GUI_SOURCES pqPVblockMeshReaderPanel.cxx
${MOC_SRCS} ${UI_SRCS} ${IFACE_SRCS}
GUI_RESOURCE_FILES PV4blockMeshReader.xml
GUI_RESOURCE_FILES PVblockMeshReader.xml
)
ELSE("${PARAVIEW_VERSION_MINOR}" EQUAL 0)
ADD_PARAVIEW_PLUGIN(
PVblockMeshReader_SM "1.0"
SERVER_MANAGER_XML PVblockMeshReader_SM.xml
SERVER_MANAGER_SOURCES vtkPV4blockMeshReader.cxx
SERVER_MANAGER_SOURCES vtkPVblockMeshReader.cxx
GUI_INTERFACES ${IFACES}
GUI_SOURCES pqPV4blockMeshReaderPanel.cxx
GUI_SOURCES pqPVblockMeshReaderPanel.cxx
${MOC_SRCS} ${UI_SRCS} ${IFACE_SRCS}
)
ENDIF("${PARAVIEW_VERSION_MINOR}" EQUAL 0)
@ -78,7 +78,7 @@ TARGET_LINK_LIBRARIES(
LINK_PUBLIC
OpenFOAM
blockMesh
vtkPV4blockMesh
vtkPVblockMesh
)
#-----------------------------------------------------------------------------

2
applications/utilities/postProcessing/graphics/PV4Readers/PV4blockMeshReader/PV4blockMeshReader/PV4blockMeshReader.qrc → applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/PVblockMeshReader/PVblockMeshReader.qrc
View File

@ -1,5 +1,5 @@
<RCC>
<qresource prefix="/ParaViewResources" >
<file>PV4blockMeshReader.xml</file>
<file>PVblockMeshReader.xml</file>
</qresource>
</RCC>

2
applications/utilities/postProcessing/graphics/PV4Readers/PV4blockMeshReader/PV4blockMeshReader/PV4blockMeshReader.xml → applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/PVblockMeshReader/PVblockMeshReader.xml
View File

@ -1,5 +1,5 @@
<ParaViewReaders>
<Reader name="PV4blockMeshReader"
<Reader name="PVblockMeshReader"
extensions="blockMesh"
file_description="OpenFOAM blockMesh reader">
</Reader>

4
applications/utilities/postProcessing/graphics/PV4Readers/PV4blockMeshReader/PV4blockMeshReader/PVblockMeshReader_SM.xml → applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/PVblockMeshReader/PVblockMeshReader_SM.xml
View File

@ -1,8 +1,8 @@
<ServerManagerConfiguration>
<ProxyGroup name="sources">
<SourceProxy
name="PV4blockMeshReader"
class="vtkPV4blockMeshReader">
name="PVblockMeshReader"
class="vtkPVblockMeshReader">
<!-- File name - compulsory -->
<StringVectorProperty

8
applications/utilities/postProcessing/graphics/PV4Readers/PV4blockMeshReader/PV4blockMeshReader/pqPV4blockMeshReaderPanel.cxx → applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/PVblockMeshReader/pqPVblockMeshReaderPanel.cxx
View File

@ -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
@ -23,7 +23,7 @@ License
\*---------------------------------------------------------------------------*/
#include "pqPV4blockMeshReaderPanel.h"
#include "pqPVblockMeshReaderPanel.h"
// QT
#include <QGridLayout>
@ -50,7 +50,7 @@ License
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
pqPV4blockMeshReaderPanel::pqPV4blockMeshReaderPanel
pqPVblockMeshReaderPanel::pqPVblockMeshReaderPanel
(
pqProxy *proxy,
QWidget *p
@ -90,7 +90,7 @@ pqPV4blockMeshReaderPanel::pqPV4blockMeshReaderPanel
// * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * * //
void pqPV4blockMeshReaderPanel::ShowPointNumbersToggled()
void pqPVblockMeshReaderPanel::ShowPointNumbersToggled()
{
vtkSMIntVectorProperty::SafeDownCast
(

20
applications/utilities/postProcessing/graphics/PV4Readers/PV4blockMeshReader/PV4blockMeshReader/pqPV4blockMeshReaderPanel.h → applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/PVblockMeshReader/pqPVblockMeshReaderPanel.h
View File

@ -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 <http://www.gnu.org/licenses/>.
Class
pqPV4blockMeshReaderPanel
pqPVblockMeshReaderPanel
Description
GUI modifications for the ParaView reader panel
A custom panel for the PV4blockMeshReader.
A custom panel for the PVblockMeshReader.
SourceFiles
pqPV4blockMeshReaderPanel.cxx
pqPVblockMeshReaderPanel.cxx
\*---------------------------------------------------------------------------*/
#ifndef pqPV4blockMeshReaderPanel_h
#define pqPV4blockMeshReaderPanel_h
#ifndef pqPVblockMeshReaderPanel_h
#define pqPVblockMeshReaderPanel_h
#include "pqAutoGeneratedObjectPanel.h"
@ -50,10 +50,10 @@ class vtkSMSourceProxy;
/*---------------------------------------------------------------------------*\
Class pqPV4blockMeshReaderPanel Declaration
Class pqPVblockMeshReaderPanel Declaration
\*---------------------------------------------------------------------------*/
class pqPV4blockMeshReaderPanel
class pqPVblockMeshReaderPanel
:
public pqAutoGeneratedObjectPanel
{
@ -74,11 +74,11 @@ public:
// Constructors
//- Construct from components
pqPV4blockMeshReaderPanel(pqProxy*, QWidget*);
pqPVblockMeshReaderPanel(pqProxy*, QWidget*);
//- Destructor
// virtual ~pqPV4blockMeshReaderPanel();
// virtual ~pqPVblockMeshReaderPanel();
};

60
applications/utilities/postProcessing/graphics/PV4Readers/PV4blockMeshReader/PV4blockMeshReader/vtkPV4blockMeshReader.cxx → applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/PVblockMeshReader/vtkPVblockMeshReader.cxx
View File

@ -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 <http://www.gnu.org/licenses/>.
\*---------------------------------------------------------------------------*/
#include "vtkPV4blockMeshReader.h"
#include "vtkPVblockMeshReader.h"
#include "pqApplicationCore.h"
#include "pqRenderView.h"
@ -40,16 +40,16 @@ License
#include "vtkStringArray.h"
// OpenFOAM includes
#include "vtkPV4blockMesh.H"
#include "vtkPVblockMesh.H"
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
vtkStandardNewMacro(vtkPV4blockMeshReader);
vtkStandardNewMacro(vtkPVblockMeshReader);
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
vtkPV4blockMeshReader::vtkPV4blockMeshReader()
vtkPVblockMeshReader::vtkPVblockMeshReader()
{
Debug = 0;
vtkDebugMacro(<<"Constructor");
@ -70,7 +70,7 @@ vtkPV4blockMeshReader::vtkPV4blockMeshReader()
SelectionObserver = vtkCallbackCommand::New();
SelectionObserver->SetCallback
(
&vtkPV4blockMeshReader::SelectionModifiedCallback
&vtkPVblockMeshReader::SelectionModifiedCallback
);
SelectionObserver->SetClientData(this);
@ -91,7 +91,7 @@ vtkPV4blockMeshReader::vtkPV4blockMeshReader()
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
vtkPV4blockMeshReader::~vtkPV4blockMeshReader()
vtkPVblockMeshReader::~vtkPVblockMeshReader()
{
vtkDebugMacro(<<"Deconstructor");
@ -118,7 +118,7 @@ vtkPV4blockMeshReader::~vtkPV4blockMeshReader()
// * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * * //
// Do everything except set the output info
int vtkPV4blockMeshReader::RequestInformation
int vtkPVblockMeshReader::RequestInformation
(
vtkInformation* vtkNotUsed(request),
vtkInformationVector** vtkNotUsed(inputVector),
@ -127,7 +127,7 @@ int vtkPV4blockMeshReader::RequestInformation
{
vtkDebugMacro(<<"RequestInformation");
if (Foam::vtkPV4blockMesh::debug)
if (Foam::vtkPVblockMesh::debug)
{
cout<<"REQUEST_INFORMATION\n";
}
@ -140,7 +140,7 @@ int vtkPV4blockMeshReader::RequestInformation
int nInfo = outputVector->GetNumberOfInformationObjects();
if (Foam::vtkPV4blockMesh::debug)
if (Foam::vtkPVblockMesh::debug)
{
cout<<"RequestInformation with " << nInfo << " item(s)\n";
for (int infoI = 0; infoI < nInfo; ++infoI)
@ -151,7 +151,7 @@ int vtkPV4blockMeshReader::RequestInformation
if (!foamData_)
{
foamData_ = new Foam::vtkPV4blockMesh(FileName, this);
foamData_ = new Foam::vtkPVblockMesh(FileName, this);
}
else
{
@ -175,7 +175,7 @@ int vtkPV4blockMeshReader::RequestInformation
// Set the output info
int vtkPV4blockMeshReader::RequestData
int vtkPVblockMeshReader::RequestData
(
vtkInformation* vtkNotUsed(request),
vtkInformationVector** vtkNotUsed(inputVector),
@ -199,7 +199,7 @@ int vtkPV4blockMeshReader::RequestData
int nInfo = outputVector->GetNumberOfInformationObjects();
if (Foam::vtkPV4blockMesh::debug)
if (Foam::vtkPVblockMesh::debug)
{
cout<<"RequestData with " << nInfo << " item(s)\n";
for (int infoI = 0; infoI < nInfo; ++infoI)
@ -216,7 +216,7 @@ int vtkPV4blockMeshReader::RequestData
)
);
if (Foam::vtkPV4blockMesh::debug)
if (Foam::vtkPVblockMesh::debug)
{
cout<< "update output with "
<< output->GetNumberOfBlocks() << " blocks\n";
@ -234,7 +234,7 @@ int vtkPV4blockMeshReader::RequestData
void vtkPV4blockMeshReader::SetShowPointNumbers(const int val)
void vtkPVblockMeshReader::SetShowPointNumbers(const int val)
{
if (ShowPointNumbers != val)
{
@ -244,7 +244,7 @@ void vtkPV4blockMeshReader::SetShowPointNumbers(const int val)
}
void vtkPV4blockMeshReader::updatePointNumbersView(const bool show)
void vtkPVblockMeshReader::updatePointNumbersView(const bool show)
{
pqApplicationCore* appCore = pqApplicationCore::instance();
@ -277,7 +277,7 @@ void vtkPV4blockMeshReader::updatePointNumbersView(const bool show)
}
void vtkPV4blockMeshReader::PrintSelf(ostream& os, vtkIndent indent)
void vtkPVblockMeshReader::PrintSelf(ostream& os, vtkIndent indent)
{
vtkDebugMacro(<<"PrintSelf");
@ -292,35 +292,35 @@ void vtkPV4blockMeshReader::PrintSelf(ostream& os, vtkIndent indent)
// ----------------------------------------------------------------------
// Block selection list control
vtkDataArraySelection* vtkPV4blockMeshReader::GetBlockSelection()
vtkDataArraySelection* vtkPVblockMeshReader::GetBlockSelection()
{
vtkDebugMacro(<<"GetBlockSelection");
return BlockSelection;
}
int vtkPV4blockMeshReader::GetNumberOfBlockArrays()
int vtkPVblockMeshReader::GetNumberOfBlockArrays()
{
vtkDebugMacro(<<"GetNumberOfBlockArrays");
return BlockSelection->GetNumberOfArrays();
}
const char* vtkPV4blockMeshReader::GetBlockArrayName(int index)
const char* vtkPVblockMeshReader::GetBlockArrayName(int index)
{
vtkDebugMacro(<<"GetBlockArrayName");
return BlockSelection->GetArrayName(index);
}
int vtkPV4blockMeshReader::GetBlockArrayStatus(const char* name)
int vtkPVblockMeshReader::GetBlockArrayStatus(const char* name)
{
vtkDebugMacro(<<"GetBlockArrayStatus");
return BlockSelection->ArrayIsEnabled(name);
}
void vtkPV4blockMeshReader::SetBlockArrayStatus
void vtkPVblockMeshReader::SetBlockArrayStatus
(
const char* name,
int status
@ -341,35 +341,35 @@ void vtkPV4blockMeshReader::SetBlockArrayStatus
// ----------------------------------------------------------------------
// CurvedEdges selection list control
vtkDataArraySelection* vtkPV4blockMeshReader::GetCurvedEdgesSelection()
vtkDataArraySelection* vtkPVblockMeshReader::GetCurvedEdgesSelection()
{
vtkDebugMacro(<<"GetCurvedEdgesSelection");
return CurvedEdgesSelection;
}
int vtkPV4blockMeshReader::GetNumberOfCurvedEdgesArrays()
int vtkPVblockMeshReader::GetNumberOfCurvedEdgesArrays()
{
vtkDebugMacro(<<"GetNumberOfCurvedEdgesArrays");
return CurvedEdgesSelection->GetNumberOfArrays();
}
const char* vtkPV4blockMeshReader::GetCurvedEdgesArrayName(int index)
const char* vtkPVblockMeshReader::GetCurvedEdgesArrayName(int index)
{
vtkDebugMacro(<<"GetCurvedEdgesArrayName");
return CurvedEdgesSelection->GetArrayName(index);
}
int vtkPV4blockMeshReader::GetCurvedEdgesArrayStatus(const char* name)
int vtkPVblockMeshReader::GetCurvedEdgesArrayStatus(const char* name)
{
vtkDebugMacro(<<"GetCurvedEdgesArrayStatus");
return CurvedEdgesSelection->ArrayIsEnabled(name);
}
void vtkPV4blockMeshReader::SetCurvedEdgesArrayStatus
void vtkPVblockMeshReader::SetCurvedEdgesArrayStatus
(
const char* name,
int status
@ -389,7 +389,7 @@ void vtkPV4blockMeshReader::SetCurvedEdgesArrayStatus
// ----------------------------------------------------------------------
void vtkPV4blockMeshReader::SelectionModifiedCallback
void vtkPVblockMeshReader::SelectionModifiedCallback
(
vtkObject*,
unsigned long,
@ -397,11 +397,11 @@ void vtkPV4blockMeshReader::SelectionModifiedCallback
void*
)
{
static_cast<vtkPV4blockMeshReader*>(clientdata)->Modified();
static_cast<vtkPVblockMeshReader*>(clientdata)->Modified();
}
int vtkPV4blockMeshReader::FillOutputPortInformation
int vtkPVblockMeshReader::FillOutputPortInformation
(
int port,
vtkInformation* info

32
applications/utilities/postProcessing/graphics/PV4Readers/PV4blockMeshReader/PV4blockMeshReader/vtkPV4blockMeshReader.h → applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/PVblockMeshReader/vtkPVblockMeshReader.h
View File

@ -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 <http://www.gnu.org/licenses/>.
Class
vtkPV4blockMeshReader
vtkPVblockMeshReader
Description
reads a dataset in OpenFOAM bockMesh format
vtkPV4blockMeshReader creates an multiblock dataset.
vtkPVblockMeshReader creates an multiblock dataset.
It uses the OpenFOAM infrastructure (blockMesh).
SourceFiles
vtkPV4blockMeshReader.cxx
vtkPVblockMeshReader.cxx
\*---------------------------------------------------------------------------*/
#ifndef vtkPV4blockMeshReader_h
#define vtkPV4blockMeshReader_h
#ifndef vtkPVblockMeshReader_h
#define vtkPVblockMeshReader_h
// VTK includes
#include "vtkMultiBlockDataSetAlgorithm.h"
@ -49,22 +49,22 @@ class vtkCallbackCommand;
namespace Foam
{
class vtkPV4blockMesh;
class vtkPVblockMesh;
}
/*---------------------------------------------------------------------------*\
Class vtkPV4blockMeshReader Declaration
Class vtkPVblockMeshReader Declaration
\*---------------------------------------------------------------------------*/
class vtkPV4blockMeshReader
class vtkPVblockMeshReader
:
public vtkMultiBlockDataSetAlgorithm
{
public:
vtkTypeMacro(vtkPV4blockMeshReader, vtkMultiBlockDataSetAlgorithm);
vtkTypeMacro(vtkPVblockMeshReader, vtkMultiBlockDataSetAlgorithm);
void PrintSelf(ostream&, vtkIndent);
static vtkPV4blockMeshReader* New();
static vtkPVblockMeshReader* New();
// Description:
// Set/Get the filename.
@ -113,10 +113,10 @@ public:
protected:
//- Construct null
vtkPV4blockMeshReader();
vtkPVblockMeshReader();
//- Destructor
~vtkPV4blockMeshReader();
~vtkPVblockMeshReader();
//- Return information about mesh, times, etc without loading anything
virtual int RequestInformation
@ -146,10 +146,10 @@ protected:
private:
//- Disallow default bitwise copy construct
vtkPV4blockMeshReader(const vtkPV4blockMeshReader&);
vtkPVblockMeshReader(const vtkPVblockMeshReader&);
//- Disallow default bitwise assignment
void operator=(const vtkPV4blockMeshReader&);
void operator=(const vtkPVblockMeshReader&);
//- Add/remove point numbers to/from the view
void updatePointNumbersView(const bool show);
@ -166,7 +166,7 @@ private:
vtkDataArraySelection* CurvedEdgesSelection;
//BTX
Foam::vtkPV4blockMesh* foamData_;
Foam::vtkPVblockMesh* foamData_;
//ETX
};

5
applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/vtkPVblockMesh/Make/files Normal file
View File

@ -0,0 +1,5 @@
vtkPVblockMesh.C
vtkPVblockMeshConvert.C
vtkPVblockMeshUtils.C
LIB = $(FOAM_LIBBIN)/libvtkPVblockMesh

6
applications/utilities/postProcessing/graphics/PV4Readers/PV4blockMeshReader/vtkPV4blockMesh/Make/options → applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/vtkPVblockMesh/Make/options
View File

@ -3,11 +3,11 @@ EXE_INC = \
-I$(LIB_SRC)/mesh/blockMesh/lnInclude \
-I$(ParaView_INCLUDE_DIR) \
-I$(ParaView_INCLUDE_DIR)/vtkkwiml \
-I../../vtkPV4Readers/lnInclude \
-I../PV4blockMeshReader
-I../../vtkPVReaders/lnInclude \
-I../PVblockMeshReader
LIB_LIBS = \
-lmeshTools \
-lblockMesh \
-L$(FOAM_LIBBIN) -lvtkPV4Readers \
-L$(FOAM_LIBBIN) -lvtkPVReaders \
$(GLIBS)

4
applications/utilities/postProcessing/graphics/PV4Readers/PV4blockMeshReader/vtkPV4blockMesh/vtkOpenFOAMPoints.H → applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/vtkPVblockMesh/vtkOpenFOAMPoints.H
View File

@ -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 <http://www.gnu.org/licenses/>.
InClass
vtkPV4blockMesh
vtkPVblockMesh
\*---------------------------------------------------------------------------*/

52
applications/utilities/postProcessing/graphics/PV4Readers/PV4blockMeshReader/vtkPV4blockMesh/vtkPV4blockMesh.C → applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/vtkPVblockMesh/vtkPVblockMesh.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -23,8 +23,8 @@ License
\*---------------------------------------------------------------------------*/
#include "vtkPV4blockMesh.H"
#include "vtkPV4blockMeshReader.h"
#include "vtkPVblockMesh.H"
#include "vtkPVblockMeshReader.h"
// OpenFOAM includes
#include "blockMesh.H"
@ -43,13 +43,13 @@ License
namespace Foam
{
defineTypeNameAndDebug(vtkPV4blockMesh, 0);
defineTypeNameAndDebug(vtkPVblockMesh, 0);
}
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
void Foam::vtkPV4blockMesh::resetCounters()
void Foam::vtkPVblockMesh::resetCounters()
{
// Reset mesh part ids and sizes
arrayRangeBlocks_.reset();
@ -58,14 +58,14 @@ void Foam::vtkPV4blockMesh::resetCounters()
}
void Foam::vtkPV4blockMesh::updateInfoBlocks
void Foam::vtkPVblockMesh::updateInfoBlocks
(
vtkDataArraySelection* arraySelection
)
{
if (debug)
{
Info<< "<beg> Foam::vtkPV4blockMesh::updateInfoBlocks"
Info<< "<beg> Foam::vtkPVblockMesh::updateInfoBlocks"
<< " [meshPtr=" << (meshPtr_ ? "set" : "NULL") << "]" << endl;
}
@ -96,19 +96,19 @@ void Foam::vtkPV4blockMesh::updateInfoBlocks
// just for debug info
getSelectedArrayEntries(arraySelection);
Info<< "<end> Foam::vtkPV4blockMesh::updateInfoBlocks" << endl;
Info<< "<end> Foam::vtkPVblockMesh::updateInfoBlocks" << endl;
}
}
void Foam::vtkPV4blockMesh::updateInfoEdges
void Foam::vtkPVblockMesh::updateInfoEdges
(
vtkDataArraySelection* arraySelection
)
{
if (debug)
{
Info<< "<beg> Foam::vtkPV4blockMesh::updateInfoEdges"
Info<< "<beg> Foam::vtkPVblockMesh::updateInfoEdges"
<< " [meshPtr=" << (meshPtr_ ? "set" : "NULL") << "]" << endl;
}
@ -136,17 +136,17 @@ void Foam::vtkPV4blockMesh::updateInfoEdges
// just for debug info
getSelectedArrayEntries(arraySelection);
Info<< "<end> Foam::vtkPV4blockMesh::updateInfoEdges" << endl;
Info<< "<end> Foam::vtkPVblockMesh::updateInfoEdges" << endl;
}
}
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
Foam::vtkPV4blockMesh::vtkPV4blockMesh
Foam::vtkPVblockMesh::vtkPVblockMesh
(
const char* const FileName,
vtkPV4blockMeshReader* reader
vtkPVblockMeshReader* reader
)
:
reader_(reader),
@ -160,7 +160,7 @@ Foam::vtkPV4blockMesh::vtkPV4blockMesh
{
if (debug)
{
Info<< "Foam::vtkPV4blockMesh::vtkPV4blockMesh - "
Info<< "Foam::vtkPVblockMesh::vtkPVblockMesh - "
<< FileName << endl;
}
@ -243,11 +243,11 @@ Foam::vtkPV4blockMesh::vtkPV4blockMesh
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
Foam::vtkPV4blockMesh::~vtkPV4blockMesh()
Foam::vtkPVblockMesh::~vtkPVblockMesh()
{
if (debug)
{
Info<< "<end> Foam::vtkPV4blockMesh::~vtkPV4blockMesh" << endl;
Info<< "<end> Foam::vtkPVblockMesh::~vtkPVblockMesh" << endl;
}
// Hmm. pointNumberTextActors are not getting removed
@ -264,11 +264,11 @@ Foam::vtkPV4blockMesh::~vtkPV4blockMesh()
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
void Foam::vtkPV4blockMesh::updateInfo()
void Foam::vtkPVblockMesh::updateInfo()
{
if (debug)
{
Info<< "<beg> Foam::vtkPV4blockMesh::updateInfo"
Info<< "<beg> Foam::vtkPVblockMesh::updateInfo"
<< " [meshPtr=" << (meshPtr_ ? "set" : "NULL") << "] " << endl;
}
@ -314,16 +314,16 @@ void Foam::vtkPV4blockMesh::updateInfo()
if (debug)
{
Info<< "<end> Foam::vtkPV4blockMesh::updateInfo" << endl;
Info<< "<end> Foam::vtkPVblockMesh::updateInfo" << endl;
}
}
void Foam::vtkPV4blockMesh::updateFoamMesh()
void Foam::vtkPVblockMesh::updateFoamMesh()
{
if (debug)
{
Info<< "<beg> Foam::vtkPV4blockMesh::updateFoamMesh" << endl;
Info<< "<beg> Foam::vtkPVblockMesh::updateFoamMesh" << endl;
}
// Check to see if the OpenFOAM mesh has been created
@ -370,12 +370,12 @@ void Foam::vtkPV4blockMesh::updateFoamMesh()
if (debug)
{
Info<< "<end> Foam::vtkPV4blockMesh::updateFoamMesh" << endl;
Info<< "<end> Foam::vtkPVblockMesh::updateFoamMesh" << endl;
}
}
void Foam::vtkPV4blockMesh::Update
void Foam::vtkPVblockMesh::Update
(
vtkMultiBlockDataSet* output
)
@ -406,13 +406,13 @@ void Foam::vtkPV4blockMesh::Update
}
void Foam::vtkPV4blockMesh::CleanUp()
void Foam::vtkPVblockMesh::CleanUp()
{
reader_->UpdateProgress(1.0);
}
void Foam::vtkPV4blockMesh::renderPointNumbers
void Foam::vtkPVblockMesh::renderPointNumbers
(
vtkRenderer* renderer,
const bool show
@ -471,7 +471,7 @@ void Foam::vtkPV4blockMesh::renderPointNumbers
void Foam::vtkPV4blockMesh::PrintSelf(ostream& os, vtkIndent indent) const
void Foam::vtkPVblockMesh::PrintSelf(ostream& os, vtkIndent indent) const
{
#if 0
os << indent << "Number of nodes: "

38
applications/utilities/postProcessing/graphics/PV4Readers/PV4blockMeshReader/vtkPV4blockMesh/vtkPV4blockMesh.H → applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/vtkPVblockMesh/vtkPVblockMesh.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -22,24 +22,24 @@ License
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
Class
Foam::vtkPV4blockMesh
Foam::vtkPVblockMesh
Description
Provides a reader interface for OpenFOAM blockMesh to VTK interaction
SourceFiles
vtkPV4blockMesh.C
vtkPV4blockMeshConvert.C
vtkPV4blockMeshUpdate.C
vtkPV4blockMeshUtils.C
vtkPVblockMesh.C
vtkPVblockMeshConvert.C
vtkPVblockMeshUpdate.C
vtkPVblockMeshUtils.C
// Needed by VTK:
vtkDataArrayTemplateImplicit.txx
\*---------------------------------------------------------------------------*/
#ifndef vtkPV4blockMesh_H
#define vtkPV4blockMesh_H
#ifndef vtkPVblockMesh_H
#define vtkPVblockMesh_H
// do not include legacy strstream headers
#ifndef VTK_EXCLUDE_STRSTREAM_HEADERS
@ -58,7 +58,7 @@ SourceFiles
class vtkDataArraySelection;
class vtkDataSet;
class vtkPoints;
class vtkPV4blockMeshReader;
class vtkPVblockMeshReader;
class vtkRenderer;
class vtkTextActor;
class vtkMultiBlockDataSet;
@ -79,10 +79,10 @@ class blockMesh;
template<class Type> class List;
/*---------------------------------------------------------------------------*\
Class vtkPV4blockMesh Declaration
Class vtkPVblockMesh Declaration
\*---------------------------------------------------------------------------*/
class vtkPV4blockMesh
class vtkPVblockMesh
{
// Private classes
@ -164,8 +164,8 @@ class vtkPV4blockMesh
// Private Data
//- Access to the controlling vtkPV4blockMeshReader
vtkPV4blockMeshReader* reader_;
//- Access to the controlling vtkPVblockMeshReader
vtkPVblockMeshReader* reader_;
//- OpenFOAM time control
autoPtr<Time> dbPtr_;
@ -294,31 +294,31 @@ class vtkPV4blockMesh
//- Disallow default bitwise copy construct
vtkPV4blockMesh(const vtkPV4blockMesh&);
vtkPVblockMesh(const vtkPVblockMesh&);
//- Disallow default bitwise assignment
void operator=(const vtkPV4blockMesh&);
void operator=(const vtkPVblockMesh&);
public:
//- Static data members
ClassName("vtkPV4blockMesh");
ClassName("vtkPVblockMesh");
// Constructors
//- Construct from components
vtkPV4blockMesh
vtkPVblockMesh
(
const char* const FileName,
vtkPV4blockMeshReader* reader
vtkPVblockMeshReader* reader
);
//- Destructor
~vtkPV4blockMesh();
~vtkPVblockMesh();
// Member Functions

22
applications/utilities/postProcessing/graphics/PV4Readers/PV4blockMeshReader/vtkPV4blockMesh/vtkPV4blockMeshConvert.C → applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/vtkPVblockMesh/vtkPVblockMeshConvert.C
View File

@ -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
@ -23,8 +23,8 @@ License
\*---------------------------------------------------------------------------*/
#include "vtkPV4blockMesh.H"
#include "vtkPV4blockMeshReader.h"
#include "vtkPVblockMesh.H"
#include "vtkPVblockMeshReader.h"
// OpenFOAM includes
#include "blockMesh.H"
@ -43,7 +43,7 @@ License
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
void Foam::vtkPV4blockMesh::convertMeshBlocks
void Foam::vtkPVblockMesh::convertMeshBlocks
(
vtkMultiBlockDataSet* output,
int& blockNo
@ -59,7 +59,7 @@ void Foam::vtkPV4blockMesh::convertMeshBlocks
if (debug)
{
Info<< "<beg> Foam::vtkPV4blockMesh::convertMeshBlocks" << endl;
Info<< "<beg> Foam::vtkPVblockMesh::convertMeshBlocks" << endl;
}
int blockI = 0;
@ -130,12 +130,12 @@ void Foam::vtkPV4blockMesh::convertMeshBlocks
if (debug)
{
Info<< "<end> Foam::vtkPV4blockMesh::convertMeshBlocks" << endl;
Info<< "<end> Foam::vtkPVblockMesh::convertMeshBlocks" << endl;
}
}
void Foam::vtkPV4blockMesh::convertMeshEdges
void Foam::vtkPVblockMesh::convertMeshEdges
(
vtkMultiBlockDataSet* output,
int& blockNo
@ -240,13 +240,13 @@ void Foam::vtkPV4blockMesh::convertMeshEdges
if (debug)
{
Info<< "<end> Foam::vtkPV4blockMesh::convertMeshEdges" << endl;
Info<< "<end> Foam::vtkPVblockMesh::convertMeshEdges" << endl;
}
}
void Foam::vtkPV4blockMesh::convertMeshCorners
void Foam::vtkPVblockMesh::convertMeshCorners
(
vtkMultiBlockDataSet* output,
int& blockNo
@ -261,7 +261,7 @@ void Foam::vtkPV4blockMesh::convertMeshCorners
if (debug)
{
Info<< "<beg> Foam::vtkPV4blockMesh::convertMeshCorners" << endl;
Info<< "<beg> Foam::vtkPVblockMesh::convertMeshCorners" << endl;
}
if (true) // or some flag or other condition
@ -311,7 +311,7 @@ void Foam::vtkPV4blockMesh::convertMeshCorners
if (debug)
{
Info<< "<end> Foam::vtkPV4blockMesh::convertMeshCorners" << endl;
Info<< "<end> Foam::vtkPVblockMesh::convertMeshCorners" << endl;
}
}

28
applications/utilities/postProcessing/graphics/PV4Readers/PV4blockMeshReader/vtkPV4blockMesh/vtkPV4blockMeshUtils.C → applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/vtkPVblockMesh/vtkPVblockMeshUtils.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -26,8 +26,8 @@ Description
\*---------------------------------------------------------------------------*/
#include "vtkPV4blockMesh.H"
#include "vtkPV4blockMeshReader.h"
#include "vtkPVblockMesh.H"
#include "vtkPVblockMeshReader.h"
// VTK includes
#include "vtkDataArraySelection.h"
@ -66,7 +66,7 @@ namespace Foam
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
void Foam::vtkPV4blockMesh::AddToBlock
void Foam::vtkPVblockMesh::AddToBlock
(
vtkMultiBlockDataSet* output,
vtkDataSet* dataset,
@ -126,7 +126,7 @@ void Foam::vtkPV4blockMesh::AddToBlock
}
vtkDataSet* Foam::vtkPV4blockMesh::GetDataSetFromBlock
vtkDataSet* Foam::vtkPVblockMesh::GetDataSetFromBlock
(
vtkMultiBlockDataSet* output,
const arrayRange& range,
@ -148,7 +148,7 @@ vtkDataSet* Foam::vtkPV4blockMesh::GetDataSetFromBlock
// ununsed at the moment
Foam::label Foam::vtkPV4blockMesh::GetNumberOfDataSets
Foam::label Foam::vtkPVblockMesh::GetNumberOfDataSets
(
vtkMultiBlockDataSet* output,
const arrayRange& range
@ -167,7 +167,7 @@ Foam::label Foam::vtkPV4blockMesh::GetNumberOfDataSets
}
Foam::wordHashSet Foam::vtkPV4blockMesh::getSelected
Foam::wordHashSet Foam::vtkPVblockMesh::getSelected
(
vtkDataArraySelection* select
)
@ -187,7 +187,7 @@ Foam::wordHashSet Foam::vtkPV4blockMesh::getSelected
}
Foam::wordHashSet Foam::vtkPV4blockMesh::getSelected
Foam::wordHashSet Foam::vtkPVblockMesh::getSelected
(
vtkDataArraySelection* select,
const arrayRange& range
@ -208,7 +208,7 @@ Foam::wordHashSet Foam::vtkPV4blockMesh::getSelected
}
Foam::stringList Foam::vtkPV4blockMesh::getSelectedArrayEntries
Foam::stringList Foam::vtkPVblockMesh::getSelectedArrayEntries
(
vtkDataArraySelection* select
)
@ -247,7 +247,7 @@ Foam::stringList Foam::vtkPV4blockMesh::getSelectedArrayEntries
}
Foam::stringList Foam::vtkPV4blockMesh::getSelectedArrayEntries
Foam::stringList Foam::vtkPVblockMesh::getSelectedArrayEntries
(
vtkDataArraySelection* select,
const arrayRange& range
@ -286,7 +286,7 @@ Foam::stringList Foam::vtkPV4blockMesh::getSelectedArrayEntries
}
void Foam::vtkPV4blockMesh::setSelectedArrayEntries
void Foam::vtkPVblockMesh::setSelectedArrayEntries
(
vtkDataArraySelection* select,
const stringList& selections
@ -312,7 +312,7 @@ void Foam::vtkPV4blockMesh::setSelectedArrayEntries
}
void Foam::vtkPV4blockMesh::updateBoolListStatus
void Foam::vtkPVblockMesh::updateBoolListStatus
(
boolList& status,
vtkDataArraySelection* selection
@ -320,7 +320,7 @@ void Foam::vtkPV4blockMesh::updateBoolListStatus
{
if (debug)
{
Info<< "<beg> Foam::vtkPV4blockMesh::updateBoolListStatus" << endl;
Info<< "<beg> Foam::vtkPVblockMesh::updateBoolListStatus" << endl;
}
const label nElem = selection->GetNumberOfArrays();
@ -345,7 +345,7 @@ void Foam::vtkPV4blockMesh::updateBoolListStatus
}
if (debug)
{
Info<< "<end> Foam::vtkPV4blockMesh::updateBoolListStatus" << endl;
Info<< "<end> Foam::vtkPVblockMesh::updateBoolListStatus" << endl;
}
}

3
applications/utilities/postProcessing/graphics/PVReaders/vtkPVReaders/Make/files Normal file
View File

@ -0,0 +1,3 @@
vtkPVReaders.C
LIB = $(FOAM_LIBBIN)/libvtkPVReaders

0
applications/utilities/postProcessing/graphics/PV4Readers/vtkPV4Readers/Make/options → applications/utilities/postProcessing/graphics/PVReaders/vtkPVReaders/Make/options
View File

24
applications/utilities/postProcessing/graphics/PV4Readers/vtkPV4Readers/vtkPV4Readers.C → applications/utilities/postProcessing/graphics/PVReaders/vtkPVReaders/vtkPVReaders.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -26,7 +26,7 @@ Description
\*---------------------------------------------------------------------------*/
#include "vtkPV4Readers.H"
#include "vtkPVReaders.H"
// OpenFOAM includes
#include "IFstream.H"
@ -41,7 +41,7 @@ Description
namespace Foam
{
defineTypeNameAndDebug(vtkPV4Readers, 0);
defineTypeNameAndDebug(vtkPVReaders, 0);
}
@ -75,7 +75,7 @@ namespace Foam
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
void Foam::vtkPV4Readers::AddToBlock
void Foam::vtkPVReaders::AddToBlock
(
vtkMultiBlockDataSet* output,
vtkDataSet* dataset,
@ -135,7 +135,7 @@ void Foam::vtkPV4Readers::AddToBlock
}
vtkDataSet* Foam::vtkPV4Readers::GetDataSetFromBlock
vtkDataSet* Foam::vtkPVReaders::GetDataSetFromBlock
(
vtkMultiBlockDataSet* output,
const partInfo& selector,
@ -157,7 +157,7 @@ vtkDataSet* Foam::vtkPV4Readers::GetDataSetFromBlock
// ununsed at the moment
Foam::label Foam::vtkPV4Readers::GetNumberOfDataSets
Foam::label Foam::vtkPVReaders::GetNumberOfDataSets
(
vtkMultiBlockDataSet* output,
const partInfo& selector
@ -176,13 +176,13 @@ Foam::label Foam::vtkPV4Readers::GetNumberOfDataSets
}
// Foam::word Foam::vtkPV4Readers::getPartName(int partId)
// Foam::word Foam::vtkPVReaders::getPartName(int partId)
// {
// return getFirstWord(reader_->GetPartArrayName(partId));
// }
Foam::wordHashSet Foam::vtkPV4Readers::getSelected
Foam::wordHashSet Foam::vtkPVReaders::getSelected
(
vtkDataArraySelection* select
)
@ -202,7 +202,7 @@ Foam::wordHashSet Foam::vtkPV4Readers::getSelected
}
Foam::wordHashSet Foam::vtkPV4Readers::getSelected
Foam::wordHashSet Foam::vtkPVReaders::getSelected
(
vtkDataArraySelection* select,
const partInfo& selector
@ -223,7 +223,7 @@ Foam::wordHashSet Foam::vtkPV4Readers::getSelected
}
Foam::stringList Foam::vtkPV4Readers::getSelectedArrayEntries
Foam::stringList Foam::vtkPVReaders::getSelectedArrayEntries
(
vtkDataArraySelection* select
)
@ -262,7 +262,7 @@ Foam::stringList Foam::vtkPV4Readers::getSelectedArrayEntries
}
Foam::stringList Foam::vtkPV4Readers::getSelectedArrayEntries
Foam::stringList Foam::vtkPVReaders::getSelectedArrayEntries
(
vtkDataArraySelection* select,
const partInfo& selector
@ -301,7 +301,7 @@ Foam::stringList Foam::vtkPV4Readers::getSelectedArrayEntries
}
void Foam::vtkPV4Readers::setSelectedArrayEntries
void Foam::vtkPVReaders::setSelectedArrayEntries
(
vtkDataArraySelection* select,
const stringList& selections

18
applications/utilities/postProcessing/graphics/PV4Readers/vtkPV4Readers/vtkPV4Readers.H → applications/utilities/postProcessing/graphics/PVReaders/vtkPVReaders/vtkPVReaders.H
View File

@ -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 <http://www.gnu.org/licenses/>.
Namespace
Foam::vtkPV4Readers
Foam::vtkPVReaders
Description
A collection of helper functions when building a reader interface in
ParaView3.
SourceFiles
vtkPV4Readers.C
vtkPVReaders.C
\*---------------------------------------------------------------------------*/
#ifndef vtkPV4Readers_H
#define vtkPV4Readers_H
#ifndef vtkPVReaders_H
#define vtkPVReaders_H
// do not include legacy strstream headers
#ifndef VTK_EXCLUDE_STRSTREAM_HEADERS
@ -53,7 +53,7 @@ SourceFiles
class vtkDataArraySelection;
class vtkDataSet;
class vtkPoints;
class vtkPV4FoamReader;
class vtkPVFoamReader;
class vtkRenderer;
class vtkTextActor;
class vtkMultiBlockDataSet;
@ -66,10 +66,10 @@ class vtkIndent;
namespace Foam
{
namespace vtkPV4Readers
namespace vtkPVReaders
{
//- Declare name of the class and its debug switch
NamespaceName("vtkPV4Readers");
NamespaceName("vtkPVReaders");
//- Bookkeeping for GUI checklists and the multi-block organization
class partInfo
@ -217,7 +217,7 @@ namespace vtkPV4Readers
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
} // End namespace vtkPV4
} // End namespace vtkPV
} // End namespace Foam