[svn-r6960] Purpose:

added writing more attributes to one test file

Description:
added the writing of 3D attributes to one test file of h5ls

Solution:

Platforms tested:

Windows 2000 (octopus)
Linux 2.4 (rockaway)
SunOS 5.7 (arabica)
IRIX 6.5 (modi4)


Misc. update:

1 files changed, 905 insertions, 53 deletions

diff --git a/tools/h5dump/h5dumpgentest.c b/tools/h5dump/h5dumpgentest.c
index 9b7ff7a..857d4e4 100644
--- a/tools/h5dump/h5dumpgentest.c
+++ b/tools/h5dump/h5dumpgentest.c
@@ -67,9 +67,13 @@
 #define FILE39  "tchar.h5"
 #define FILE40  "tattr2.h5"
 
-/* prototype */
-int write_attr(hid_t loc_id, int rank, hsize_t *dims, const char *attr_name,
+
+/* prototypes */
+static int write_attr(hid_t loc_id, int rank, hsize_t *dims, const char *attr_name,
                 hid_t type_id, void *buf);
+static int write_dset( hid_t loc_id, int rank, hsize_t *dims, const char *dset_name,
+                   hid_t type_id, void *buf );
+
 
 
 #define LENSTR  50
@@ -2934,27 +2938,31 @@ static void gent_char(void)
     H5Fclose(fid1);
 }
 
+
+
 /*-------------------------------------------------------------------------
- * Function: gent_attr_all
+ * Function: write_attr_in
  *
- * Purpose: generate all datatype attributes  
+ * Purpose: write attributes in LOC_ID (dataset, group, named datatype) 
  *
- * Return: void
+ * Return: 
  *
  * Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
  *
- * Date: May 19, 2003
+ * Date: May 28, 2003
  *
  *-------------------------------------------------------------------------
  */
 
-static void gent_attr_all(void)
+static void write_attr_in(hid_t loc_id, 
+																										const char* dset_name, /* for saving reference to dataset*/
+																										hid_t file_id)
 {
  /* Compound datatype */
  typedef struct s_t 
  {
-  int    a;
-  float  b;
+		char   a;
+  double b;
  } s_t;
 
  typedef enum 
@@ -2963,42 +2971,504 @@ static void gent_attr_all(void)
   E_GREEN
  } e_t;
 
- hid_t   file_id; 
- hid_t   dset_id;
  hid_t   attr_id;
  hid_t   space_id;  
  hid_t   type_id;  
  herr_t  status;
- int     val, i, j;
- hsize_t dims[1]={2};
- hsize_t dims2[2]={2,3};
-	int     buf0[2][3]= {{1,2,3},{4,5,6}};
- char    buf1[]= "string attribute";
- char    buf2[2]= {1,2};
- s_t     buf3[2]= {{1,1},{2,2}};
- hobj_ref_t buf4[2];
- hvl_t   buf5[2];
- hsize_t dimarray[1]={3};
- int     buf6[2][3]= {{1,1,1},{2,2,2}};
+ int     val, i, j, k, n;
+	float   f;
+
+	/* create 1D attributes with dimension [2], 2 elements */
+ hsize_t    dims[1]={2};
+	char       buf1[2][2]= {"ab","de"};        /* string */
+ char       buf2[2]= {1,2};                 /* bitfield, opaque */
+ s_t        buf3[2]= {{1,2},{3,4}};         /* compound */
+ hobj_ref_t buf4[2];                        /* reference */
+ hvl_t      buf5[2];                        /* vlen */
+ hsize_t    dimarray[1]={3};                /* array dimension */
+ int        buf6[2][3]= {{1,2,3},{4,5,6}};  /* array */
+	int        buf7[2]= {1,2};                 /* integer */
+	float      buf8[2]= {1,2};                 /* float */
+
+	/* create 2D attributes with dimension [3][2], 6 elements */
+ hsize_t    dims2[2]={3,2};
+	char       buf12[6][2]= {"ab","cd","ef","gh","ij","kl"};         /* string */
+ char       buf22[3][2]= {{1,2},{3,4},{5,6}};                     /* bitfield, opaque */
+ s_t        buf32[6]= {{1,2},{3,4},{5,6},{7,8},{9,10},{11,12}};   /* compound */
+ hobj_ref_t buf42[3][2];                                          /* reference */
+ hvl_t      buf52[3][2];                                          /* vlen */
+ int        buf62[6][3]= {{1,2,3},{4,5,6},{7,8,9},{10,11,12},{13,14,15},{16,17,18}};  /* array */
+	int        buf72[3][2]= {{1,2},{3,4},{5,6}};                     /* integer */
+	float      buf82[3][2]= {{1,2},{3,4},{5,6}};                     /* float */
+
+	/* create 3D attributes with dimension [4][3][2], 24 elements */
+ hsize_t    dims3[3]={4,3,2};
+	char       buf13[24][2]= {"ab","cd","ef","gh","ij","kl","mn","pq",
+	"rs","tu","vw","xz","AB","CD","EF","GH",
+	"IJ","KL","MN","PQ","RS","TU","VW","XZ"};  /* string */
+ char       buf23[4][3][2];    /* bitfield, opaque */
+ s_t        buf33[4][3][2];    /* compound */
+ hobj_ref_t buf43[4][3][2];    /* reference */
+ hvl_t      buf53[4][3][2];    /* vlen */
+ int        buf63[24][3];      /* array */
+	int        buf73[4][3][2];    /* integer */
+	float      buf83[4][3][2];    /* float */
 
