Commit b921193b authored by Dave Partyka's avatar Dave Partyka Committed by Kitware Robot
Browse files

Merge topic 'windreader-mpiio' into pv-master

61a3d1fe Shadowed variable warning.
e546e5fa Uninitialized variable warning.
8320bcaf Compiler warnings.
c04bf965 Sohail's wind reader additions.
afaddec5 One more shadowed variable warning.
7736b777 Fix for shadowed variable warning.
2db9d498 PIMPL FilePtr removing mpi.h include from vtkWindBladeReader.h.
f51134b5 Undoing minor change to vtkMPI.h.
bd21c90c Possible fix for unfound mpi.h.
0f56df17 Shadowed variable warning.
3ce49daa Changed reads to read_alls.
56209af7 MPI fix to make it run with one processor.
76a9e183 Merge branch 'pv-master' into scdemo
f7ac3519 Updated the reader to be able to parse the text in MPIIO.
8f0b1f22 Converted to be able to use MPI-IO when possible for binary data.
parents a9ab1253 61a3d1fe
This diff is collapsed.
......@@ -16,7 +16,7 @@
// .SECTION Description
// vtkWindBladeReader is a source object that reads WindBlade files
// which are block binary files with tags before and after each block
// giving the number of bytes within the block. The number of data
// giving the number of bytes within the block. The number of data
// variables dumped varies. There are 3 output ports with the first
// being a structured grid with irregular spacing in the Z dimension.
// The second is an unstructured grid only read on on process 0 and
......@@ -42,14 +42,15 @@ class vtkStructuredGrid;
class vtkUnstructuredGrid;
class vtkMultiBlockDataSetAglorithm;
class vtkStructuredGridAlgorithm;
class WindBladeReaderInternal;
class VTK_PARALLEL_EXPORT vtkWindBladeReader : public vtkStructuredGridAlgorithm
class VTK_PARALLEL_EXPORT vtkWindBladeReader : public vtkStructuredGridAlgorithm
{
public:
static vtkWindBladeReader *New();
vtkTypeMacro(vtkWindBladeReader,vtkStructuredGridAlgorithm);
void PrintSelf(ostream& os, vtkIndent indent);
vtkSetStringMacro(Filename);
vtkGetStringMacro(Filename);
......@@ -61,9 +62,9 @@ public:
// Description:
// Get the reader's output
vtkStructuredGrid *GetFieldOutput(); // Output port 0
vtkUnstructuredGrid *GetBladeOutput(); // Output port 1
vtkStructuredGrid *GetGroundOutput(); // Output port 2
vtkStructuredGrid *GetFieldOutput(); // Output port 0
vtkUnstructuredGrid *GetBladeOutput(); // Output port 1
vtkStructuredGrid *GetGroundOutput(); // Output port 2
// Description:
// The following methods allow selective reading of solutions fields.
......@@ -92,7 +93,6 @@ protected:
~vtkWindBladeReader();
char* Filename; // Base file name
FILE* FilePtr; // Open file pointer
int Rank; // Number of this processor
int TotalRank; // Number of processors
......@@ -163,6 +163,8 @@ protected:
vtkFloatArray* XPosition; // Location of tower
vtkFloatArray* YPosition; // Location of tower
vtkFloatArray* HubHeight; // Height of tower
vtkFloatArray* AngularVeloc; // Angular Velocity
vtkFloatArray* BladeLength; // Blade length
vtkIntArray* BladeCount; // Number of blades per tower
int UseTurbineFile; // Turbine data available
......@@ -179,11 +181,11 @@ protected:
vtkCallbackCommand* SelectionObserver;
// Controlls initializing and querrying MPI
vtkMultiProcessController * MPIController;
vtkMultiProcessController * MPIController;
// Read the header file describing the dataset
bool ReadGlobalData();
void ReadDataVariables(ifstream& inStr);
void ReadDataVariables(istream& inStr);
bool FindVariableOffsets();
// Turbine methods
......@@ -210,7 +212,7 @@ protected:
void CalculatePressure(int pres, int prespre, int tempg, int density);
virtual int RequestData(
vtkInformation* request,
vtkInformation* request,
vtkInformationVector** inputVector,
vtkInformationVector* outputVector);
......@@ -220,18 +222,20 @@ protected:
vtkInformationVector* outputVector);
static void SelectionCallback(
vtkObject *caller,
vtkObject *caller,
unsigned long eid,
void *clientdata,
void *clientdata,
void *calldata);
static void EventCallback(
vtkObject* caller,
vtkObject* caller,
unsigned long eid,
void* clientdata, void* calldata);
virtual int FillOutputPortInformation(int, vtkInformation*);
WindBladeReaderInternal * Internal;
private:
vtkWindBladeReader(const vtkWindBladeReader&); // Not implemented.
void operator=(const vtkWindBladeReader&); // Not implemented.
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment