Removed fixed-sized hyperslab structure. Now the components are dynamically

allocated according to the variable/hyperslab dimensionality.


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

1 files changed, 8 insertions, 11 deletions

diff --git a/src/ioHDF5UtilGH.h b/src/ioHDF5UtilGH.h
index 30880cb..073e400 100644
--- a/src/ioHDF5UtilGH.h
+++ b/src/ioHDF5UtilGH.h
@@ -132,17 +132,15 @@
 
 
 /* Geometry information structure for output variable */
-/* FIXME: allocate arrays dynamically */
-#define IOHDF5_MAXDIM 5
 typedef struct
 {
   int vdim;
   int sdim;
-  int direction[IOHDF5_MAXDIM];
-  int origin[IOHDF5_MAXDIM];
-  int length[IOHDF5_MAXDIM];
-  int downsample[IOHDF5_MAXDIM];
-  int actlen[IOHDF5_MAXDIM];       /* actual index slab length (by PUGHSlab)*/
+  int *direction;
+  int *origin;
+  int *length;
+  int *downsample;
+  int *actlen;       /* actual index slab length (by PUGHSlab)*/
 } ioHDF5Geo_t;
 
 
@@ -172,6 +170,7 @@ typedef struct
 
   /* predefined datatype for writing CCTK_COMPLEX types */
   hid_t IOHDF5_COMPLEX;
+  hid_t IOHDF5_COMPLEX8;
 
   /* predefined datatype for writing C string string attributes */
   hid_t IOHDF5_STRING;
@@ -185,10 +184,8 @@ extern "C"
 #endif
 
 /* exported functions */
-int IOHDF5Util_ParseVarsForOutput (const char *var_list, 
-                                   char do_output[], 
-                                   ioHDF5Geo_t geo_output[]);
-void IOHDF5Util_DefaultGeo (ioHDF5Geo_t *slab);
+void IOHDF5Util_ParseVarsForOutput (const char *output_varstring,
+                                    ioHDF5Geo_t *output_request_list[]);
 void IOHDF5Util_DumpParameters (cGH *GH, hid_t group);
 void IOHDF5Util_DumpGHExtensions (cGH *GH, hid_t group);
 int  IOHDF5Util_DumpGH (cGH *GH, int timers[], hid_t file);