- /* Create a file and a dataset */
- file_id  = H5Fcreate(FILE40, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT); 
+
+/*-------------------------------------------------------------------------
+ * 1D attributes
+ *-------------------------------------------------------------------------
+ */
+	
+/*-------------------------------------------------------------------------
+ * H5T_STRING
+ *-------------------------------------------------------------------------
+ */
+	type_id = H5Tcopy(H5T_C_S1);
+ status  = H5Tset_size(type_id, 2);
+ write_attr(loc_id,1,dims,"string",type_id,buf1);
+ status = H5Tclose(type_id);
+
+/*-------------------------------------------------------------------------
+ * H5T_BITFIELD
+ *-------------------------------------------------------------------------
+ */
+ type_id = H5Tcopy(H5T_STD_B8LE);
+ write_attr(loc_id,1,dims,"bitfield",type_id,buf2);
+ status = H5Tclose(type_id);
+
+/*-------------------------------------------------------------------------
+ * H5T_OPAQUE
+ *-------------------------------------------------------------------------
+ */
+ type_id = H5Tcreate(H5T_OPAQUE, 1);
+ status = H5Tset_tag(type_id, "1-byte opaque type"); /* must set this */
+ write_attr(loc_id,1,dims,"opaque",type_id,buf2);
+ status = H5Tclose(type_id);
+
+/*-------------------------------------------------------------------------
+ * H5T_COMPOUND
+ *-------------------------------------------------------------------------
+ */
+ type_id = H5Tcreate (H5T_COMPOUND, sizeof(s_t));
+ H5Tinsert(type_id, "a", HOFFSET(s_t, a), H5T_NATIVE_CHAR);
+	H5Tinsert(type_id, "b", HOFFSET(s_t, b), H5T_NATIVE_DOUBLE);
+ write_attr(loc_id,1,dims,"compound",type_id,buf3);
+ status = H5Tclose(type_id);
+ 
+/*-------------------------------------------------------------------------
+ * H5T_REFERENCE
+ *-------------------------------------------------------------------------
+ */
+ /* Create references to dataset */
+	if (dset_name)
+	{
+		status=H5Rcreate(&buf4[0],file_id,dset_name,H5R_OBJECT,-1);
+		status=H5Rcreate(&buf4[1],file_id,dset_name,H5R_OBJECT,-1);
+		write_attr(loc_id,1,dims,"reference",H5T_STD_REF_OBJ,buf4);
+	}
+
+/*-------------------------------------------------------------------------
+ * H5T_ENUM
+ *-------------------------------------------------------------------------
+ */
+ type_id = H5Tcreate(H5T_ENUM, sizeof(e_t));
+ H5Tenum_insert(type_id, "RED",   (val = 0, &val));
+ H5Tenum_insert(type_id, "GREEN", (val = 1, &val));
+ write_attr(loc_id,1,dims,"enum",type_id,0);
+ status = H5Tclose(type_id);
+
+/*-------------------------------------------------------------------------
+ * H5T_VLEN
+ *-------------------------------------------------------------------------
+ */
+ 
+ /* Allocate and initialize VL dataset to write */
+
+	buf5[0].len = 1;
+	buf5[0].p = malloc( 1 * sizeof(int));
+	((int *)buf5[0].p)[0]=1;
+	buf5[1].len = 2;
+	buf5[1].p = malloc( 2 * sizeof(int));
+	((int *)buf5[1].p)[0]=2;
+	((int *)buf5[1].p)[1]=3;
+
+ space_id = H5Screate_simple(1,dims,NULL);
+ type_id = H5Tvlen_create(H5T_NATIVE_INT);
+ attr_id = H5Acreate(loc_id,"vlen",type_id,space_id,H5P_DEFAULT);
+ status = H5Awrite(attr_id,type_id,buf5);
+ assert(status>=0);
+ status = H5Dvlen_reclaim(type_id,space_id,H5P_DEFAULT,buf5);
+ assert(status>=0);
+ status = H5Aclose(attr_id);
+ status = H5Tclose(type_id);
+ status = H5Sclose(space_id);
+
+/*-------------------------------------------------------------------------
+ * H5T_ARRAY
+ *-------------------------------------------------------------------------
+ */
+ type_id = H5Tarray_create(H5T_NATIVE_INT,1,dimarray,NULL);
+ write_attr(loc_id,1,dims,"array",type_id,buf6);
+ status = H5Tclose(type_id);
+
+/*-------------------------------------------------------------------------
+ * H5T_INTEGER and H5T_FLOAT
+ *-------------------------------------------------------------------------
+ */
+ write_attr(loc_id,1,dims,"integer",H5T_NATIVE_INT,buf7);
+ write_attr(loc_id,1,dims,"float",H5T_NATIVE_FLOAT,buf8);
+
+
+/*-------------------------------------------------------------------------
+ * 2D attributes
+ *-------------------------------------------------------------------------
+ */
+
+/*-------------------------------------------------------------------------
+ * H5T_STRING
+ *-------------------------------------------------------------------------
+ */
+	type_id = H5Tcopy(H5T_C_S1);
+ status  = H5Tset_size(type_id, 2);
+ write_attr(loc_id,2,dims2,"string2D",type_id,buf12);
+ status = H5Tclose(type_id);
+
+/*-------------------------------------------------------------------------
+ * H5T_BITFIELD
+ *-------------------------------------------------------------------------
+ */
+ type_id = H5Tcopy(H5T_STD_B8LE);
+ write_attr(loc_id,2,dims2,"bitfield2D",type_id,buf22);
+ status = H5Tclose(type_id);
+
+/*-------------------------------------------------------------------------
+ * H5T_OPAQUE
+ *-------------------------------------------------------------------------
+ */
+ type_id = H5Tcreate(H5T_OPAQUE, 1);
+ status = H5Tset_tag(type_id, "1-byte opaque type"); /* must set this */
+ write_attr(loc_id,2,dims2,"opaque2D",type_id,buf22);
+ status = H5Tclose(type_id);
+
+/*-------------------------------------------------------------------------
+ * H5T_COMPOUND
+ *-------------------------------------------------------------------------
+ */
+ type_id = H5Tcreate (H5T_COMPOUND, sizeof(s_t));
+ H5Tinsert(type_id, "a", HOFFSET(s_t, a), H5T_NATIVE_CHAR);
+	H5Tinsert(type_id, "b", HOFFSET(s_t, b), H5T_NATIVE_DOUBLE);
+ write_attr(loc_id,2,dims2,"compound2D",type_id,buf32);
+ status = H5Tclose(type_id);
+ 
+/*-------------------------------------------------------------------------
+ * H5T_REFERENCE
+ *-------------------------------------------------------------------------
+ */
+ /* Create references to dataset */
+	if (dset_name)
+	{
+		for (i = 0; i < 3; i++) {
+   for (j = 0; j < 2; j++) {
+    status=H5Rcreate(&buf42[i][j],file_id,dset_name,H5R_OBJECT,-1);
+			}
+		}
+		write_attr(loc_id,2,dims2,"reference2D",H5T_STD_REF_OBJ,buf42);
+	}
+
+/*-------------------------------------------------------------------------
+ * H5T_ENUM
+ *-------------------------------------------------------------------------
+ */
+ type_id = H5Tcreate(H5T_ENUM, sizeof(e_t));
+ H5Tenum_insert(type_id, "RED",   (val = 0, &val));
+ H5Tenum_insert(type_id, "GREEN", (val = 1, &val));
+ write_attr(loc_id,2,dims2,"enum2D",type_id,0);
+ status = H5Tclose(type_id);
+
+/*-------------------------------------------------------------------------
+ * H5T_VLEN
+ *-------------------------------------------------------------------------
+ */
+
+	/* Allocate and initialize VL dataset to write */
+	n=0;
+	for (i = 0; i < 3; i++) {
+		for (j = 0; j < 2; j++) {
+		  int l;
+		  buf52[i][j].p = malloc((i + 1) * sizeof(int));
+		  buf52[i][j].len = i + 1;
+		  for (l = 0; l < i + 1; l++)
+			 ((int *)buf52[i][j].p)[l] = n++;
+		}
+	}
+ 
  space_id = H5Screate_simple(2,dims2,NULL);
