Commit 884b5fff authored by John Biddiscombe's avatar John Biddiscombe
Browse files

ENH: Add Time support to Reader. We check for CollectionType attribute on the...

ENH: Add Time support to Reader. We check for CollectionType attribute on the main top level grid, and if it is temporal, we collect the list of time values from each sub grid. This is exported. When Time values are requested we output the correct sub grid.
Lots of internal changes to tidy up the code and handle information.
BUG: Several bug fixes for reading in parallel. Extents were not always correct. Seem to be ok for image data now
parent 3b30c806
......@@ -215,8 +215,8 @@ protected:
XdmfInt32 UpdateInformationUniform();
XdmfInt32 UpdateInformationCollection();
XdmfInt32 UpdateInformationTree();
XdmfInt32 UpdateInformationFunction(); // HpyerSlab, Coordinates or Function
XdmfInt32 UpdateFunction(); // HpyerSlab, Coordinates or Function
XdmfInt32 UpdateInformationFunction(); // HyperSlab, Coordinates or Function
XdmfInt32 UpdateFunction(); // HyperSlab, Coordinates or Function
};
#endif // __XdmfDataItem_h
This diff is collapsed.
......@@ -206,8 +206,18 @@ public:
// Get DsmBubffer
void *GetDsmBuffer();
// Set the Timestep to be read. This is provided for compatibility
// reasons only and should not be used. The correct way to
// request time is using the UPDATE_TIME_STEPS information key
// passed from downstream.
vtkSetMacro(TimeStep, int);
vtkGetMacro(TimeStep, int);
// Description:
// Save the range of valid timestep index values. This can be used by the PAraView GUI
int TimeStepRange[2];
vtkGetVector2Macro(TimeStepRange, int);
protected:
vtkXdmfReader();
~vtkXdmfReader();
......@@ -224,9 +234,10 @@ protected:
vtkInformationVector *);
virtual int FillOutputPortInformation(int port, vtkInformation *info);
int UpdateDomains();
int UpdateDomains();
void UpdateRootGrid();
void UpdateGrids(vtkXdmfReaderGrid *parent, void *GridNode);
void FindTimeValues();
// Array selection helpers /////////////////////////////////////////////////
static void SelectionModifiedCallback(vtkObject* caller, unsigned long eid,
......@@ -249,10 +260,13 @@ protected:
int Stride[3];
int GridsModified;
int OutputsInitialized;
int OutputVTKType;
int GridsModified;
int OutputsInitialized;
int OutputVTKType;
XdmfDsmBuffer *DsmBuffer;
int OutputTemporal;
unsigned int ActualTimeStep;
int TimeStep;
private:
vtkXdmfReader(const vtkXdmfReader&); // Not implemented
void operator=(const vtkXdmfReader&); // 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