Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Development
openfoam
Commits
0b94582a
Commit
0b94582a
authored
Jun 17, 2013
by
andy
Browse files
ENH: Updated paraview 3.98->4
parent
5d33f36a
Changes
63
Hide whitespace changes
Inline
Side-by-side
applications/utilities/postProcessing/graphics/PV398Readers/PV398FoamReader/vtkPV398Foam/Make/files
deleted
100644 → 0
View file @
5d33f36a
vtkPV398Foam.C
vtkPV398FoamFields.C
vtkPV398FoamMesh.C
vtkPV398FoamMeshLagrangian.C
vtkPV398FoamMeshSet.C
vtkPV398FoamMeshVolume.C
vtkPV398FoamMeshZone.C
vtkPV398FoamUpdateInfo.C
vtkPV398FoamUtils.C
LIB = $(FOAM_LIBBIN)/libvtkPV398Foam
applications/utilities/postProcessing/graphics/PV398Readers/PV398blockMeshReader/vtkPV398blockMesh/Make/files
deleted
100644 → 0
View file @
5d33f36a
vtkPV398blockMesh.C
vtkPV398blockMeshConvert.C
vtkPV398blockMeshUtils.C
LIB = $(FOAM_LIBBIN)/libvtkPV398blockMesh
applications/utilities/postProcessing/graphics/PV398Readers/vtkPV398Readers/Make/files
deleted
100644 → 0
View file @
5d33f36a
vtkPV398Readers.C
LIB = $(FOAM_LIBBIN)/libvtkPV398Readers
applications/utilities/postProcessing/graphics/PV3Readers/Allwmake
View file @
0b94582a
...
...
@@ -2,7 +2,7 @@
cd
${
0
%/*
}
||
exit
1
# run from this directory
#set -x
if
[
"
$ParaView_VERSION
"
!=
"
3.98
.1"
]
if
[
"
$ParaView_VERSION
"
!=
"
4.0
.1"
]
then
if
[
-d
"
$ParaView_DIR
"
-a
-r
"
$ParaView_DIR
"
]
then
...
...
applications/utilities/postProcessing/graphics/PV
398
Readers/Allwclean
→
applications/utilities/postProcessing/graphics/PV
4
Readers/Allwclean
View file @
0b94582a
...
...
@@ -2,8 +2,8 @@
cd
${
0
%/*
}
||
exit
1
# run from this directory
set
-x
wclean libso vtkPV
398
Readers
PV
398
blockMeshReader/Allwclean
PV
398
FoamReader/Allwclean
wclean libso vtkPV
4
Readers
PV
4
blockMeshReader/Allwclean
PV
4
FoamReader/Allwclean
# ----------------------------------------------------------------- end-of-file
applications/utilities/postProcessing/graphics/PV
398
Readers/Allwmake
→
applications/utilities/postProcessing/graphics/PV
4
Readers/Allwmake
View file @
0b94582a
...
...
@@ -2,7 +2,7 @@
cd
${
0
%/*
}
||
exit
1
# run from this directory
#set -x
if
[
"
$ParaView_VERSION
"
==
"
3.98
.1"
]
if
[
"
$ParaView_VERSION
"
==
"
4.0
.1"
]
then
if
[
-d
"
$ParaView_DIR
"
-a
-r
"
$ParaView_DIR
"
]
then
...
...
@@ -14,14 +14,14 @@ if [ "$ParaView_VERSION" == "3.98.1" ]
# ensure CMake gets the correct C++ compiler
[
-n
"
$WM_CXX
"
]
&&
export
CXX
=
"
$WM_CXX
"
wmake libso vtkPV
398
Readers
PV
398
blockMeshReader/Allwmake
PV
398
FoamReader/Allwmake
wmake libso vtkPV
4
Readers
PV
4
blockMeshReader/Allwmake
PV
4
FoamReader/Allwmake
else
echo
"ERROR: ParaView not found in
$ParaView_DIR
"
fi
else
echo
"WARN: PV
398
readers not building: ParaView_VERSION=
$ParaView_VERSION
"
echo
"WARN: PV
4
readers not building: ParaView_VERSION=
$ParaView_VERSION
"
fi
# ----------------------------------------------------------------- end-of-file
applications/utilities/postProcessing/graphics/PV
398
Readers/PV
398
FoamReader/Allwclean
→
applications/utilities/postProcessing/graphics/PV
4
Readers/PV
4
FoamReader/Allwclean
View file @
0b94582a
...
...
@@ -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
/libPV
398
FoamReader
*
2>/dev/null
rm
-f
$FOAM_LIBBIN
/libPV
4
FoamReader
*
2>/dev/null
rm
-rf
PV
398
FoamReader/Make
wclean libso vtkPV
398
Foam
rm
-rf
PV
4
FoamReader/Make
wclean libso vtkPV
4
Foam
# ----------------------------------------------------------------- end-of-file
applications/utilities/postProcessing/graphics/PV
398
Readers/PV
398
FoamReader/Allwmake
→
applications/utilities/postProcessing/graphics/PV
4
Readers/PV
4
FoamReader/Allwmake
View file @
0b94582a
...
...
@@ -4,9 +4,9 @@ set -x
if
[
-d
"
$ParaView_DIR
"
-a
-r
"
$ParaView_DIR
"
]
then
wmake libso vtkPV
398
Foam
wmake libso vtkPV
4
Foam
(
cd
PV
398
FoamReader
cd
PV
4
FoamReader
mkdir
-p
Make/
$WM_OPTIONS
>
/dev/null 2>&1
cd
Make/
$WM_OPTIONS
cmake ../..
...
...
applications/utilities/postProcessing/graphics/PV
398
Readers/PV
398
FoamReader/PV
398
FoamReader/CMakeLists.txt
→
applications/utilities/postProcessing/graphics/PV
4
Readers/PV
4
FoamReader/PV
4
FoamReader/CMakeLists.txt
View file @
0b94582a
...
...
@@ -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
}
/../vtkPV
398
Foam
${
PROJECT_SOURCE_DIR
}
/../vtkPV
4
Foam
)
ADD_DEFINITIONS
(
...
...
@@ -41,45 +41,45 @@ SET(
#
# Extend the auto-generated panel
QT4_WRAP_CPP
(
MOC_SRCS pqPV
398
FoamReaderPanel.h
)
QT4_WRAP_CPP
(
MOC_SRCS pqPV
4
FoamReaderPanel.h
)
ADD_PARAVIEW_OBJECT_PANEL
(
IFACES IFACE_SRCS
CLASS_NAME pqPV
398
FoamReaderPanel
XML_NAME PV
398
FoamReader
# name of SourceProxy in *SM.xml
CLASS_NAME pqPV
4
FoamReaderPanel
XML_NAME PV
4
FoamReader
# name of SourceProxy in *SM.xml
XML_GROUP sources
)
ADD_PARAVIEW_PLUGIN
(
PV
398
FoamReader_SM
"1.0"
SERVER_MANAGER_XML PV
398
FoamReader_SM.xml
SERVER_MANAGER_SOURCES vtkPV
398
FoamReader.cxx
PV
4
FoamReader_SM
"1.0"
SERVER_MANAGER_XML PV
4
FoamReader_SM.xml
SERVER_MANAGER_SOURCES vtkPV
4
FoamReader.cxx
GUI_INTERFACES
${
IFACES
}
GUI_SOURCES pqPV
398
FoamReaderPanel.cxx
GUI_SOURCES pqPV
4
FoamReaderPanel.cxx
${
MOC_SRCS
}
${
UI_SRCS
}
${
IFACE_SRCS
}
GUI_RESOURCE_FILES PV
398
FoamReader.xml
GUI_RESOURCE_FILES PV
4
FoamReader.xml
)
# #
# # Define the server-side portion of the reader plugin
# #
# ADD_PARAVIEW_PLUGIN(
# PV
398
FoamReader_SM "1.0"
# SERVER_MANAGER_XML PV
398
FoamReader_SM.xml
# SERVER_MANAGER_SOURCES vtkPV
398
FoamReader.cxx
# PV
4
FoamReader_SM "1.0"
# SERVER_MANAGER_XML PV
4
FoamReader_SM.xml
# SERVER_MANAGER_SOURCES vtkPV
4
FoamReader.cxx
# )
# #
# # Define the client-side portion of the reader plugin
# #
# ADD_PARAVIEW_PLUGIN(
# PV
398
FoamReader "1.0"
# PV
4
FoamReader "1.0"
# GUI_RESOURCES PV3FoamReader.qrc
# )
#
TARGET_LINK_LIBRARIES
(
PV
398
FoamReader_SM
PV
4
FoamReader_SM
OpenFOAM
finiteVolume
vtkPV
398
Foam
vtkPV
4
Foam
)
#-----------------------------------------------------------------------------
applications/utilities/postProcessing/graphics/PV
398
Readers/PV
398
FoamReader/PV
398
FoamReader/PV
398
FoamReader.qrc
→
applications/utilities/postProcessing/graphics/PV
4
Readers/PV
4
FoamReader/PV
4
FoamReader/PV
4
FoamReader.qrc
View file @
0b94582a
<RCC>
<qresource prefix="/ParaViewResources" >
<file>PV
398
FoamReader.xml</file>
<file>PV
4
FoamReader.xml</file>
</qresource>
</RCC>
applications/utilities/postProcessing/graphics/PV
398
Readers/PV
398
FoamReader/PV
398
FoamReader/PV
398
FoamReader.xml
→
applications/utilities/postProcessing/graphics/PV
4
Readers/PV
4
FoamReader/PV
4
FoamReader/PV
4
FoamReader.xml
View file @
0b94582a
<ParaViewReaders>
<Reader
name=
"PV
398
FoamReader"
<Reader
name=
"PV
4
FoamReader"
extensions=
"OpenFOAM"
file_description=
"OpenFOAM Reader"
>
</Reader>
...
...
applications/utilities/postProcessing/graphics/PV
398
Readers/PV
398
FoamReader/PV
398
FoamReader/PV
398
FoamReader_SM.xml
→
applications/utilities/postProcessing/graphics/PV
4
Readers/PV
4
FoamReader/PV
4
FoamReader/PV
4
FoamReader_SM.xml
View file @
0b94582a
<ServerManagerConfiguration>
<ProxyGroup
name=
"sources"
>
<SourceProxy
name=
"PV
398
FoamReader"
class=
"vtkPV
398
FoamReader"
>
name=
"PV
4
FoamReader"
class=
"vtkPV
4
FoamReader"
>
<!-- File name - compulsory -->
<StringVectorProperty
...
...
applications/utilities/postProcessing/graphics/PV
398
Readers/PV
398
FoamReader/PV
398
FoamReader/pqPV
398
FoamReaderPanel.cxx
→
applications/utilities/postProcessing/graphics/PV
4
Readers/PV
4
FoamReader/PV
4
FoamReader/pqPV
4
FoamReaderPanel.cxx
View file @
0b94582a
...
...
@@ -23,7 +23,7 @@ License
\*---------------------------------------------------------------------------*/
#include
"pqPV
398
FoamReaderPanel.h"
#include
"pqPV
4
FoamReaderPanel.h"
// QT
#include
<QGridLayout>
...
...
@@ -50,7 +50,7 @@ License
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
pqPV
398
FoamReaderPanel
::
pqPV
398
FoamReaderPanel
pqPV
4
FoamReaderPanel
::
pqPV
4
FoamReaderPanel
(
pqProxy
*
proxy
,
QWidget
*
p
...
...
@@ -339,7 +339,7 @@ pqPV398FoamReaderPanel::pqPV398FoamReaderPanel
// * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * * //
void
pqPV
398
FoamReaderPanel
::
CacheMeshToggled
()
void
pqPV
4
FoamReaderPanel
::
CacheMeshToggled
()
{
vtkSMIntVectorProperty
::
SafeDownCast
(
...
...
@@ -348,7 +348,7 @@ void pqPV398FoamReaderPanel::CacheMeshToggled()
}
void
pqPV
398
FoamReaderPanel
::
RefreshPressed
()
void
pqPV
4
FoamReaderPanel
::
RefreshPressed
()
{
// update everything
vtkSMIntVectorProperty
::
SafeDownCast
...
...
@@ -363,7 +363,7 @@ void pqPV398FoamReaderPanel::RefreshPressed()
}
void
pqPV
398
FoamReaderPanel
::
ZeroTimeToggled
()
void
pqPV
4
FoamReaderPanel
::
ZeroTimeToggled
()
{
vtkSMIntVectorProperty
::
SafeDownCast
(
...
...
@@ -374,7 +374,7 @@ void pqPV398FoamReaderPanel::ZeroTimeToggled()
}
void
pqPV
398
FoamReaderPanel
::
ShowPatchNamesToggled
()
void
pqPV
4
FoamReaderPanel
::
ShowPatchNamesToggled
()
{
vtkSMIntVectorProperty
::
SafeDownCast
(
...
...
@@ -391,7 +391,7 @@ void pqPV398FoamReaderPanel::ShowPatchNamesToggled()
}
void
pqPV
398
FoamReaderPanel
::
ShowGroupsOnlyToggled
()
void
pqPV
4
FoamReaderPanel
::
ShowGroupsOnlyToggled
()
{
vtkSMProperty
*
prop
;
...
...
@@ -407,7 +407,7 @@ void pqPV398FoamReaderPanel::ShowGroupsOnlyToggled()
}
void
pqPV
398
FoamReaderPanel
::
IncludeSetsToggled
()
void
pqPV
4
FoamReaderPanel
::
IncludeSetsToggled
()
{
vtkSMProperty
*
prop
;
...
...
@@ -423,7 +423,7 @@ void pqPV398FoamReaderPanel::IncludeSetsToggled()
}
void
pqPV
398
FoamReaderPanel
::
IncludeZonesToggled
()
void
pqPV
4
FoamReaderPanel
::
IncludeZonesToggled
()
{
vtkSMProperty
*
prop
;
...
...
@@ -439,7 +439,7 @@ void pqPV398FoamReaderPanel::IncludeZonesToggled()
}
void
pqPV
398
FoamReaderPanel
::
ExtrapolatePatchesToggled
()
void
pqPV
4
FoamReaderPanel
::
ExtrapolatePatchesToggled
()
{
vtkSMProperty
*
prop
;
...
...
@@ -452,7 +452,7 @@ void pqPV398FoamReaderPanel::ExtrapolatePatchesToggled()
}
void
pqPV
398
FoamReaderPanel
::
InterpolateVolFieldsToggled
()
void
pqPV
4
FoamReaderPanel
::
InterpolateVolFieldsToggled
()
{
vtkSMProperty
*
prop
;
...
...
applications/utilities/postProcessing/graphics/PV
398
Readers/PV
398
FoamReader/PV
398
FoamReader/pqPV
398
FoamReaderPanel.h
→
applications/utilities/postProcessing/graphics/PV
4
Readers/PV
4
FoamReader/PV
4
FoamReader/pqPV
4
FoamReaderPanel.h
View file @
0b94582a
...
...
@@ -22,19 +22,19 @@ License
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
Class
pqPV
398
FoamReaderPanel
pqPV
4
FoamReaderPanel
Description
GUI modifications for the ParaView reader panel
A custom panel for the PV
398
FoamReader.
A custom panel for the PV
4
FoamReader.
SourceFiles
pqPV
398
FoamReaderPanel.cxx
pqPV
4
FoamReaderPanel.cxx
\*---------------------------------------------------------------------------*/
#ifndef pqPV
398
FoamReaderPanel_h
#define pqPV
398
FoamReaderPanel_h
#ifndef pqPV
4
FoamReaderPanel_h
#define pqPV
4
FoamReaderPanel_h
#include
"pqAutoGeneratedObjectPanel.h"
...
...
@@ -51,10 +51,10 @@ class vtkSMSourceProxy;
/*---------------------------------------------------------------------------*\
Class pqPV
398
FoamReaderPanel Declaration
Class pqPV
4
FoamReaderPanel Declaration
\*---------------------------------------------------------------------------*/
class
pqPV
398
FoamReaderPanel
class
pqPV
4
FoamReaderPanel
:
public
pqAutoGeneratedObjectPanel
{
...
...
@@ -105,11 +105,11 @@ public:
// Constructors
//- Construct from components
pqPV
398
FoamReaderPanel
(
pqProxy
*
,
QWidget
*
);
pqPV
4
FoamReaderPanel
(
pqProxy
*
,
QWidget
*
);
//- Destructor
// virtual ~pqPV
398
FoamReaderPanel();
// virtual ~pqPV
4
FoamReaderPanel();
};
...
...
applications/utilities/postProcessing/graphics/PV
398
Readers/PV
398
FoamReader/PV
398
FoamReader/vtkPV
398
FoamReader.cxx
→
applications/utilities/postProcessing/graphics/PV
4
Readers/PV
4
FoamReader/PV
4
FoamReader/vtkPV
4
FoamReader.cxx
View file @
0b94582a
...
...
@@ -22,7 +22,7 @@ License
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
\*---------------------------------------------------------------------------*/
#include
"vtkPV
398
FoamReader.h"
#include
"vtkPV
4
FoamReader.h"
#include
"pqApplicationCore.h"
#include
"pqRenderView.h"
...
...
@@ -40,18 +40,18 @@ License
#include
"vtkStringArray.h"
// OpenFOAM includes
#include
"vtkPV
398
Foam.H"
#include
"vtkPV
4
Foam.H"
#undef EXPERIMENTAL_TIME_CACHING
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
vtkStandardNewMacro
(
vtkPV
398
FoamReader
);
vtkStandardNewMacro
(
vtkPV
4
FoamReader
);
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
vtkPV
398
FoamReader
::
vtkPV
398
FoamReader
()
vtkPV
4
FoamReader
::
vtkPV
4
FoamReader
()
{
Debug
=
0
;
vtkDebugMacro
(
<<
"Constructor"
);
...
...
@@ -63,7 +63,7 @@ vtkPV398FoamReader::vtkPV398FoamReader()
output0_
=
NULL
;
#ifdef VTKPV
398
FOAM_DUALPORT
#ifdef VTKPV
4
FOAM_DUALPORT
// Add second output for the Lagrangian
this
->
SetNumberOfOutputPorts
(
2
);
vtkMultiBlockDataSet
*
lagrangian
=
vtkMultiBlockDataSet
::
New
();
...
...
@@ -100,7 +100,7 @@ vtkPV398FoamReader::vtkPV398FoamReader()
SelectionObserver
=
vtkCallbackCommand
::
New
();
SelectionObserver
->
SetCallback
(
&
vtkPV
398
FoamReader
::
SelectionModifiedCallback
&
vtkPV
4
FoamReader
::
SelectionModifiedCallback
);
SelectionObserver
->
SetClientData
(
this
);
...
...
@@ -129,7 +129,7 @@ vtkPV398FoamReader::vtkPV398FoamReader()
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
vtkPV
398
FoamReader
::~
vtkPV
398
FoamReader
()
vtkPV
4
FoamReader
::~
vtkPV
4
FoamReader
()
{
vtkDebugMacro
(
<<
"Deconstructor"
);
...
...
@@ -168,7 +168,7 @@ vtkPV398FoamReader::~vtkPV398FoamReader()
// * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * * //
// Do everything except set the output info
int
vtkPV
398
FoamReader
::
RequestInformation
int
vtkPV
4
FoamReader
::
RequestInformation
(
vtkInformation
*
vtkNotUsed
(
request
),
vtkInformationVector
**
vtkNotUsed
(
inputVector
),
...
...
@@ -177,7 +177,7 @@ int vtkPV398FoamReader::RequestInformation
{
vtkDebugMacro
(
<<
"RequestInformation"
);
if
(
Foam
::
vtkPV
398
Foam
::
debug
)
if
(
Foam
::
vtkPV
4
Foam
::
debug
)
{
cout
<<
"REQUEST_INFORMATION
\n
"
;
}
...
...
@@ -190,7 +190,7 @@ int vtkPV398FoamReader::RequestInformation
int
nInfo
=
outputVector
->
GetNumberOfInformationObjects
();
if
(
Foam
::
vtkPV
398
Foam
::
debug
)
if
(
Foam
::
vtkPV
4
Foam
::
debug
)
{
cout
<<
"RequestInformation with "
<<
nInfo
<<
" item(s)
\n
"
;
for
(
int
infoI
=
0
;
infoI
<
nInfo
;
++
infoI
)
...
...
@@ -201,7 +201,7 @@ int vtkPV398FoamReader::RequestInformation
if
(
!
foamData_
)
{
foamData_
=
new
Foam
::
vtkPV
398
Foam
(
FileName
,
this
);
foamData_
=
new
Foam
::
vtkPV
4
Foam
(
FileName
,
this
);
}
else
{
...
...
@@ -238,7 +238,7 @@ int vtkPV398FoamReader::RequestInformation
timeRange
[
0
]
=
timeSteps
[
0
];
timeRange
[
1
]
=
timeSteps
[
nTimeSteps
-
1
];
if
(
Foam
::
vtkPV
398
Foam
::
debug
>
1
)
if
(
Foam
::
vtkPV
4
Foam
::
debug
>
1
)
{
cout
<<
"nTimeSteps "
<<
nTimeSteps
<<
"
\n
"
<<
"timeRange "
<<
timeRange
[
0
]
<<
" to "
<<
timeRange
[
1
]
...
...
@@ -268,7 +268,7 @@ int vtkPV398FoamReader::RequestInformation
// Set the output info
int
vtkPV
398
FoamReader
::
RequestData
int
vtkPV
4
FoamReader
::
RequestData
(
vtkInformation
*
vtkNotUsed
(
request
),
vtkInformationVector
**
vtkNotUsed
(
inputVector
),
...
...
@@ -292,7 +292,7 @@ int vtkPV398FoamReader::RequestData
int
nInfo
=
outputVector
->
GetNumberOfInformationObjects
();
if
(
Foam
::
vtkPV
398
Foam
::
debug
)
if
(
Foam
::
vtkPV
4
Foam
::
debug
)
{
cout
<<
"RequestData with "
<<
nInfo
<<
" item(s)
\n
"
;
for
(
int
infoI
=
0
;
infoI
<
nInfo
;
++
infoI
)
...
...
@@ -310,7 +310,7 @@ int vtkPV398FoamReader::RequestData
// taking port0 as the lead for other outputs would be nice, but fails when
// a filter is added - we need to check everything
// but since PREVIOUS_UPDATE_TIME_STEPS() is protected, relay the logic
// to the vtkPV
398
Foam::setTime() method
// to the vtkPV
4
Foam::setTime() method
for
(
int
infoI
=
0
;
infoI
<
nInfo
;
++
infoI
)
{
vtkInformation
*
outInfo
=
outputVector
->
GetInformationObject
(
infoI
);
...
...
@@ -342,7 +342,7 @@ int vtkPV398FoamReader::RequestData
)
);
if
(
Foam
::
vtkPV
398
Foam
::
debug
)
if
(
Foam
::
vtkPV
4
Foam
::
debug
)
{
cout
<<
"update output with "
<<
output
->
GetNumberOfBlocks
()
<<
" blocks
\n
"
;
...
...
@@ -370,7 +370,7 @@ int vtkPV398FoamReader::RequestData
output
->
ShallowCopy
(
output0_
);
}
if
(
Foam
::
vtkPV
398
Foam
::
debug
)
if
(
Foam
::
vtkPV
4
Foam
::
debug
)
{
if
(
needsUpdate
)
{
...
...
@@ -390,7 +390,7 @@ int vtkPV398FoamReader::RequestData
#else
#ifdef VTKPV
398
FOAM_DUALPORT
#ifdef VTKPV
4
FOAM_DUALPORT
foamData_
->
Update
(
output
,
...
...
@@ -417,13 +417,13 @@ int vtkPV398FoamReader::RequestData
}
void
vtkPV
398
FoamReader
::
SetRefresh
(
int
val
)
void
vtkPV
4
FoamReader
::
SetRefresh
(
int
val
)
{
Modified
();
}
void
vtkPV
398
FoamReader
::
SetIncludeSets
(
int
val
)
void
vtkPV
4
FoamReader
::
SetIncludeSets
(
int
val
)
{
if
(
IncludeSets
!=
val
)
{
...
...
@@ -436,7 +436,7 @@ void vtkPV398FoamReader::SetIncludeSets(int val)
}
void
vtkPV
398
FoamReader
::
SetIncludeZones
(
int
val
)
void
vtkPV
4
FoamReader
::
SetIncludeZones
(
int
val
)
{
if
(
IncludeZones
!=
val
)
{
...
...
@@ -449,7 +449,7 @@ void vtkPV398FoamReader::SetIncludeZones(int val)
}
void
vtkPV
398
FoamReader
::
SetShowPatchNames
(
int
val
)
void
vtkPV
4
FoamReader
::
SetShowPatchNames
(
int
val
)
{
if
(
ShowPatchNames
!=
val
)
{
...
...
@@ -459,7 +459,7 @@ void vtkPV398FoamReader::SetShowPatchNames(int val)
}
void
vtkPV
398
FoamReader
::
SetShowGroupsOnly
(
int
val
)
void
vtkPV
4
FoamReader
::
SetShowGroupsOnly
(
int
val
)
{
if
(
ShowGroupsOnly
!=
val
)
{
...
...
@@ -472,7 +472,7 @@ void vtkPV398FoamReader::SetShowGroupsOnly(int val)
}
void
vtkPV
398
FoamReader
::
updatePatchNamesView
(
const
bool
show
)
void
vtkPV
4
FoamReader
::
updatePatchNamesView
(
const
bool
show
)
{
pqApplicationCore
*
appCore
=
pqApplicationCore
::
instance
();
...
...
@@ -506,7 +506,7 @@ void vtkPV398FoamReader::updatePatchNamesView(const bool show)
}
void
vtkPV
398
FoamReader
::
PrintSelf
(
ostream
&
os
,
vtkIndent
indent
)
void
vtkPV
4
FoamReader
::
PrintSelf
(
ostream
&
os
,
vtkIndent
indent
)
{
vtkDebugMacro
(
<<
"PrintSelf"
);
...
...
@@ -522,7 +522,7 @@ void vtkPV398FoamReader::PrintSelf(ostream& os, vtkIndent indent)
}
int
vtkPV
398
FoamReader
::
GetTimeStep
()
int
vtkPV
4
FoamReader
::
GetTimeStep
()
{
return
foamData_
?
foamData_
->
timeIndex
()
:
-
1
;
}
...
...
@@ -531,35 +531,35 @@ int vtkPV398FoamReader::GetTimeStep()
// ----------------------------------------------------------------------
// Parts selection list control
vtkDataArraySelection
*
vtkPV
398
FoamReader
::
GetPartSelection
()
vtkDataArraySelection
*
vtkPV
4
FoamReader
::
GetPartSelection
()
{
vtkDebugMacro
(
<<
"GetPartSelection"
);
return
PartSelection
;
}
int
vtkPV
398
FoamReader
::
GetNumberOfPartArrays
()
int
vtkPV
4
FoamReader
::
GetNumberOfPartArrays
()
{
vtkDebugMacro
(
<<
"GetNumberOfPartArrays"
);
return
PartSelection
->
GetNumberOfArrays
();
}
const
char
*
vtkPV
398
FoamReader
::
GetPartArrayName
(
int
index
)