- dset_id  = H5Dcreate(file_id,"dset",H5T_NATIVE_INT,space_id,H5P_DEFAULT);
- status   = H5Dwrite(dset_id,H5T_NATIVE_INT,H5S_ALL,H5S_ALL,H5P_DEFAULT,buf0);
- status   = H5Sclose(space_id);
+ type_id = H5Tvlen_create(H5T_NATIVE_INT);
+ attr_id = H5Acreate(loc_id,"vlen2D",type_id,space_id,H5P_DEFAULT);
+ status = H5Awrite(attr_id,type_id,buf52);
+ assert(status>=0);
+ status = H5Dvlen_reclaim(type_id,space_id,H5P_DEFAULT,buf52);
+ assert(status>=0);
+ status = H5Aclose(attr_id);
+ status = H5Tclose(type_id);
+ status = H5Sclose(space_id);
+
+/*-------------------------------------------------------------------------
+ * H5T_ARRAY
+ *-------------------------------------------------------------------------
+ */
+ type_id = H5Tarray_create(H5T_NATIVE_INT,1,dimarray,NULL);
+ write_attr(loc_id,2,dims2,"array2D",type_id,buf62);
+ status = H5Tclose(type_id);
+
+/*-------------------------------------------------------------------------
+ * H5T_INTEGER and H5T_FLOAT
+ *-------------------------------------------------------------------------
+ */
+ write_attr(loc_id,2,dims2,"integer2D",H5T_NATIVE_INT,buf72);
+ write_attr(loc_id,2,dims2,"float2D",H5T_NATIVE_FLOAT,buf82);
+
+	
+/*-------------------------------------------------------------------------
+ * 3D attributes
+ *-------------------------------------------------------------------------
+ */
 
 /*-------------------------------------------------------------------------
  * H5T_STRING
  *-------------------------------------------------------------------------
  */
