Commit 9addfd68 authored by Dave Demarle's avatar Dave Demarle
Browse files

ENH: Change XDMF reader to produce full trees, multiblocks within multiblocks,...

ENH: Change XDMF reader to produce full trees, multiblocks within multiblocks, when given a domain with nonuniformgrids inside nonuniformgrids, and to produce atomic data sets, vtkDataSets, when given a domain with a single uniformgrid.
parent e18f0c43
This diff is collapsed.
......@@ -38,6 +38,7 @@ class vtkDataArraySelection;
class vtkCallbackCommand;
class vtkMultiProcessController;
class vtkXdmfReaderInternal;
class vtkXdmfReaderGrid;
//BTX
class XdmfDOM;
......@@ -50,13 +51,52 @@ public:
vtkTypeRevisionMacro(vtkXdmfReader, vtkDataReader);
void PrintSelf(ostream& os, vtkIndent indent);
// DOMAINS ///////////////////////////////////////////////////////////////
// Description:
// Get the output of this reader.
vtkDataObject *GetOutput();
vtkDataObject *GetOutput(int idx);
// Get number of domains.
int GetNumberOfDomains();
// ATTRIBUTES ///////////////////////////////////////////////////////////////
// Description:
// Get/Set the current domain name.
virtual void SetDomainName(const char*);
vtkGetStringMacro(DomainName);
// Get the name of domain at index.
const char* GetDomainName(int idx);
// GRIDS ///////////////////////////////////////////////////////////////////
// Description:
// Get number of grids in the current domain.
int GetNumberOfGrids();
// Description:
// Get/Set the current grid name.
void SetGridName(const char*);
// Description:
// Get the name of grid at index.
const char* GetGridName(int idx);
int GetGridIndex(const char* name);
// Description:
// Enable grids.
void EnableGrid(const char* name);
void EnableGrid(int idx);
void EnableAllGrids();
// Description:
// Disable grids
void DisableGrid(const char* name);
void DisableGrid(int idx);
void DisableAllGrids();
void RemoveAllGrids();
// Description:
// Get current enable/disable of the grid
int GetGridSetting(const char* name);
int GetGridSetting(int idx);
// ATTRIBUTES ///////////////////////////////////////////////////////////////
// Description:
// Get the data array selection tables used to configure which data
// arrays are loaded by the reader.
......@@ -89,7 +129,6 @@ public:
void DisableAllArrays();
// PARAMETERS ///////////////////////////////////////////////////////////////
// Description:
// Get the number of Parameters
int GetNumberOfParameters();
......@@ -129,51 +168,6 @@ public:
const char *GetParameterValue(int index);
const char *GetParameterValue(const char *Name);
// DOMAINS ///////////////////////////////////////////////////////////////
// Description:
// Get number of domains.
int GetNumberOfDomains();
// Description:
// Get/Set the current domain name.
virtual void SetDomainName(const char*);
vtkGetStringMacro(DomainName);
// Get the name of domain at index.
const char* GetDomainName(int idx);
// GRIDS ///////////////////////////////////////////////////////////////////
// Description:
// Get number of grids in the current domain.
int GetNumberOfGrids();
// Description:
// Get/Set the current grid name.
void SetGridName(const char*);
// Description:
// Get the name of grid at index.
const char* GetGridName(int idx);
int GetGridIndex(const char* name);
// Description:
// Enable grids.
void EnableGrid(const char* name);
void EnableGrid(int idx);
void EnableAllGrids();
// Description:
// Disable grids
void DisableGrid(const char* name);
void DisableGrid(int idx);
void DisableAllGrids();
void RemoveAllGrids();
// Description:
// Get current enable/disable of the grid
int GetGridSetting(const char* name);
int GetGridSetting(int idx);
// STRIDE ///////////////////////////////////////////////////////////////////
// Description:
// Set / get stride
......@@ -222,33 +216,34 @@ protected:
vtkInformationVector *);
virtual int FillOutputPortInformation(int port, vtkInformation *info);
void UpdateUniformGrid(void *GridNode, char *CollectionName);
void UpdateNonUniformGrid(void *GridNode, char *CollectionName);
void UpdateGrids();
int UpdateDomains();
void UpdateRootGrid();
void UpdateGrids(vtkXdmfReaderGrid *parent, void *GridNode);
// Array selection helpers /////////////////////////////////////////////////
static void SelectionModifiedCallback(vtkObject* caller, unsigned long eid,
void* clientdata, void* calldata);
vtkDataArraySelection* PointDataArraySelection;
vtkDataArraySelection* CellDataArraySelection;
vtkCallbackCommand* SelectionObserver;
//
vtkXdmfReaderInternal* Internals;
XdmfDOM *DOM;
vtkMultiProcessController *Controller;
char* DomainName;
char* GridName;
int GridsModified;
int NumberOfEnabledActualGrids;
int Stride[3];
int GridsModified;
int OutputsInitialized;
XdmfDOM *DOM;
vtkMultiProcessController *Controller;
// Array selection helpers /////////////////////////////////////////////////
static void SelectionModifiedCallback(vtkObject* caller, unsigned long eid,
void* clientdata, void* calldata);
vtkDataArraySelection* PointDataArraySelection;
vtkDataArraySelection* CellDataArraySelection;
vtkCallbackCommand* SelectionObserver;
int OutputVTKType;
private:
vtkXdmfReader(const vtkXdmfReader&); // Not implemented
void operator=(const vtkXdmfReader&); // Not implemented
......
Markdown is supported
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