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

MRG: resolved merge conflicts from merge from develop branch

Browse Source
This commit is contained in:
Andrew Heather
2017-05-19 16:29:54 +01:00
parent 79bfd7d7d9 6e72ceddd0
commit db5348880e
308 changed files with 2914 additions and 1667 deletions
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
@ -64,7 +64,7 @@ class vtkPVFoamReader
{
public:
vtkTypeMacro(vtkPVFoamReader, vtkMultiBlockDataSetAlgorithm);
void PrintSelf(ostream&, vtkIndent);
void PrintSelf(ostream&, vtkIndent) VTK_OVERRIDE;
static vtkPVFoamReader* New();
@ -199,7 +199,7 @@ protected:
vtkInformation*,
vtkInformationVector**,
vtkInformationVector*
);
) VTK_OVERRIDE;
//- Get the mesh/fields for a particular time
virtual int RequestData
@ -207,10 +207,10 @@ protected:
vtkInformation*,
vtkInformationVector**,
vtkInformationVector*
);
) VTK_OVERRIDE;
//- 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
vtkCallbackCommand* SelectionObserver;

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

@ -62,7 +62,7 @@ class vtkPVblockMeshReader
{
public:
vtkTypeMacro(vtkPVblockMeshReader, vtkMultiBlockDataSetAlgorithm);
void PrintSelf(ostream&, vtkIndent);
void PrintSelf(ostream&, vtkIndent) VTK_OVERRIDE;
static vtkPVblockMeshReader* New();
@ -127,7 +127,7 @@ protected:
vtkInformation* unusedRequest,
vtkInformationVector** unusedInputVector,
vtkInformationVector* outputVector
);
) VTK_OVERRIDE;
//- Get the mesh for a particular time
virtual int RequestData
@ -135,10 +135,10 @@ protected:
vtkInformation* unusedRequest,
vtkInformationVector** unusedInputVector,
vtkInformationVector* outputVector
);
) VTK_OVERRIDE;
//- 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
vtkCallbackCommand* SelectionObserver;