- space_id = H5Screate(H5S_SCALAR);
- type_id = H5Tcopy(H5T_C_S1);
- status  = H5Tset_size(type_id, 17);
- attr_id = H5Acreate(dset_id,"string",type_id,space_id,H5P_DEFAULT);
- status = H5Awrite(attr_id,type_id,buf1);
+	type_id = H5Tcopy(H5T_C_S1);
+ status  = H5Tset_size(type_id, 2);
+ write_attr(loc_id,3,dims3,"string3D",type_id,buf13);
+ status = H5Tclose(type_id);
+
+/*-------------------------------------------------------------------------
+ * H5T_BITFIELD
+ *-------------------------------------------------------------------------
+ */
+
+	n=1;
+	for (i = 0; i < 4; i++) {
+		for (j = 0; j < 3; j++) {
+			for (k = 0; k < 2; k++) {
+				buf23[i][j][k]=n++;
+			}
+		}
+	}
+ type_id = H5Tcopy(H5T_STD_B8LE);
+ write_attr(loc_id,3,dims3,"bitfield3D",type_id,buf23);
+ status = H5Tclose(type_id);
+
+/*-------------------------------------------------------------------------
+ * H5T_OPAQUE
+ *-------------------------------------------------------------------------
+ */
+ type_id = H5Tcreate(H5T_OPAQUE, 1);
+ status = H5Tset_tag(type_id, "1-byte opaque type"); /* must set this */
+ write_attr(loc_id,3,dims3,"opaque3D",type_id,buf23);
+ status = H5Tclose(type_id);
+
+/*-------------------------------------------------------------------------
+ * H5T_COMPOUND
+ *-------------------------------------------------------------------------
+ */
+
+	n=1;
+	for (i = 0; i < 4; i++) {
+		for (j = 0; j < 3; j++) {
+			for (k = 0; k < 2; k++) {
+				buf33[i][j][k].a=n++;
+				buf33[i][j][k].b=n++;
+			}
+		}
+	}
+ type_id = H5Tcreate (H5T_COMPOUND, sizeof(s_t));
+ H5Tinsert(type_id, "a", HOFFSET(s_t, a), H5T_NATIVE_CHAR);
+	H5Tinsert(type_id, "b", HOFFSET(s_t, b), H5T_NATIVE_DOUBLE);
+ write_attr(loc_id,3,dims3,"compound3D",type_id,buf33);
+ status = H5Tclose(type_id);
+ 
+/*-------------------------------------------------------------------------
+ * H5T_REFERENCE
+ *-------------------------------------------------------------------------
+ */
+ /* Create references to dataset */
+	if (dset_name)
+	{
+		for (i = 0; i < 4; i++) {
+   for (j = 0; j < 3; j++) {
+    for (k = 0; k < 2; k++)
+     status=H5Rcreate(&buf43[i][j][k],file_id,dset_name,H5R_OBJECT,-1);
+			}
+		}
+	write_attr(loc_id,3,dims3,"reference3D",H5T_STD_REF_OBJ,buf43);
+	}
+
+/*-------------------------------------------------------------------------
+ * H5T_ENUM
+ *-------------------------------------------------------------------------
+ */
+ type_id = H5Tcreate(H5T_ENUM, sizeof(e_t));
+ H5Tenum_insert(type_id, "RED",   (val = 0, &val));
+ H5Tenum_insert(type_id, "GREEN", (val = 1, &val));
+ write_attr(loc_id,3,dims3,"enum3D",type_id,0);
+ status = H5Tclose(type_id);
+
+/*-------------------------------------------------------------------------
+ * H5T_VLEN
+ *-------------------------------------------------------------------------
+ */
+ 
+	/* Allocate and initialize VL dataset to write */
+	n=0;
+	for (i = 0; i < 4; i++) {
+		for (j = 0; j < 3; j++) {
+			for (k = 0; k < 2; k++) {
+		  int l;
+		  buf53[i][j][k].p = malloc((i + 1) * sizeof(int));
+		  buf53[i][j][k].len = i + 1;
+		  for (l = 0; l < i + 1; l++)
+			 ((int *)buf53[i][j][k].p)[l] = n++;
+			}
+		}
+	}
+ 
+ space_id = H5Screate_simple(3,dims3,NULL);
+ type_id = H5Tvlen_create(H5T_NATIVE_INT);
+ attr_id = H5Acreate(loc_id,"vlen3D",type_id,space_id,H5P_DEFAULT);
+ status = H5Awrite(attr_id,type_id,buf53);
+ assert(status>=0);
+ status = H5Dvlen_reclaim(type_id,space_id,H5P_DEFAULT,buf53);
+ assert(status>=0);
  status = H5Aclose(attr_id);
+ status = H5Tclose(type_id);
  status = H5Sclose(space_id);
