Moved the I/O request description and parsing routines to IOUtil so that they

can be shared by all I/O thorns.


git-svn-id: http://svn.cactuscode.org/arrangements/CactusPUGHIO/IOHDF5Util/trunk@62 7842ec3a-9562-4be5-9c5b-06ba18f2b668

1 files changed, 3 insertions, 31 deletions

diff --git a/src/ioHDF5UtilGH.h b/src/ioHDF5UtilGH.h
index 62dc98a..50f4fdf 100644
--- a/src/ioHDF5UtilGH.h
+++ b/src/ioHDF5UtilGH.h
@@ -12,6 +12,7 @@
 #define _IOUTILHDF5_IOUTILHDF5GH_H_ 1
 
 #include <hdf5.h>
+#include "CactusBase/IOUtil/src/ioutil_Utils.h"
 
 
 /********************************************************************
@@ -190,33 +191,6 @@ extern "C"
 {
 #endif
 
-/* structure for hyperslab descriptions of output variables */
-typedef struct
-{
-  /* index and timelevel of the variable */
-  int vindex, timelevel;
-
-  /* dimensionality of the variable and the hyperslab */
-  int vdim, hdim;
-
-  /* CCTK datatype for the hyperslab */
-  int hdatatype;
-
-  /* flag indicating wheter check whether an object to be written already
-     exists (and remove it in that case) */
-  int check_exist;
-
-  /* pointer to allocated buffers */
-  CCTK_INT *vectors;
-
-  /* hyperslab mapping parameters */
-  CCTK_INT *origin, *direction, *extent, *downsample;
-
-  /* offset and sizes of hyperslab into the variable's dataspace */
-  CCTK_INT *hoffset, *hsize, *hsize_chunk;
-
-} ioSlab;
-
 
 /* structure describing a given recovery file */
 typedef struct
@@ -258,14 +232,12 @@ typedef struct
 
 /* exported functions */
 hid_t IOHDF5Util_DataType (const ioHDF5UtilGH *myGH, int cctk_type);
-void IOHDF5Util_ParseVarsForOutput (const cGH *GH, const char *output_varstring,
-                                    ioSlab *output_request_list[]);
 void IOHDF5Util_DumpParameters (const cGH *GH, int all, hid_t group);
 void IOHDF5Util_DumpGHExtensions (const cGH *GH, hid_t group);
 int  IOHDF5Util_DumpGH (const cGH *GH, const int *timers, hid_t file);
-void IOHDF5Util_DumpCommonAttributes (const cGH *GH, const ioSlab *slab,
+void IOHDF5Util_DumpCommonAttributes (const cGH *GH, const ioRequest *request,
                                       hid_t dataset);
-int IOHDF5Util_DumpVar (const cGH *GH, const ioSlab *slab, hid_t file);
+int IOHDF5Util_DumpVar (const cGH *GH, const ioRequest *request, hid_t file);
 
 int IOHDF5Util_RecoverParameters (const fileinfo_t *filenfo);
 int IOHDF5Util_RecoverGHextensions (cGH *GH, const fileinfo_t *filenfo);