Commit 379d87cd authored by Berk Geveci's avatar Berk Geveci
Browse files

ENH: Added new data types. Restructure of composite datasets....

ENH: Added new data types. Restructure of composite datasets. vtkMultiGroupDataSet is the new superclass with two subclasses: vtkMultiBlockDataSet and vtkHierarchicalDataSet
parent a5abe530
......@@ -96,11 +96,13 @@ vtkXMLDataSetWriter.cxx
vtkXMLFileReadTester.cxx
vtkXMLHierarchicalBoxDataReader.cxx
vtkXMLHierarchicalDataReader.cxx
vtkXMLHierarchicalDataWriter.cxx
vtkXMLImageDataReader.cxx
vtkXMLImageDataWriter.cxx
vtkXMLHyperOctreeReader.cxx
vtkXMLHyperOctreeWriter.cxx
vtkXMLMultiBlockDataReader.cxx
vtkXMLMultiGroupDataReader.cxx
vtkXMLMultiGroupDataWriter.cxx
vtkXMLPDataReader.cxx
vtkXMLPDataSetWriter.cxx
vtkXMLPDataWriter.cxx
......@@ -195,3 +197,4 @@ SET(KIT_JAVA_DEPS)
# Include CMake code common to all kits.
INCLUDE(${VTK_SOURCE_DIR}/CMake/KitCommonBlock.cmake)
#-----------------------------------------------------------------------------
......@@ -18,7 +18,7 @@
#include "vtkCellData.h"
#include "vtkCharArray.h"
#include "vtkFloatArray.h"
#include "vtkHierarchicalDataSet.h"
#include "vtkMultiBlockDataSet.h"
#include "vtkIdList.h"
#include "vtkIdTypeArray.h"
#include "vtkObjectFactory.h"
......@@ -33,7 +33,7 @@
#include <ctype.h>
#include <vtkstd/string>
vtkCxxRevisionMacro(vtkEnSight6BinaryReader, "1.50");
vtkCxxRevisionMacro(vtkEnSight6BinaryReader, "1.51");
vtkStandardNewMacro(vtkEnSight6BinaryReader);
//----------------------------------------------------------------------------
......@@ -116,7 +116,7 @@ int vtkEnSight6BinaryReader::OpenFile(const char* filename)
//----------------------------------------------------------------------------
int vtkEnSight6BinaryReader::ReadGeometryFile(const char* fileName,
int timeStep,
vtkHierarchicalDataSet *output)
vtkMultiBlockDataSet *output)
{
char line[80], subLine[80];
int partId, realId;
......@@ -724,7 +724,7 @@ int vtkEnSight6BinaryReader::SkipUnstructuredGrid(char line[256])
//----------------------------------------------------------------------------
int vtkEnSight6BinaryReader::ReadMeasuredGeometryFile(
const char* fileName, int timeStep, vtkHierarchicalDataSet *output)
const char* fileName, int timeStep, vtkMultiBlockDataSet *output)
{
char line[80], subLine[80];
int i;
......@@ -873,7 +873,7 @@ int vtkEnSight6BinaryReader::ReadMeasuredGeometryFile(
//----------------------------------------------------------------------------
int vtkEnSight6BinaryReader::ReadScalarsPerNode(
const char* fileName, const char* description, int timeStep,
vtkHierarchicalDataSet *compositeOutput, int measured,
vtkMultiBlockDataSet *compositeOutput, int measured,
int numberOfComponents, int component)
{
char line[80];
......@@ -1134,7 +1134,7 @@ int vtkEnSight6BinaryReader::ReadScalarsPerNode(
//----------------------------------------------------------------------------
int vtkEnSight6BinaryReader::ReadVectorsPerNode(
const char* fileName, const char* description, int timeStep,
vtkHierarchicalDataSet *compositeOutput, int measured)
vtkMultiBlockDataSet *compositeOutput, int measured)
{
char line[80];
int partId, realId, numPts, i;
......@@ -1341,7 +1341,7 @@ int vtkEnSight6BinaryReader::ReadVectorsPerNode(
//----------------------------------------------------------------------------
int vtkEnSight6BinaryReader::ReadTensorsPerNode(
const char* fileName, const char* description, int timeStep,
vtkHierarchicalDataSet *compositeOutput)
vtkMultiBlockDataSet *compositeOutput)
{
char line[80];
int partId, realId, numPts, i;
......@@ -1511,7 +1511,7 @@ int vtkEnSight6BinaryReader::ReadTensorsPerNode(
//----------------------------------------------------------------------------
int vtkEnSight6BinaryReader::ReadScalarsPerElement(
const char* fileName, const char* description, int timeStep,
vtkHierarchicalDataSet *compositeOutput, int numberOfComponents,
vtkMultiBlockDataSet *compositeOutput, int numberOfComponents,
int component)
{
char line[80];
......@@ -1713,7 +1713,7 @@ int vtkEnSight6BinaryReader::ReadScalarsPerElement(
//----------------------------------------------------------------------------
int vtkEnSight6BinaryReader::ReadVectorsPerElement(
const char* fileName, const char* description, int timeStep,
vtkHierarchicalDataSet *compositeOutput)
vtkMultiBlockDataSet *compositeOutput)
{
char line[80];
int partId, realId, numCells, numCellsPerElement, i, idx;
......@@ -1900,7 +1900,7 @@ int vtkEnSight6BinaryReader::ReadVectorsPerElement(
//----------------------------------------------------------------------------
int vtkEnSight6BinaryReader::ReadTensorsPerElement(
const char* fileName, const char* description, int timeStep,
vtkHierarchicalDataSet *compositeOutput)
vtkMultiBlockDataSet *compositeOutput)
{
char line[80];
int partId, realId, numCells, numCellsPerElement, i, idx;
......@@ -2093,7 +2093,7 @@ int vtkEnSight6BinaryReader::ReadTensorsPerElement(
//----------------------------------------------------------------------------
int vtkEnSight6BinaryReader::CreateUnstructuredGridOutput(
int partId, char line[80], const char* name,
vtkHierarchicalDataSet *compositeOutput)
vtkMultiBlockDataSet *compositeOutput)
{
int lineRead = 1;
int i, j;
......@@ -2684,7 +2684,7 @@ int vtkEnSight6BinaryReader::CreateUnstructuredGridOutput(
//----------------------------------------------------------------------------
int vtkEnSight6BinaryReader::CreateStructuredGridOutput(
int partId, char line[80], const char* name,
vtkHierarchicalDataSet *compositeOutput)
vtkMultiBlockDataSet *compositeOutput)
{
char subLine[80];
int lineRead;
......
......@@ -37,7 +37,7 @@
#include "vtkEnSightReader.h"
class vtkHierarchicalDataSet;
class vtkMultiBlockDataSet;
class vtkIdTypeArray;
class vtkPoints;
......@@ -58,20 +58,20 @@ protected:
// Description:
// Read the geometry file. If an error occurred, 0 is returned; otherwise 1.
virtual int ReadGeometryFile(const char* fileName, int timeStep,
vtkHierarchicalDataSet *output);
vtkMultiBlockDataSet *output);
// Description:
// Read the measured geometry file. If an error occurred, 0 is returned;
// otherwise 1.
virtual int ReadMeasuredGeometryFile(const char* fileName, int timeStep,
vtkHierarchicalDataSet *output);
vtkMultiBlockDataSet *output);
// Description:
// Read scalars per node for this dataset. If an error occurred, 0 is
// returned; otherwise 1. If there will be more than one component in
// the scalars array, we assume that 0 is the first component added to the array.
virtual int ReadScalarsPerNode(const char* fileName, const char* description,
int timeStep, vtkHierarchicalDataSet *output,
int timeStep, vtkMultiBlockDataSet *output,
int measured = 0, int numberOfComponents = 1,
int component = 0);
......@@ -79,14 +79,14 @@ protected:
// Read vectors per node for this dataset. If an error occurred, 0 is
// returned; otherwise 1.
virtual int ReadVectorsPerNode(const char* fileName, const char* description,
int timeStep, vtkHierarchicalDataSet *output,
int timeStep, vtkMultiBlockDataSet *output,
int measured = 0);
// Description:
// Read tensors per node for this dataset. If an error occurred, 0 is
// returned; otherwise 1.
virtual int ReadTensorsPerNode(const char* fileName, const char* description,
int timeStep, vtkHierarchicalDataSet *output);
int timeStep, vtkMultiBlockDataSet *output);
// Description:
// Read scalars per element for this dataset. If an error occurred, 0 is
......@@ -94,7 +94,7 @@ protected:
// scalars array, we assume that 0 is the first component added to the array.
virtual int ReadScalarsPerElement(const char* fileName,
const char* description, int timeStep,
vtkHierarchicalDataSet *output,
vtkMultiBlockDataSet *output,
int numberOfComponents = 1,
int component = 0);
......@@ -102,13 +102,13 @@ protected:
// Read vectors per element for this dataset. If an error occurred, 0 is
// returned; otherwise 1.
virtual int ReadVectorsPerElement(const char* fileName, const char* description,
int timeStep, vtkHierarchicalDataSet *output);
int timeStep, vtkMultiBlockDataSet *output);
// Description:
// Read tensors per element for this dataset. If an error occurred, 0 is
// returned; otherwise 1.
virtual int ReadTensorsPerElement(const char* fileName, const char* description,
int timeStep, vtkHierarchicalDataSet *output);
int timeStep, vtkMultiBlockDataSet *output);
// Description:
// Read an unstructured part (partId) from the geometry file and create a
......@@ -116,7 +116,7 @@ protected:
virtual int CreateUnstructuredGridOutput(int partId,
char line[256],
const char* name,
vtkHierarchicalDataSet *output);
vtkMultiBlockDataSet *output);
// Description:
// Read a structured part from the geometry file and create a
......@@ -124,7 +124,7 @@ protected:
virtual int CreateStructuredGridOutput(int partId,
char line[256],
const char* name,
vtkHierarchicalDataSet *output);
vtkMultiBlockDataSet *output);
// Description:
// Internal function to read in a line up to 80 characters.
......
......@@ -17,7 +17,7 @@
#include "vtkCellData.h"
#include "vtkCharArray.h"
#include "vtkFloatArray.h"
#include "vtkHierarchicalDataSet.h"
#include "vtkMultiBlockDataSet.h"
#include "vtkIdList.h"
#include "vtkIdTypeArray.h"
#include "vtkObjectFactory.h"
......@@ -33,7 +33,7 @@
#include <ctype.h>
#include <vtkstd/string>
vtkCxxRevisionMacro(vtkEnSight6Reader, "1.59");
vtkCxxRevisionMacro(vtkEnSight6Reader, "1.60");
vtkStandardNewMacro(vtkEnSight6Reader);
//----------------------------------------------------------------------------
......@@ -155,7 +155,7 @@ int vtkEnSight6ReaderRead4(const char *line, float *point1)
//----------------------------------------------------------------------------
int vtkEnSight6Reader::ReadGeometryFile(const char* fileName, int timeStep,
vtkHierarchicalDataSet *output)
vtkMultiBlockDataSet *output)
{
char line[256], subLine[256];
int partId;
......@@ -338,7 +338,7 @@ int vtkEnSight6Reader::ReadGeometryFile(const char* fileName, int timeStep,
//----------------------------------------------------------------------------
int vtkEnSight6Reader::ReadMeasuredGeometryFile(const char* fileName,
int timeStep,
vtkHierarchicalDataSet *output)
vtkMultiBlockDataSet *output)
{
char line[256], subLine[256];
vtkPoints *newPoints;
......@@ -461,7 +461,7 @@ int vtkEnSight6Reader::ReadMeasuredGeometryFile(const char* fileName,
//----------------------------------------------------------------------------
int vtkEnSight6Reader::ReadScalarsPerNode(
const char* fileName, const char* description, int timeStep,
vtkHierarchicalDataSet *compositeOutput, int measured,
vtkMultiBlockDataSet *compositeOutput, int measured,
int numberOfComponents, int component)
{
char line[256];
......@@ -696,7 +696,7 @@ int vtkEnSight6Reader::ReadScalarsPerNode(
//----------------------------------------------------------------------------
int vtkEnSight6Reader::ReadVectorsPerNode(
const char* fileName, const char* description, int timeStep,
vtkHierarchicalDataSet *compositeOutput, int measured)
vtkMultiBlockDataSet *compositeOutput, int measured)
{
char line[256];
char tempLine[256];
......@@ -895,7 +895,7 @@ int vtkEnSight6Reader::ReadVectorsPerNode(
//----------------------------------------------------------------------------
int vtkEnSight6Reader::ReadTensorsPerNode(
const char* fileName, const char* description, int timeStep,
vtkHierarchicalDataSet *compositeOutput)
vtkMultiBlockDataSet *compositeOutput)
{
char line[256];
char tempLine[256];
......@@ -1044,7 +1044,7 @@ int vtkEnSight6Reader::ReadTensorsPerNode(
//----------------------------------------------------------------------------
int vtkEnSight6Reader::ReadScalarsPerElement(
const char* fileName, const char* description, int timeStep,
vtkHierarchicalDataSet *compositeOutput, int numberOfComponents,
vtkMultiBlockDataSet *compositeOutput, int numberOfComponents,
int component)
{
char line[256];
......@@ -1227,7 +1227,7 @@ int vtkEnSight6Reader::ReadScalarsPerElement(
//----------------------------------------------------------------------------
int vtkEnSight6Reader::ReadVectorsPerElement(
const char* fileName, const char* description, int timeStep,
vtkHierarchicalDataSet *compositeOutput)
vtkMultiBlockDataSet *compositeOutput)
{
char line[256];
int partId, numCells, numCellsPerElement, i, j, k, idx;
......@@ -1397,7 +1397,7 @@ int vtkEnSight6Reader::ReadVectorsPerElement(
//----------------------------------------------------------------------------
int vtkEnSight6Reader::ReadTensorsPerElement(
const char* fileName, const char* description, int timeStep,
vtkHierarchicalDataSet *compositeOutput)
vtkMultiBlockDataSet *compositeOutput)
{
char line[256];
int partId, numCells, numCellsPerElement, i, j, k, idx;
......@@ -1547,7 +1547,7 @@ int vtkEnSight6Reader::ReadTensorsPerElement(
//----------------------------------------------------------------------------
int vtkEnSight6Reader::CreateUnstructuredGridOutput(
int partId, char line[256], const char* name,
vtkHierarchicalDataSet *compositeOutput)
vtkMultiBlockDataSet *compositeOutput)
{
int lineRead = 1;
char subLine[256];
......@@ -2064,7 +2064,7 @@ int vtkEnSight6Reader::CreateUnstructuredGridOutput(
//----------------------------------------------------------------------------
int vtkEnSight6Reader::CreateStructuredGridOutput(
int partId, char line[256], const char* name,
vtkHierarchicalDataSet *compositeOutput)
vtkMultiBlockDataSet *compositeOutput)
{
char subLine[256];
char formatLine[256], tempLine[256];
......
......@@ -37,7 +37,7 @@
#include "vtkEnSightReader.h"
class vtkHierarchicalDataSet;
class vtkMultiBlockDataSet;
class vtkIdTypeArray;
class vtkPoints;
......@@ -55,20 +55,20 @@ protected:
// Description:
// Read the geometry file. If an error occurred, 0 is returned; otherwise 1.
virtual int ReadGeometryFile(const char* fileName, int timeStep,
vtkHierarchicalDataSet *output);
vtkMultiBlockDataSet *output);
// Description:
// Read the measured geometry file. If an error occurred, 0 is returned;
// otherwise 1.
virtual int ReadMeasuredGeometryFile(const char* fileName, int timeStep,
vtkHierarchicalDataSet *output);
vtkMultiBlockDataSet *output);
// Description:
// Read scalars per node for this dataset. If an error occurred, 0 is
// returned; otherwise 1. If there will be more than one component in
// the scalars array, we assume that 0 is the first component added to the array.
virtual int ReadScalarsPerNode(const char* fileName, const char* description,
int timeStep, vtkHierarchicalDataSet *output,
int timeStep, vtkMultiBlockDataSet *output,
int measured = 0,
int numberOfComponents = 1,
int component = 0);
......@@ -77,21 +77,21 @@ protected:
// Read vectors per node for this dataset. If an error occurred, 0 is
// returned; otherwise 1.
virtual int ReadVectorsPerNode(const char* fileName, const char* description,
int timeStep, vtkHierarchicalDataSet *output,
int timeStep, vtkMultiBlockDataSet *output,
int measured = 0);
// Description:
// Read tensors per node for this dataset. If an error occurred, 0 is
// returned; otherwise 1.
virtual int ReadTensorsPerNode(const char* fileName, const char* description,
int timeStep, vtkHierarchicalDataSet *output);
int timeStep, vtkMultiBlockDataSet *output);
// Description:
// Read scalars per element for this dataset. If an error occurred, 0 is
// returned; otherwise 1. If there will be more than one component in the
// scalars array, we assume that 0 is the first component added to the array.
virtual int ReadScalarsPerElement(const char* fileName, const char* description,
int timeStep, vtkHierarchicalDataSet *output,
int timeStep, vtkMultiBlockDataSet *output,
int numberOfComponents = 1,
int component = 0);
......@@ -99,13 +99,13 @@ protected:
// Read vectors per element for this dataset. If an error occurred, 0 is
// returned; otherwise 1.
virtual int ReadVectorsPerElement(const char* fileName, const char* description,
int timeStep, vtkHierarchicalDataSet *output);
int timeStep, vtkMultiBlockDataSet *output);
// Description:
// Read tensors per element for this dataset. If an error occurred, 0 is
// returned; otherwise 1.
virtual int ReadTensorsPerElement(const char* fileName, const char* description,
int timeStep, vtkHierarchicalDataSet *output);
int timeStep, vtkMultiBlockDataSet *output);
// Description:
// Read an unstructured part (partId) from the geometry file and create a
......@@ -113,7 +113,7 @@ protected:
virtual int CreateUnstructuredGridOutput(int partId,
char line[256],
const char* name,
vtkHierarchicalDataSet *output);
vtkMultiBlockDataSet *output);
// Description:
// Read a structured part from the geometry file and create a
......@@ -121,7 +121,7 @@ protected:
virtual int CreateStructuredGridOutput(int partId,
char line[256],
const char* name,
vtkHierarchicalDataSet *output);
vtkMultiBlockDataSet *output);
// global list of points for the unstructured parts of the model
int NumberOfUnstructuredPoints;
......
......@@ -18,7 +18,7 @@
#include "vtkCellData.h"
#include "vtkCharArray.h"
#include "vtkFloatArray.h"
#include "vtkHierarchicalDataSet.h"
#include "vtkMultiBlockDataSet.h"
#include "vtkIdList.h"
#include "vtkImageData.h"
#include "vtkObjectFactory.h"
......@@ -32,7 +32,7 @@
#include <ctype.h>
#include <vtkstd/string>
vtkCxxRevisionMacro(vtkEnSightGoldBinaryReader, "1.63");
vtkCxxRevisionMacro(vtkEnSightGoldBinaryReader, "1.64");
vtkStandardNewMacro(vtkEnSightGoldBinaryReader);
// This is half the precision of an int.
......@@ -103,7 +103,7 @@ int vtkEnSightGoldBinaryReader::OpenFile(const char* filename)
//----------------------------------------------------------------------------
int vtkEnSightGoldBinaryReader::ReadGeometryFile(const char* fileName, int timeStep,
vtkHierarchicalDataSet *output)
vtkMultiBlockDataSet *output)
{
char line[80], subLine[80];
int partId, realId;
......@@ -909,7 +909,7 @@ int vtkEnSightGoldBinaryReader::SkipImageData(char line[256])
//----------------------------------------------------------------------------
int vtkEnSightGoldBinaryReader::ReadMeasuredGeometryFile(const char* fileName,
int timeStep,
vtkHierarchicalDataSet *output)
vtkMultiBlockDataSet *output)
{
char line[80], subLine[80];
int i;
......@@ -1040,7 +1040,7 @@ int vtkEnSightGoldBinaryReader::ReadMeasuredGeometryFile(const char* fileName,
//----------------------------------------------------------------------------
int vtkEnSightGoldBinaryReader::ReadScalarsPerNode(
const char* fileName, const char* description, int timeStep,
vtkHierarchicalDataSet *compositeOutput, int measured,
vtkMultiBlockDataSet *compositeOutput, int measured,
int numberOfComponents, int component)
{
char line[80];
......@@ -1238,7 +1238,7 @@ int vtkEnSightGoldBinaryReader::ReadScalarsPerNode(
//----------------------------------------------------------------------------
int vtkEnSightGoldBinaryReader::ReadVectorsPerNode(
const char* fileName, const char* description, int timeStep,
vtkHierarchicalDataSet *compositeOutput, int measured)
vtkMultiBlockDataSet *compositeOutput, int measured)
{
char line[80];
int partId, realId, numPts, i, lineRead;
......@@ -1418,7 +1418,7 @@ int vtkEnSightGoldBinaryReader::ReadVectorsPerNode(
//----------------------------------------------------------------------------
int vtkEnSightGoldBinaryReader::ReadTensorsPerNode(
const char* fileName, const char* description, int timeStep,
vtkHierarchicalDataSet *compositeOutput)
vtkMultiBlockDataSet *compositeOutput)
{
char line[80];
int partId, realId, numPts, i, lineRead;
......@@ -1562,7 +1562,7 @@ int vtkEnSightGoldBinaryReader::ReadTensorsPerNode(
//----------------------------------------------------------------------------
int vtkEnSightGoldBinaryReader::ReadScalarsPerElement(
const char* fileName, const char* description, int timeStep,
vtkHierarchicalDataSet *compositeOutput, int numberOfComponents,
vtkMultiBlockDataSet *compositeOutput, int numberOfComponents,
int component)
{
char line[80];
......@@ -1801,7 +1801,7 @@ int vtkEnSightGoldBinaryReader::ReadScalarsPerElement(
//----------------------------------------------------------------------------
int vtkEnSightGoldBinaryReader::ReadVectorsPerElement(
const char* fileName, const char* description, int timeStep,
vtkHierarchicalDataSet *compositeOutput)
vtkMultiBlockDataSet *compositeOutput)
{
char line[80];
int partId, realId, numCells, numCellsPerElement, i, idx;
......@@ -2034,7 +2034,7 @@ int vtkEnSightGoldBinaryReader::ReadVectorsPerElement(
//----------------------------------------------------------------------------
int vtkEnSightGoldBinaryReader::ReadTensorsPerElement(
const char* fileName, const char* description, int timeStep,
vtkHierarchicalDataSet *compositeOutput)
vtkMultiBlockDataSet *compositeOutput)
{
char line[80];
int partId, realId, numCells, numCellsPerElement, i, idx;
......@@ -2288,7 +2288,7 @@ int vtkEnSightGoldBinaryReader::ReadTensorsPerElement(
//----------------------------------------------------------------------------
int vtkEnSightGoldBinaryReader::CreateUnstructuredGridOutput(
int partId, char line[80], const char* name,
vtkHierarchicalDataSet *compositeOutput)
vtkMultiBlockDataSet *compositeOutput)
{
int lineRead = 1;
int i, j;
......@@ -2925,7 +2925,7 @@ int vtkEnSightGoldBinaryReader::CreateUnstructuredGridOutput(
//----------------------------------------------------------------------------
int vtkEnSightGoldBinaryReader::CreateStructuredGridOutput(
int partId, char line[80], const char* name,
vtkHierarchicalDataSet *compositeOutput)
vtkMultiBlockDataSet *compositeOutput)
{
char subLine[80];
int lineRead;
......@@ -3053,7 +3053,7 @@ int vtkEnSightGoldBinaryReader::CreateStructuredGridOutput(
//----------------------------------------------------------------------------
int vtkEnSightGoldBinaryReader::CreateRectilinearGridOutput(
int partId, char line[80], const char* name,
vtkHierarchicalDataSet *compositeOutput)
vtkMultiBlockDataSet *compositeOutput)
{
char subLine[80];
int lineRead;
......@@ -3169,7 +3169,7 @@ int vtkEnSightGoldBinaryReader::CreateRectilinearGridOutput(
//----------------------------------------------------------------------------
int vtkEnSightGoldBinaryReader::CreateImageDataOutput(
int partId, char line[80], const char* name,
vtkHierarchicalDataSet *compositeOutput)
vtkMultiBlockDataSet *compositeOutput)
{
char subLine[80];
int lineRead;
......
......@@ -37,7 +37,7 @@
#include "vtkEnSightReader.h"
class vtkHierarchicalDataSet;
class vtkMultiBlockDataSet;
class VTK_IO_EXPORT vtkEnSightGoldBinaryReader : public vtkEnSightReader
{
......@@ -56,20 +56,20 @@ protected:
// Description:
// Read the geometry file. If an error occurred, 0 is returned; otherwise 1.
virtual int ReadGeometryFile(const char* fileName, int timeStep,
vtkHierarchicalDataSet *output);
vtkMultiBlockDataSet *output);
// Description:
// Read the measured geometry file. If an error occurred, 0 is returned;
// otherwise 1.
virtual int ReadMeasuredGeometryFile(const char* fileName, int timeStep,
vtkHierarchicalDataSet *output);
vtkMultiBlockDataSet *output);
// Description:
// Read scalars per node for this dataset. If an error occurred, 0 is
// returned; otherwise 1. If there will be more than one component in
// the data array, it is assumed that 0 is the first component added.
virtual int ReadScalarsPerNode(const char* fileName, const char* description,
int timeStep, vtkHierarchicalDataSet *output,
int timeStep, vtkMultiBlockDataSet *output,
int measured = 0, int numberOfComponents = 1,
int component = 0);
......@@ -77,21 +77,21 @@ protected:
// Read vectors per node for this dataset. If an error occurred, 0 is
// returned; otherwise 1.
virtual int ReadVectorsPerNode(const char* fileName, const char* description,
int timeStep, vtkHierarchicalDataSet *output,
int timeStep, vtkMultiBlockDataSet *output,
int measured = 0);
// Description:
// Read tensors per node for this dataset. If an error occurred, 0 is
// returned; otherwise 1.
virtual int ReadTensorsPerNode(const char* fileName, const char* description,
int timeStep, vtkHierarchicalDataSet *output);
int timeStep, vtkMultiBlockDataSet *output);
// Description:
// Read scalars per element for this dataset. If an error occurred, 0 is
// returned; otherwise 1. If there will be more than one componenet in the
// data array, it is assumed that 0 is the first component added.
virtual int ReadScalarsPerElement(const char* fileName, const char* description,
int timeStep, vtkHierarchicalDataSet *output,
int timeStep, vtkMultiBlockDataSet *output,
int numberOfComponents = 1,
int component = 0);
......@@ -99,13 +99,13 @@ protected:
// Read vectors per element for this dataset. If an error occurred, 0 is
// returned; otherwise 1.
virtual int ReadVectorsPerElement(const char* fileName, const char* description,
int timeStep, vtkHierarchicalDataSet *output);
int timeStep, vtkMultiBlockDataSet *output);
// Description:
// Read tensors per element for this dataset. If an error occurred, 0 is
// returned; otherwise 1.
virtual int ReadTensorsPerElement(const char* fileName, const char* description,
int timeStep, vtkHierarchicalDataSet *output);
int timeStep, vtkMultiBlockDataSet *output);
// Description:
// Read an unstructured part (partId) from the geometry file and create a
......@@ -114,7 +114,7 @@ protected:
virtual int CreateUnstructuredGridOutput(int partId,
char line[80],
const char* name,
vtkHierarchicalDataSet *output);
vtkMultiBlockDataSet *output);
// Description:
// Read a structured part from the geometry file and create a
......@@ -122,19 +122,19 @@ protected:
virtual int CreateStructuredGridOutput(int partId,
char line[256],
const char* name,
vtkHierarchicalDataSet *output);
vtkMultiBlockDataSet *output);
// Description:
// Read a structured part from the geometry file and create a
// vtkRectilinearGrid output. Return 0 if EOF reached.
int CreateRectilinearGridOutput(int partId, char line[256], const char* name,
vtkHierarchicalDataSet *output);
vtkMultiBlockDataSet *output);
// Description:
// Read a structured part from the geometry file and create a
// vtkImageData output. Return 0 if EOF reached.