+
+/*-------------------------------------------------------------------------
+ * H5T_ARRAY
+ *-------------------------------------------------------------------------
+ */
+ n=1;
+	for (i = 0; i < 24; i++) {
+		for (j = 0; j < (int)dimarray[0]; j++) {
+				buf63[i][j]=n++;
+		}
+	}
+
+ type_id = H5Tarray_create(H5T_NATIVE_INT,1,dimarray,NULL);
+ write_attr(loc_id,3,dims3,"array3D",type_id,buf63);
+ status = H5Tclose(type_id);
+
+/*-------------------------------------------------------------------------
+ * H5T_INTEGER and H5T_FLOAT
+ *-------------------------------------------------------------------------
+ */
+	n=1; f=1;
+	for (i = 0; i < 4; i++) {
+		for (j = 0; j < 3; j++) {
+			for (k = 0; k < 2; k++) {
+				buf73[i][j][k]=n++;
+				buf83[i][j][k]=f++;
+			}
+		}
+	}
+ write_attr(loc_id,3,dims3,"integer3D",H5T_NATIVE_INT,buf73);
+ write_attr(loc_id,3,dims3,"float3D",H5T_NATIVE_FLOAT,buf83);
+}
+
+
+
+/*-------------------------------------------------------------------------
+ * Function: write_dset_in
+ *
+ * Purpose: write datasets in LOC_ID 
+ *
+ * Return: 
+ *
+ * Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
+ *
+ * Date: May 28, 2003
+ *
+ *-------------------------------------------------------------------------
+ */
+
+static void write_dset_in(hid_t loc_id, 
+																										const char* dset_name, /* for saving reference to dataset*/
+																										hid_t file_id)
+{
+ /* Compound datatype */
+ typedef struct s_t 
+ {
+		char   a;
+  double b;
+ } s_t;
+
+ typedef enum 
+ {
+  E_RED,
+  E_GREEN
+ } e_t;
+
+ hid_t   dset_id;
+ hid_t   space_id;  
+ hid_t   type_id;  
+	hid_t   plist_id;
+ herr_t  status;
+ int     val, i, j, k, n;
+	float   f;
+	int     fillvalue=2;
+
+	/* create 1D attributes with dimension [2], 2 elements */
+ hsize_t    dims[1]={2};
+	char       buf1[2][2]= {"ab","de"};        /* string */
+ char       buf2[2]= {1,2};                 /* bitfield, opaque */
+ s_t        buf3[2]= {{1,2},{3,4}};         /* compound */
+ hobj_ref_t buf4[2];                        /* reference */
+ hvl_t      buf5[2];                        /* vlen */
+ hsize_t    dimarray[1]={3};                /* array dimension */
+ int        buf6[2][3]= {{1,2,3},{4,5,6}};  /* array */
+	int        buf7[2]= {1,2};                 /* integer */
+	float      buf8[2]= {1,2};                 /* float */
+
+	/* create 2D attributes with dimension [3][2], 6 elements */
+ hsize_t    dims2[2]={3,2};
+	char       buf12[6][2]= {"ab","cd","ef","gh","ij","kl"};         /* string */
+ char       buf22[3][2]= {{1,2},{3,4},{5,6}};                     /* bitfield, opaque */
+ s_t        buf32[6]= {{1,2},{3,4},{5,6},{7,8},{9,10},{11,12}};   /* compound */
+ hobj_ref_t buf42[3][2];                                          /* reference */
+ hvl_t      buf52[3][2];                                          /* vlen */
+ int        buf62[6][3]= {{1,2,3},{4,5,6},{7,8,9},{10,11,12},{13,14,15},{16,17,18}};  /* array */
+	int        buf72[3][2]= {{1,2},{3,4},{5,6}};                     /* integer */
+	float      buf82[3][2]= {{1,2},{3,4},{5,6}};                     /* float */
+
+	/* create 3D attributes with dimension [4][3][2], 24 elements */
+ hsize_t    dims3[3]={4,3,2};
+	char       buf13[24][2]= {"ab","cd","ef","gh","ij","kl","mn","pq",
+	"rs","tu","vw","xz","AB","CD","EF","GH",
+	"IJ","KL","MN","PQ","RS","TU","VW","XZ"};  /* string */
+ char       buf23[4][3][2];    /* bitfield, opaque */
+ s_t        buf33[4][3][2];    /* compound */
+ hobj_ref_t buf43[4][3][2];    /* reference */
+ hvl_t      buf53[4][3][2];    /* vlen */
+ int        buf63[24][3];      /* array */
+	int        buf73[4][3][2];    /* integer */
+	float      buf83[4][3][2];    /* float */
+
+
+/*-------------------------------------------------------------------------
+ * 1D 
+ *-------------------------------------------------------------------------
+ */
+	
+/*-------------------------------------------------------------------------
+ * H5T_STRING
+ *-------------------------------------------------------------------------
+ */
+	type_id = H5Tcopy(H5T_C_S1);
+ status  = H5Tset_size(type_id, 2);
+ write_dset(loc_id,1,dims,"string",type_id,buf1);
  status = H5Tclose(type_id);
 
 /*-------------------------------------------------------------------------
@@ -3006,7 +3476,7 @@ static void gent_attr_all(void)
  *-------------------------------------------------------------------------
  */
  type_id = H5Tcopy(H5T_STD_B8LE);
- write_attr(dset_id,1,dims,"bitfield",type_id,buf2);
+ write_dset(loc_id,1,dims,"bitfield",type_id,buf2);
  status = H5Tclose(type_id);
 
 /*-------------------------------------------------------------------------
@@ -3015,7 +3485,7 @@ static void gent_attr_all(void)
  */
  type_id = H5Tcreate(H5T_OPAQUE, 1);
  status = H5Tset_tag(type_id, "1-byte opaque type"); /* must set this */
- write_attr(dset_id,1,dims,"opaque",type_id,buf2);
+ write_dset(loc_id,1,dims,"opaque",type_id,buf2);
  status = H5Tclose(type_id);
 
 /*-------------------------------------------------------------------------
@@ -3023,9 +3493,9 @@ static void gent_attr_all(void)
  *-------------------------------------------------------------------------
  */
  type_id = H5Tcreate (H5T_COMPOUND, sizeof(s_t));
- H5Tinsert(type_id, "a", HOFFSET(s_t, a), H5T_NATIVE_INT);
- H5Tinsert(type_id, "b", HOFFSET(s_t, b), H5T_NATIVE_FLOAT);
- write_attr(dset_id,1,dims,"compound",type_id,buf3);
+ H5Tinsert(type_id, "a", HOFFSET(s_t, a), H5T_NATIVE_CHAR);
+	H5Tinsert(type_id, "b", HOFFSET(s_t, b), H5T_NATIVE_DOUBLE);
+ write_dset(loc_id,1,dims,"compound",type_id,buf3);
  status = H5Tclose(type_id);
  
 /*-------------------------------------------------------------------------
@@ -3033,9 +3503,12 @@ static void gent_attr_all(void)
  *-------------------------------------------------------------------------
  */
  /* Create references to dataset */
- status=H5Rcreate(&buf4[0],file_id,"/dset",H5R_OBJECT,-1);
- status=H5Rcreate(&buf4[1],file_id,"/dset",H5R_OBJECT,-1);
- write_attr(dset_id,1,dims,"reference",H5T_STD_REF_OBJ,buf4);
+	if (dset_name)
+	{
+		status=H5Rcreate(&buf4[0],file_id,dset_name,H5R_OBJECT,-1);
+		status=H5Rcreate(&buf4[1],file_id,dset_name,H5R_OBJECT,-1);
+		write_dset(loc_id,1,dims,"reference",H5T_STD_REF_OBJ,buf4);
+	}
 
 /*-------------------------------------------------------------------------
  * H5T_ENUM
@@ -3044,7 +3517,7 @@ static void gent_attr_all(void)
  type_id = H5Tcreate(H5T_ENUM, sizeof(e_t));
  H5Tenum_insert(type_id, "RED",   (val = 0, &val));
  H5Tenum_insert(type_id, "GREEN", (val = 1, &val));
- write_attr(dset_id,1,dims,"enum",type_id,0);
+ write_dset(loc_id,1,dims,"enum",type_id,0);
  status = H5Tclose(type_id);
 
 /*-------------------------------------------------------------------------
@@ -3053,20 +3526,23 @@ static void gent_attr_all(void)
  */
  
  /* Allocate and initialize VL dataset to write */
- for(i = 0; i<2; i++) {
-  buf5[i].p = malloc((i + 1) * sizeof(int));
-  buf5[i].len = i + 1;
-  for (j = 0; j < i + 1; j++)
-   ((int *)buf5[i].p)[j] = i * 10 + j;
- }
+
+	buf5[0].len = 1;
+	buf5[0].p = malloc( 1 * sizeof(int));
+	((int *)buf5[0].p)[0]=1;
+	buf5[1].len = 2;
+	buf5[1].p = malloc( 2 * sizeof(int));
+	((int *)buf5[1].p)[0]=2;
+	((int *)buf5[1].p)[1]=3;
+
  space_id = H5Screate_simple(1,dims,NULL);
  type_id = H5Tvlen_create(H5T_NATIVE_INT);
- attr_id = H5Acreate(dset_id,"vlen",type_id,space_id,H5P_DEFAULT);
- status = H5Awrite(attr_id,type_id,buf5);
+ dset_id = H5Dcreate(loc_id,"vlen",type_id,space_id,H5P_DEFAULT);
+ status = H5Dwrite(dset_id,type_id,H5S_ALL,H5S_ALL,H5P_DEFAULT,buf5);
  assert(status>=0);
  status = H5Dvlen_reclaim(type_id,space_id,H5P_DEFAULT,buf5);
  assert(status>=0);
- status = H5Aclose(attr_id);
+ status = H5Dclose(dset_id);
  status = H5Tclose(type_id);
  status = H5Sclose(space_id);
 
@@ -3075,18 +3551,352 @@ static void gent_attr_all(void)
  *-------------------------------------------------------------------------
  */
  type_id = H5Tarray_create(H5T_NATIVE_INT,1,dimarray,NULL);
- write_attr(dset_id,1,dims,"array",type_id,buf6);
+ write_dset(loc_id,1,dims,"array",type_id,buf6);
  status = H5Tclose(type_id);
 
 /*-------------------------------------------------------------------------
  * H5T_INTEGER and H5T_FLOAT
  *-------------------------------------------------------------------------
  */
- write_attr(dset_id,1,dims,"integer",H5T_NATIVE_INT,0);
- write_attr(dset_id,1,dims,"float",H5T_NATIVE_FLOAT,0);
+ write_dset(loc_id,1,dims,"integer",H5T_NATIVE_INT,buf7);
+ write_dset(loc_id,1,dims,"float",H5T_NATIVE_FLOAT,buf8);
+
+
+/*-------------------------------------------------------------------------
+ * 2D 
+ *-------------------------------------------------------------------------
+ */
+
+/*-------------------------------------------------------------------------
+ * H5T_STRING
+ *-------------------------------------------------------------------------
+ */
+	type_id = H5Tcopy(H5T_C_S1);
+ status  = H5Tset_size(type_id, 2);
+ write_dset(loc_id,2,dims2,"string2D",type_id,buf12);
+ status = H5Tclose(type_id);
+
+/*-------------------------------------------------------------------------
+ * H5T_BITFIELD
+ *-------------------------------------------------------------------------
+ */
+ type_id = H5Tcopy(H5T_STD_B8LE);
+ write_dset(loc_id,2,dims2,"bitfield2D",type_id,buf22);
+ status = H5Tclose(type_id);
+
+/*-------------------------------------------------------------------------
+ * H5T_OPAQUE
+ *-------------------------------------------------------------------------
+ */
+ type_id = H5Tcreate(H5T_OPAQUE, 1);
+ status = H5Tset_tag(type_id, "1-byte opaque type"); /* must set this */
+ write_dset(loc_id,2,dims2,"opaque2D",type_id,buf22);
+ status = H5Tclose(type_id);
+
+/*-------------------------------------------------------------------------
+ * H5T_COMPOUND
+ *-------------------------------------------------------------------------
+ */
+ type_id = H5Tcreate (H5T_COMPOUND, sizeof(s_t));
+ H5Tinsert(type_id, "a", HOFFSET(s_t, a), H5T_NATIVE_CHAR);
+	H5Tinsert(type_id, "b", HOFFSET(s_t, b), H5T_NATIVE_DOUBLE);
+ write_dset(loc_id,2,dims2,"compound2D",type_id,buf32);
+ status = H5Tclose(type_id);
+ 
+/*-------------------------------------------------------------------------
+ * H5T_REFERENCE
+ *-------------------------------------------------------------------------
+ */
+ /* Create references to dataset */
+	if (dset_name)
+	{
+		for (i = 0; i < 3; i++) {
+   for (j = 0; j < 2; j++) {
+    status=H5Rcreate(&buf42[i][j],file_id,dset_name,H5R_OBJECT,-1);
+			}
+		}
+		write_dset(loc_id,2,dims2,"reference2D",H5T_STD_REF_OBJ,buf42);
+	}
+
+/*-------------------------------------------------------------------------
+ * H5T_ENUM
+ *-------------------------------------------------------------------------
+ */
+ type_id = H5Tcreate(H5T_ENUM, sizeof(e_t));
+ H5Tenum_insert(type_id, "RED",   (val = 0, &val));
+ H5Tenum_insert(type_id, "GREEN", (val = 1, &val));
+ write_dset(loc_id,2,dims2,"enum2D",type_id,0);
+ status = H5Tclose(type_id);
+
+/*-------------------------------------------------------------------------
+ * H5T_VLEN
+ *-------------------------------------------------------------------------
+ */
+
+	/* Allocate and initialize VL dataset to write */
+	n=0;
+	for (i = 0; i < 3; i++) {
+		for (j = 0; j < 2; j++) {
+		  int l;
+		  buf52[i][j].p = malloc((i + 1) * sizeof(int));
+		  buf52[i][j].len = i + 1;
+		  for (l = 0; l < i + 1; l++)
+			 ((int *)buf52[i][j].p)[l] = n++;
+		}
+	}
+ 
+ space_id = H5Screate_simple(2,dims2,NULL);
+ type_id = H5Tvlen_create(H5T_NATIVE_INT);
+ dset_id = H5Dcreate(loc_id,"vlen2D",type_id,space_id,H5P_DEFAULT);
+ status = H5Dwrite(dset_id,type_id,H5S_ALL,H5S_ALL,H5P_DEFAULT,buf52);
+ assert(status>=0);
+ status = H5Dvlen_reclaim(type_id,space_id,H5P_DEFAULT,buf52);
+ assert(status>=0);
+ status = H5Dclose(dset_id);
+ status = H5Tclose(type_id);
+ status = H5Sclose(space_id);
+
+/*-------------------------------------------------------------------------
+ * H5T_ARRAY
+ *-------------------------------------------------------------------------
+ */
+ type_id = H5Tarray_create(H5T_NATIVE_INT,1,dimarray,NULL);
+ write_dset(loc_id,2,dims2,"array2D",type_id,buf62);
+ status = H5Tclose(type_id);
+
+/*-------------------------------------------------------------------------
+ * H5T_INTEGER, write a fill value
+ *-------------------------------------------------------------------------
+ */
+	plist_id = H5Pcreate(H5P_DATASET_CREATE);
+	status = H5Pset_fill_value(plist_id, H5T_NATIVE_INT, &fillvalue);
+	space_id = H5Screate_simple(2,dims2,NULL);
+	dset_id = H5Dcreate(loc_id,"integer2D",H5T_NATIVE_INT,space_id,plist_id);
+	status = H5Dwrite(dset_id,H5T_NATIVE_INT,H5S_ALL,H5S_ALL,H5P_DEFAULT,buf72);
+	status = H5Pclose(plist_id);
+	status = H5Dclose(dset_id);
+ status = H5Sclose(space_id);
+
+/*-------------------------------------------------------------------------
+ * H5T_FLOAT
+ *-------------------------------------------------------------------------
+ */
+
+ write_dset(loc_id,2,dims2,"float2D",H5T_NATIVE_FLOAT,buf82);
+
+	
+/*-------------------------------------------------------------------------
+ * 3D 
+ *-------------------------------------------------------------------------
+ */
+
+/*-------------------------------------------------------------------------
+ * H5T_STRING
+ *-------------------------------------------------------------------------
+ */
+	type_id = H5Tcopy(H5T_C_S1);
+ status  = H5Tset_size(type_id, 2);
+ write_dset(loc_id,3,dims3,"string3D",type_id,buf13);
+ status = H5Tclose(type_id);
+
+/*-------------------------------------------------------------------------
+ * H5T_BITFIELD
+ *-------------------------------------------------------------------------
+ */
+
+	n=1;
+	for (i = 0; i < 4; i++) {
+		for (j = 0; j < 3; j++) {
+			for (k = 0; k < 2; k++) {
+				buf23[i][j][k]=n++;
+			}
+		}
+	}
+ type_id = H5Tcopy(H5T_STD_B8LE);
+ write_dset(loc_id,3,dims3,"bitfield3D",type_id,buf23);
+ status = H5Tclose(type_id);
+
+/*-------------------------------------------------------------------------
+ * H5T_OPAQUE
+ *-------------------------------------------------------------------------
+ */
+ type_id = H5Tcreate(H5T_OPAQUE, 1);
+ status = H5Tset_tag(type_id, "1-byte opaque type"); /* must set this */
+ write_dset(loc_id,3,dims3,"opaque3D",type_id,buf23);
+ status = H5Tclose(type_id);
+
+/*-------------------------------------------------------------------------
+ * H5T_COMPOUND
+ *-------------------------------------------------------------------------
+ */
+
+	n=1;
+	for (i = 0; i < 4; i++) {
+		for (j = 0; j < 3; j++) {
+			for (k = 0; k < 2; k++) {
+				buf33[i][j][k].a=n++;
+				buf33[i][j][k].b=n++;
+			}
+		}
+	}
+ type_id = H5Tcreate (H5T_COMPOUND, sizeof(s_t));
+ H5Tinsert(type_id, "a", HOFFSET(s_t, a), H5T_NATIVE_CHAR);
+	H5Tinsert(type_id, "b", HOFFSET(s_t, b), H5T_NATIVE_DOUBLE);
+ write_dset(loc_id,3,dims3,"compound3D",type_id,buf33);
+ status = H5Tclose(type_id);
+ 
+/*-------------------------------------------------------------------------
+ * H5T_REFERENCE
+ *-------------------------------------------------------------------------
+ */
+ /* Create references to dataset */
+	if (dset_name)
+	{
+		for (i = 0; i < 4; i++) {
+   for (j = 0; j < 3; j++) {
+    for (k = 0; k < 2; k++)
+     status=H5Rcreate(&buf43[i][j][k],file_id,dset_name,H5R_OBJECT,-1);
+			}
+		}
+	write_dset(loc_id,3,dims3,"reference3D",H5T_STD_REF_OBJ,buf43);
+	}
+
+/*-------------------------------------------------------------------------
+ * H5T_ENUM
+ *-------------------------------------------------------------------------
+ */
+ type_id = H5Tcreate(H5T_ENUM, sizeof(e_t));
+ H5Tenum_insert(type_id, "RED",   (val = 0, &val));
+ H5Tenum_insert(type_id, "GREEN", (val = 1, &val));
+ write_dset(loc_id,3,dims3,"enum3D",type_id,0);
+ status = H5Tclose(type_id);
+
+/*-------------------------------------------------------------------------
+ * H5T_VLEN
+ *-------------------------------------------------------------------------
+ */
+ 
+	/* Allocate and initialize VL dataset to write */
+	n=0;
+	for (i = 0; i < 4; i++) {
+		for (j = 0; j < 3; j++) {
+			for (k = 0; k < 2; k++) {
+		  int l;
+		  buf53[i][j][k].p = malloc((i + 1) * sizeof(int));
+		  buf53[i][j][k].len = i + 1;
+		  for (l = 0; l < i + 1; l++)
+			 ((int *)buf53[i][j][k].p)[l] = n++;
+			}
+		}
+	}
+ 
+ space_id = H5Screate_simple(3,dims3,NULL);
+ type_id = H5Tvlen_create(H5T_NATIVE_INT);
+ dset_id = H5Dcreate(loc_id,"vlen3D",type_id,space_id,H5P_DEFAULT);
+ status = H5Dwrite(dset_id,type_id,H5S_ALL,H5S_ALL,H5P_DEFAULT,buf53);
+ assert(status>=0);
+ status = H5Dvlen_reclaim(type_id,space_id,H5P_DEFAULT,buf53);
+ assert(status>=0);
+ status = H5Dclose(dset_id);
+ status = H5Tclose(type_id);
+ status = H5Sclose(space_id);
+
+/*-------------------------------------------------------------------------
+ * H5T_ARRAY
+ *-------------------------------------------------------------------------
+ */
+ n=1;
+	for (i = 0; i < 24; i++) {
+		for (j = 0; j < (int)dimarray[0]; j++) {
+				buf63[i][j]=n++;
+		}
+	}
+
+ type_id = H5Tarray_create(H5T_NATIVE_INT,1,dimarray,NULL);
+ write_dset(loc_id,3,dims3,"array3D",type_id,buf63);
+ status = H5Tclose(type_id);
+
+/*-------------------------------------------------------------------------
+ * H5T_INTEGER and H5T_FLOAT
+ *-------------------------------------------------------------------------
+ */
+	n=1; f=1;
+	for (i = 0; i < 4; i++) {
+		for (j = 0; j < 3; j++) {
+			for (k = 0; k < 2; k++) {
+				buf73[i][j][k]=n++;
+				buf83[i][j][k]=f++;
+			}
+		}
+	}
+ write_dset(loc_id,3,dims3,"integer3D",H5T_NATIVE_INT,buf73);
+ write_dset(loc_id,3,dims3,"float3D",H5T_NATIVE_FLOAT,buf83);
+}
+
+
+
+
+/*-------------------------------------------------------------------------
+ * Function: gent_attr_all
+ *
+ * Purpose: generate all datatype attributes  
+ *
+ * Return: void
+ *
+ * Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
+ *
+ * Date: May 19, 2003
+ *
+ *-------------------------------------------------------------------------
+ */
+
+static void gent_attr_all(void)
+{
+ hid_t   file_id; 
+ hid_t   dset_id;
+	hid_t   group_id;
+	hid_t   group2_id;
+	hid_t   root_id;
+	hid_t   space_id;
+	hsize_t dims[1]={2};
+ herr_t  status;
+
+ /* Create a file and a dataset */
+ file_id  = H5Fcreate(FILE40, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT); 
+
+	/* Create a 1D dataset */
+ space_id = H5Screate_simple(1,dims,NULL);
+ dset_id  = H5Dcreate(file_id,"dset",H5T_NATIVE_INT,space_id,H5P_DEFAULT);
+ status   = H5Sclose(space_id);
+
+	/* Create groups */
+ group_id  = H5Gcreate(file_id,"g1",0);
+	group2_id = H5Gcreate(file_id,"g2",0);
+ root_id   = H5Gopen(file_id, "/");
+
+/*-------------------------------------------------------------------------
+ * write a series of attributes on the dataset, group
+ *-------------------------------------------------------------------------
+ */
+
+	write_attr_in(dset_id,"dset",file_id);
+	write_attr_in(group_id,NULL,0);
+	write_attr_in(root_id,NULL,0);
+
+/*-------------------------------------------------------------------------
+ * write a series of datasets on group 2
+ *-------------------------------------------------------------------------
+ */
+
+	write_dset_in(group2_id,"/dset",file_id);
 
  /* Close */
  status = H5Dclose(dset_id);
+	status = H5Gclose(group_id);
+	status = H5Gclose(group2_id);
+	status = H5Gclose(root_id);
+
+	/* Close file */
  status = H5Fclose(file_id);
 }
 
