songtianlun/openfoam
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

COMP: use VTK_OVERRIDE on paraview methods

Browse Source 
COMP: avoid undefined-var-template warning in runTimePostProcessing
This commit is contained in:
Mark Olesen 2017-05-18 13:21:48 +02:00
parent d6e721a9bd
commit 15d0a918c5
3 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/PVFoamReader/vtkPVFoamReader.h
View File

@ -55,7 +55,7 @@ namespace Foam
/*---------------------------------------------------------------------------*\ /*---------------------------------------------------------------------------*\
Class vtkPVFoamReader Declaration Class vtkPVFoamReader Declaration
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
class vtkPVFoamReader class vtkPVFoamReader
@ -64,7 +64,7 @@ class vtkPVFoamReader
{ {
public: public:
vtkTypeMacro(vtkPVFoamReader, vtkMultiBlockDataSetAlgorithm); vtkTypeMacro(vtkPVFoamReader, vtkMultiBlockDataSetAlgorithm);
void PrintSelf(ostream&, vtkIndent); void PrintSelf(ostream&, vtkIndent) VTK_OVERRIDE;
static vtkPVFoamReader* New(); static vtkPVFoamReader* New();
@ -199,7 +199,7 @@ protected:
vtkInformation*, vtkInformation*,
vtkInformationVector**, vtkInformationVector**,
vtkInformationVector* vtkInformationVector*
); ) VTK_OVERRIDE;
//- Get the mesh/fields for a particular time //- Get the mesh/fields for a particular time
virtual int RequestData virtual int RequestData
@ -207,10 +207,10 @@ protected:
vtkInformation*, vtkInformation*,
vtkInformationVector**, vtkInformationVector**,
vtkInformationVector* vtkInformationVector*
); ) VTK_OVERRIDE;
//- Fill in additional port information //- Fill in additional port information
virtual int FillOutputPortInformation(int, vtkInformation*); virtual int FillOutputPortInformation(int, vtkInformation*) VTK_OVERRIDE;
//- The observer to modify this object when array selections are modified //- The observer to modify this object when array selections are modified
vtkCallbackCommand* SelectionObserver; vtkCallbackCommand* SelectionObserver;

8
applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/PVblockMeshReader/vtkPVblockMeshReader.h
View File

@ -62,7 +62,7 @@ class vtkPVblockMeshReader
{ {
public: public:
vtkTypeMacro(vtkPVblockMeshReader, vtkMultiBlockDataSetAlgorithm); vtkTypeMacro(vtkPVblockMeshReader, vtkMultiBlockDataSetAlgorithm);
void PrintSelf(ostream&, vtkIndent); void PrintSelf(ostream&, vtkIndent) VTK_OVERRIDE;
static vtkPVblockMeshReader* New(); static vtkPVblockMeshReader* New();
@ -127,7 +127,7 @@ protected:
vtkInformation* unusedRequest, vtkInformation* unusedRequest,
vtkInformationVector** unusedInputVector, vtkInformationVector** unusedInputVector,
vtkInformationVector* outputVector vtkInformationVector* outputVector
); ) VTK_OVERRIDE;
//- Get the mesh for a particular time //- Get the mesh for a particular time
virtual int RequestData virtual int RequestData
@ -135,10 +135,10 @@ protected:
vtkInformation* unusedRequest, vtkInformation* unusedRequest,
vtkInformationVector** unusedInputVector, vtkInformationVector** unusedInputVector,
vtkInformationVector* outputVector vtkInformationVector* outputVector
); ) VTK_OVERRIDE;
//- Fill in additional port information //- Fill in additional port information
virtual int FillOutputPortInformation(int, vtkInformation*); virtual int FillOutputPortInformation(int, vtkInformation*) VTK_OVERRIDE;
// The observer to modify this object when array selections are modified // The observer to modify this object when array selections are modified
vtkCallbackCommand* SelectionObserver; vtkCallbackCommand* SelectionObserver;

3
src/functionObjects/graphics/runTimePostProcessing/fieldVisualisationBase.C
View File

@ -480,8 +480,7 @@ void Foam::functionObjects::fieldVisualisationBase::addGlyphs
else else
{ {
WarningInFunction WarningInFunction
<< "Glyphs can only be added to " << pTraits<scalar>::typeName << "Glyphs can only be added to scalar and vector fields."
<< " and " << pTraits<vector>::typeName << " fields. "
<< " Field " << scaleFieldName << " has " << nComponents << " Field " << scaleFieldName << " has " << nComponents
<< " components" << endl; << " components" << endl;