@@ -3103,6 +3913,7 @@ static void gent_attr_all(void)
  *-------------------------------------------------------------------------
  */
 
+static 
 int write_attr(hid_t loc_id, int rank, hsize_t *dims, const char *attr_name,
                hid_t type_id, void *buf)
 {
@@ -3126,6 +3937,47 @@ int write_attr(hid_t loc_id, int rank, hsize_t *dims, const char *attr_name,
  return status;
 }
 
+/*-------------------------------------------------------------------------
+ * Function: write_dset
+ *
+ * Purpose: utility function to create and write a dataset in LOC_ID
+ *
+ * Return: 
+ *
+ * Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
+ *
+ * Date: May 27, 2003
+ *
+ *-------------------------------------------------------------------------
+ */
+
+static
+int write_dset( hid_t loc_id, int rank, hsize_t *dims, const char *dset_name,
+                hid_t type_id, void *buf )
+{
+ hid_t   dset_id;
+ hid_t   space_id;  
+ herr_t  status;
+
+ /* Create a buf space  */
+ space_id = H5Screate_simple(rank,dims,NULL);
+
+ /* Create a dataset */
+ dset_id = H5Dcreate(loc_id,dset_name,type_id,space_id,H5P_DEFAULT);
+  
+ /* Write the buf */
+ if ( buf )
+  status = H5Dwrite(dset_id,type_id,H5S_ALL,H5S_ALL,H5P_DEFAULT,buf);
+
+ /* Close */
+ status = H5Dclose(dset_id);
+ status = H5Sclose(space_id);
+
+ return status;
+
+}
+
+
 
 /*-------------------------------------------------------------------------
  * Function: main