From 9446aa1a1bb1cfb13203120fcb66148b970041ad Mon Sep 17 00:00:00 2001
From: Scot Breitenfeld <brtnfld@hdfgroup.org>
Date: Fri, 22 May 2009 15:41:02 -0500
Subject: [svn-r16981] Description:

Fixed H5LRmake_dataset, passes tests. All APIs now work and tested.

Platforms tested: smirom (icc, gcc)
---
 hl/src/H5LR.c               | 379 ++++++++++++++++++++++----------------------
 hl/test/test_regref_hyper.c |  59 +------
 2 files changed, 198 insertions(+), 240 deletions(-)

diff --git a/hl/src/H5LR.c b/hl/src/H5LR.c
index 3057334..6581192 100644
--- a/hl/src/H5LR.c
+++ b/hl/src/H5LR.c
@@ -246,6 +246,7 @@ H5LRread_region(hid_t obj_id,               /* -IN-      Id. of any object in a
     hid_t dset = -1, file_space = -1;   /* Identifier of the dataset's dataspace in the file */
     hid_t mem_space = -1;               /* Identifier of the memory dataspace                */
     herr_t status;
+    hid_t current_stack_id = -1;
 
     /* Open the HDF5 object referenced */
     dset = H5Rdereference(obj_id, H5R_DATASET_REGION, ref);
@@ -286,9 +287,12 @@ H5LRread_region(hid_t obj_id,               /* -IN-      Id. of any object in a
     } /* end if */
 
 CATCH
+   
+   current_stack_id = H5Eget_current_stack();
+
    /* Close appropriate items */
    if(mem_space > 0)
-      status =H5Sclose(mem_space);
+     status =H5Sclose(mem_space);
 
    if(file_space > 0)
      status =H5Sclose(file_space);
@@ -296,6 +300,8 @@ CATCH
    if(dset > 0)
      status =H5Dclose(dset);
 
+   status = H5Eset_current_stack(current_stack_id);
+
 END_FUNC(PUB)
 
 
@@ -329,7 +335,7 @@ H5LRcreate_region_references(hid_t file_id,
   int i, j, nstart;
   hsize_t *start, *count;
   hid_t current_stack_id = -1;
-  /* flags marking if start and count were allocated */
+  /* flags marking state of allocation */
   hbool_t start_alloc = FALSE;
   hbool_t count_alloc = FALSE;
 
@@ -449,32 +455,27 @@ BEGIN_FUNC(PUB, ERR,
 			    const size_t buf_size, const hid_t *loc_id_ref, const hdset_reg_ref_t *ref) )
 
   hid_t dset_ref = -1, sid_ref = -1;
-  H5S_sel_type sel_type;
-  hid_t dset_id;
+  hid_t dset_id, memspace;
   int nrank;
   size_t i;
   int j;
   hsize_t *dims1;
   void *buf;
   herr_t status;
-  hid_t  sid;
+  hid_t  filespace;
   size_t numelem;
-  hsize_t *start, *end;
+  hsize_t *start;
   hsize_t *bounds_coor;
   hid_t current_stack_id = -1;
-/* flags marking if dims1, bounds_coor and buf were allocated */
+  int counter;
+/* flags marking state of allocation */
   hbool_t dims1_alloc = FALSE;
   hbool_t bounds_coor_alloc = FALSE;
   hbool_t buf_alloc = FALSE;
   hbool_t start_alloc = FALSE;
-  hbool_t end_alloc = FALSE;
-  
-  hsize_t maxdims[2];
-  hid_t dcpl;
-  hsize_t chunk[2];
 
 /* loop through the region references to get the overall size 
- * so we can specify the entire dataset and then right 
+ * so we can specify the entire dataset and then write 
  * each region by hyperslab.
  */
 
@@ -485,16 +486,14 @@ BEGIN_FUNC(PUB, ERR,
 
     /* Retrieve the dataspace with the specified region selected */
     sid_ref = H5Rget_region (dset_ref, H5R_DATASET_REGION, ref[i]);
-     
     if(sid_ref < 0)
       H5E_THROW(H5E_CANTGET, "H5LR: Retrieving dataspace referenced failed")
+
     /* get the rank of the region reference */
     nrank = H5Sget_simple_extent_ndims(sid_ref);
     if(nrank < 0)
       H5E_THROW(H5E_NOTFOUND, "H5LR: Failed to find extents of dataspace")
 
-    /* check to make sure the ranks are all the same */
-
     /* Allocate space for the dimension array */
     if(i == 0) {
       dims1 = (hsize_t *)malloc (sizeof (hsize_t) * nrank);
@@ -502,6 +501,9 @@ BEGIN_FUNC(PUB, ERR,
 	H5E_THROW(H5E_CANTALLOC, "H5LR: Failed to allocate enough memory")
       dims1_alloc = TRUE;
       for (j=0; j<nrank; j++) dims1[j]=0;
+    } else {
+    /* check to make sure the ranks are all the same */
+
     }
 
     /* get extents of the referenced data */
@@ -516,191 +518,198 @@ BEGIN_FUNC(PUB, ERR,
 
     for (j=0; j<nrank; j++) {
       if(j != nrank - 1) {
-       dims1[j] = bounds_coor[nrank +j] - bounds_coor[j] + 1;
+       dims1[j] += bounds_coor[nrank +j] - bounds_coor[j] + 1;
       } 
       else {
-	dims1[j] += bounds_coor[nrank +j] - bounds_coor[j] + 1;
+       dims1[j] = bounds_coor[nrank +j] - bounds_coor[j] + 1;
       }
     }
 
      /* closes */
+    if(dset_ref > 0) {
+      status = H5Dclose(dset_ref);
+      dset_ref = -1;
+      if(status < 0) {
+	H5E_THROW(H5E_CLOSEERROR, "H5LR: Failed to close dataset")
+	  }
+    }
+    if(sid_ref > 0) {
+      status = H5Sclose(sid_ref);
+      sid_ref = -1;
+      if(status < 0) {
+	H5E_THROW(H5E_CLOSEERROR, "H5LR: Failed to close dataspace")
+	  }
+    }
+
+    free(bounds_coor);
+    bounds_coor_alloc = FALSE;
 
-     if(dset_ref > 0) {
-       status = H5Dclose(dset_ref);
-       dset_ref = -1;
-       if(status < 0) {
-	 H5E_THROW(H5E_CLOSEERROR, "H5LR: Failed to close dataset")
-	   }
-     }
-     if(sid_ref > 0) {
-       status = H5Sclose(sid_ref);
-       sid_ref = -1;
-       if(status < 0) {
-	 H5E_THROW(H5E_CLOSEERROR, "H5LR: Failed to close dataspace")
-	   }
-     }
   }
 
-/*     for (j=0; j<nrank; j++)  */
-/*        dims1[j] = bounds_coor[nrank +j] - bounds_coor[j] + 1; */
-
-/*      numelem = H5Sget_select_npoints(sid_ref); */
-/*      if(status < 0) { */
-/*        H5E_THROW(H5E_CANTCOUNT, "H5LR: Failed to retrieve number of points in hyperslab") */
-/*      } /\* end if *\/ */
-/*      buf = malloc(sizeof(type_id) * numelem); */
-/*      if(buf == NULL){ */
-/*        H5E_THROW(H5E_CANTALLOC, "H5LR: Failed to allocate enough memory") */
-/* 	 } */
-/*      buf_alloc = TRUE; */
-/*      status= H5LRread_region(loc_id_ref[i], */
-/* 			     (const hdset_reg_ref_t*)ref[i],  */
-/* 			     type_id, */
-/* 			     &numelem, */
-/* 			     buf ); */
-/*      if(status < 0) */
-/*        H5E_THROW(H5E_NONE_MINOR, "H5LR: Failed in internal H5LRread_region") */
-
-/*     start = malloc(sizeof(hsize_t) * nrank); */
-/*     if(start == NULL) */
-/*       H5E_THROW(H5E_CANTALLOC, "H5LR: Failed to allocate enough memory") */
-/*     start_alloc = TRUE; */
-
-/*     end = malloc(sizeof(hsize_t) * nrank); */
-/*     if(end == NULL) */
-/*       H5E_THROW(H5E_CANTALLOC, "H5LR: Failed to allocate enough memory") */
-/*     end_alloc = TRUE; */
-
-/*     status = H5Sget_select_bounds(sid_ref, start, end); */
-/*     if(status < 0) */
-/*       H5E_THROW(H5E_CANTGETSIZE, "H5LR: Failed to find bounds of dataspace") */
-
-/*     if(i==0) { */
-
-/*       for(j=0; j < nrank; j++) */
-/* 	maxdims[j] = H5S_UNLIMITED; */
-
-/*      /\* Create new dataspace for new datasets *\/ */
-/*       sid = H5Screate_simple(nrank, dims1, maxdims); */
-/*       if(sid < 0) */
-/* 	H5E_THROW(H5E_CANTCREATE, "H5LR: Unable to create dataspace") */
-
-/*     /\* Create the dataset creation property list, and set the chunk size *\/ */
-/*       dcpl = H5Pcreate (H5P_DATASET_CREATE); */
-/*       chunk[0] = ; */
-/*       chunk[1] = ; */
-/*       status = H5Pset_chunk (dcpl, nrank, chunk); */
-
-/*       dset_id = H5Dcreate2(loc_id, path, type_id, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT  ); */
-/*       if(dset_id < 0) */
-/* 	H5E_THROW(H5E_CANTCREATE, "H5LR: Unable to create dataset") */
-
-/*      status = H5Dwrite(dset_id, type_id, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf); */
-/*      if(status < 0) */
-/*        H5E_THROW(H5E_CANTCREATE, "H5LR: Unable to create dataset") */
-/*      } */
-/*      else { */
-/*        /\* Add on to new dataspace for new datasets *\/ */
-
-
-/*        } */
+/* Create the dataspace for the new dataset */
+   filespace = H5Screate_simple(nrank, dims1, NULL);
+   if(filespace < 0)
+     H5E_THROW(H5E_CANTCREATE, "H5LR: Unable to create dataspace")
+
+   free(dims1);
+   dims1_alloc = FALSE;
+
+   dset_id = H5Dcreate2(loc_id, path, type_id, filespace, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT );
+   if(dset_id < 0)
+       H5E_THROW(H5E_CANTCREATE, "H5LR: Unable to create dataset")
+
+
+   start = (hsize_t *)malloc (sizeof (hsize_t) * nrank);
+   if(start == NULL)
+     H5E_THROW(H5E_CANTALLOC, "H5LR: Failed to allocate enough memory")
+   start_alloc = TRUE;
+
+
+/* loop over the region references to write data into new data set */
+
+  counter = 0;
+  for (i=0; i<buf_size; i++) {
+    dset_ref = H5Rdereference(loc_id_ref[i], H5R_DATASET_REGION, ref[i]);
+    if(dset_ref < 0)
+      H5E_THROW(H5E_NOTFOUND, "H5LR: Failed to open object referenced")
+
+    /* Retrieve the dataspace with the specified region selected */
+    sid_ref = H5Rget_region (dset_ref, H5R_DATASET_REGION, ref[i]);
+    if(sid_ref < 0)
+      H5E_THROW(H5E_CANTGET, "H5LR: Retrieving dataspace referenced failed")
+
+    /* Allocate space for the dimension array */
+    dims1 = (hsize_t *)malloc (sizeof (hsize_t) * nrank);
+    if(dims1 == NULL)
+      H5E_THROW(H5E_CANTALLOC, "H5LR: Failed to allocate enough memory")
+    dims1_alloc = TRUE;
+
+    /* get extents of the referenced data */
+    bounds_coor = (hsize_t *)malloc(sizeof (hsize_t) * nrank * 2);
+    if(bounds_coor == NULL)
+      H5E_THROW(H5E_CANTALLOC, "H5LR: Failed to allocate enough memory")
+    bounds_coor_alloc = TRUE;
+
+    /* a region reference is only allowed to reference one block */
+    status = H5Sget_select_hyper_blocklist(sid_ref, (hsize_t)0, (hsize_t)1, bounds_coor  );
+    if(status < 0)
+      H5E_THROW(H5E_CANTSELECT, "H5LR: Failed to find list of hyperslab blocks")
+
+    for(j=0; j<nrank; j++) 
+      dims1[j] = bounds_coor[nrank +j] - bounds_coor[j] + 1;
+
+    numelem = H5Sget_select_npoints(sid_ref);
+    if(status < 0)
+      H5E_THROW(H5E_CANTCOUNT, "H5LR: Failed to retrieve number of points in hyperslab")
+
+    buf = malloc(sizeof(type_id) * numelem);
+    if(buf == NULL)
+      H5E_THROW(H5E_CANTALLOC, "H5LR: Failed to allocate enough memory")
+    buf_alloc = TRUE;
+
+    status= H5LRread_region(loc_id_ref[i],
+			    (const hdset_reg_ref_t*)ref[i], 
+			    type_id,
+			    &numelem,
+			    buf );
+    if(status < 0)
+       H5E_THROW(H5E_NONE_MINOR, "H5LR: Failed in internal H5LRread_region")
+
+    start[0] = counter;
+    for (j=1; j<nrank; j++) start[j] = 0; /* start at the beginning for other dimensions*/
+
+    counter += dims1[0];
+    memspace = H5Screate_simple(nrank, dims1, NULL);
+    /*
+     * Select hyperslab in the file.
+     */
+    status = H5Sselect_hyperslab(filespace, H5S_SELECT_SET, start, NULL, dims1, NULL);
+    if(status < 0)
+      H5E_THROW(H5E_CANTSELECT, "H5LR: Failed to select hyperslab")
+
+    status = H5Dwrite(dset_id, type_id, memspace, filespace, H5P_DEFAULT, buf);
+    if(status < 0)
+      H5E_THROW(H5E_CANTCREATE, "H5LR: Unable to create dataset")
 
      /* closes */
 
-/*      if(sid > 0) { */
-/*        status = H5Sclose(sid); */
-/*        sid = -1; */
-/*        if(status < 0) { */
-/* 	 H5E_THROW(H5E_CLOSEERROR, "H5LR: Failed to close dataspace") */
-/* 	   } */
-/*      } */
-
-/*      if(dset_id > 0) { */
-/*        status = H5Dclose(dset_id); */
-/*        dset_id = -1; */
-/*        if(status < 0) { */
-/* 	 H5E_THROW(H5E_CLOSEERROR, "H5LR: Failed to close dataset") */
-/* 	   } */
-/*      } */
-     
-/*      if(dset_ref > 0) { */
-/*        status = H5Dclose(dset_ref); */
-/*        dset_ref = -1; */
-/*        if(status < 0) { */
-/* 	 H5E_THROW(H5E_CLOSEERROR, "H5LR: Failed to close dataset") */
-/* 	   } */
-/*      } */
-/*      if(sid_ref > 0) { */
-/*        status = H5Sclose(sid_ref); */
-/*        sid_ref = -1; */
-/*        if(status < 0) { */
-/* 	 H5E_THROW(H5E_CLOSEERROR, "H5LR: Failed to close dataspace") */
-/* 	   } */
-/*      } */
-
-/*      free(bounds_coor); */
-/*      free(buf); */
-/*      free(start); */
-/*      free(end); */
-
-/*      bounds_coor_alloc = FALSE; */
-/*      buf_alloc = FALSE; */
-/*      start_alloc = FALSE; */
-/*      end_alloc = FALSE; */
-
-/*   } */
-     free(dims1);
-     dims1_alloc = FALSE;
-/*   /\* Find the rank of the dataspace *\/ */
-/*   ndim = H5Sget_simple_extent_ndims(sid1); */
-
-/*   /\* Allocate space for the dimension array *\/ */
-/*   dims1 = (hsize_t *)malloc (sizeof (hsize_t) * ndim); */
-
-/*   /\* find the dimensions of each data space from the block coordinates *\/ */
-/*   for (i=0; i<ndim; i++) */
-/*     dims1[i] = block_coord[i+ndim] - block_coord[i] + 1; */
-
-/*   /\* Create dataspace for reading buffer *\/ */
-/*   sid2 = H5Screate_simple(ndim, dims1, NULL); */
-
-/*   /\* Select (x , x , ..., x ) x (y , y , ..., y ) hyperslab for reading memory dataset *\/ */
-/*   /\*          1   2        n      1   2        n                                       *\/ */
-
-/*   start = (hsize_t *)malloc (sizeof (hsize_t) * ndim); */
-/*   count = (hsize_t *)malloc (sizeof (hsize_t) * ndim); */
-/*   for (i=0; i<ndim; i++) { */
-/*     start[i] = block_coord[i]; */
-/*     count[i] = dims1[i]; */
-/*   } */
-
-/*   status = H5Sselect_hyperslab(sid1,H5S_SELECT_SET,start,NULL,count,NULL); */
-
-/*   status = H5Dread(dset_id, mem_type, sid2, sid1, H5P_DEFAULT, buf);  */
+    if(dset_ref > 0) {
+      status = H5Dclose(dset_ref);
+      dset_ref = -1;
+      if(status < 0) {
+	H5E_THROW(H5E_CLOSEERROR, "H5LR: Failed to close dataset")
+	  }
+    }
+    if(sid_ref > 0) {
+      status = H5Sclose(sid_ref);
+      sid_ref = -1;
+      if(status < 0) {
+	H5E_THROW(H5E_CLOSEERROR, "H5LR: Failed to close dataspace")
+	  }
+    }
+    if(memspace > 0) {
+      status = H5Sclose(memspace);
+      memspace = -1;
+      if(status < 0) {
+	H5E_THROW(H5E_CLOSEERROR, "H5LR: Failed to close dataspace")
+	  }
+    }
+
+
+    free(dims1);
+    free(bounds_coor);
+    free(buf);
+
+    dims1_alloc = FALSE;
+    bounds_coor_alloc = FALSE;
+    buf_alloc = FALSE;
+
+  }
+
+if(dset_id > 0) {
+  status = H5Dclose(dset_id);
+  dset_id = -1;
+  if(status < 0) {
+    H5E_THROW(H5E_CLOSEERROR, "H5LR: Failed to close dataset")
+      }
+ }
+
+if(filespace > 0) {
+  status = H5Sclose(filespace);
+  filespace = -1;
+  if(status < 0) {
+    H5E_THROW(H5E_CLOSEERROR, "H5LR: Failed to close dataspace")
+      }
+ }
+
+free(start);
+start_alloc = FALSE;
 
 CATCH
 
-    current_stack_id = H5Eget_current_stack();
+current_stack_id = H5Eget_current_stack();
 
-    if(dims1_alloc) free(dims1);
-    if(bounds_coor_alloc) free(bounds_coor);
-    if(buf_alloc) free(buf);
-    if(start_alloc) free(start);
-    if(end_alloc) free(end);
- 
-    if(sid > 0)
-     status = H5Sclose(sid);
+if(dims1_alloc) free(dims1);
+if(bounds_coor_alloc) free(bounds_coor);
+if(buf_alloc) free(buf);
+if(start_alloc) free(start);
 
-    if(dset_id > 0)
-     status = H5Dclose(dset_id);
-     
-    if(dset_ref > 0)
-      status = H5Dclose(dset_ref);
+if(filespace > 0)
+  status = H5Sclose(filespace);
 
-    if(sid_ref > 0)
-      status = H5Sclose(sid_ref);
+if(memspace > 0)
+  status = H5Sclose(memspace);
 
-    status = H5Eset_current_stack(current_stack_id);
+if(dset_id > 0)
+  status = H5Dclose(dset_id);
+
+if(dset_ref > 0)
+  status = H5Dclose(dset_ref);
+
+if(sid_ref > 0)
+  status = H5Sclose(sid_ref);
+
+status = H5Eset_current_stack(current_stack_id);
 
 END_FUNC(PUB)
 
@@ -742,11 +751,10 @@ H5LRcopy_region(hid_t obj_id,
   hsize_t *start, *count;
   hsize_t *bounds_coor;
   hid_t dtype;
-  /* flags marking if dims, bounds_coor and buf were allocated */
+  /* flags marking state of allocation */
   hbool_t dims_alloc = FALSE;
   hbool_t bounds_coor_alloc = FALSE;
   hbool_t buf_alloc = FALSE;
-  /* flags marking if start and count were allocated */
   hbool_t start_alloc = FALSE;
   hbool_t count_alloc = FALSE;
   hid_t current_stack_id = -1;
@@ -1008,12 +1016,11 @@ H5LRcopy_references(hid_t obj_id, hdset_reg_ref_t *ref, const char *file,
   hsize_t *start, *count;
   hsize_t *bounds_coor;
   hid_t dtype;
-  /* flags marking if dims1, bounds_coor and buf were allocated */
+  /* flags marking state of allocation */
   hbool_t dims_src_alloc = FALSE;
   hbool_t dims1_alloc = FALSE;
   hbool_t bounds_coor_alloc = FALSE;
   hbool_t buf_alloc = FALSE;
-  /* flags marking if start and count were allocated */
   hbool_t start_alloc = FALSE;
   hbool_t count_alloc = FALSE;
   hid_t current_stack_id = -1;
diff --git a/hl/test/test_regref_hyper.c b/hl/test/test_regref_hyper.c
index ba0c39a..cf88823 100644
--- a/hl/test/test_regref_hyper.c
+++ b/hl/test/test_regref_hyper.c
@@ -79,7 +79,7 @@ int main(void)
     hsize_t block_coord[4] ={ 3, 3, 5, 4};
     hsize_t num_elem = 2;
     const char *path[num_elem];
-    hsize_t block_coord_6[6] ={ 4, 6, 5, 7, 0, 0, 1, 2};
+    hsize_t block_coord_6[8] ={ 4, 6, 5, 7, 0, 0, 2, 1};
     hsize_t block_coord_4[4] ={ 1, 3, 3, 4};
     hsize_t block_coord_1D_src[2] ={ 0, 5};
     hsize_t block_coord_1D_dest[2] ={ 5, 10};
@@ -259,16 +259,6 @@ int main(void)
 /* 		    NULL, */
 /* 		    H5R_DATASET_REGION ); */
 
-/*     status = H5LRget_region_info(-1, */
-/* 				 NULL, */
-/* 				 NULL, */
-/* 				 &nlength, */
-/* 				 &rank_out, */
-/* 				 NULL, */
-/* 				 NULL, */
-/* 				 H5R_DATASET_REGION ); */
-
-
 /*     if(status < 0 )  */
 /*       printf(" Testing for incorrect object id, PASSED \n"); */
 
@@ -314,30 +304,8 @@ int main(void)
     if(buf[0] != 3 || buf[1] != 3 || buf[2] != 5 || buf[3] != 4)
       printf(" VALIDATION ERROR: hyperslab coordinates\n");
 
-/*     size  = H5Tget_size(dtype); */
-
-/*     /\* */
-/*      * Allocate array of pointers to rows. */
-/*      *\/ */
-/*     rdata = (int **) malloc ( (buf[2]-buf[0]+1 )* sizeof (int *)); */
-
-/*     /\* */
-/*      * Allocate space for integer data. */
-/*      *\/ */
-/*     rdata[0] = (int *) malloc ( (buf[2]-buf[0]+1) * (buf[3]-buf[1]+1) * sizeof (int)); */
-
-/*     /\* */
-/*      * Set the rest of the pointers to rows to the correct addresses. */
-/*      *\/ */
-/*     for (i=1; i<(buf[2]-buf[0]+1); i++) */
-/*         rdata[i] = rdata[0] + i * (buf[3]-buf[1]+1); */
-
-
-/*     rdata = ( int **) malloc(  numelem * sizeof (int *) ); */
-
-
     /* Read a region of the data using a region reference */
-/*     file_id = -1; */
+     /* file_id = -1; */
 
     if ( H5LRread_region(file_id, 
 			 &ref[1], 
@@ -383,15 +351,6 @@ int main(void)
 	}
       printf("\n");
     }
- 
-
-/*     status = H5LTcopy_region(filename,  */
-/* 			     "/Group_1D/DS1", */
-/* 	                     block_coord_1D_src, */
-/* 			     filename, */
-/*  			     "/Group_1D/DS1", */
-/*  			     block_coord_1D_dest); */
-
 
     /* copy a region described by blocks to another region described by another block */
     status = H5LTcopy_region(filename,
@@ -429,6 +388,7 @@ int main(void)
     printf("2D DATA AFTER H5LRCOPY_REFERENCES: [(%d,%d)-(%d,%d)] --> [(%d,%d)-(%d,%d)]",
 	   (int)block_coord[0],(int)block_coord[1],(int)block_coord[2],(int)block_coord[3],
 	   (int)block_coord_2D_dest_a[0], (int)block_coord_2D_dest_a[1],(int)block_coord_2D_dest_a[2], (int)block_coord_2D_dest_a[3]);
+
     for (i=0; i<9; i++) {
       printf("\n[ ");
       for (j=0; j<8; j++) {
@@ -473,6 +433,7 @@ int main(void)
     printf("2D DATA AFTER H5LRCOPY_REGION: [(%d,%d)-(%d,%d)] --> [(%d,%d)-(%d,%d)]",
 	   (int)block_coord[0],(int)block_coord[1],(int)block_coord[2],(int)block_coord[3],
 	   (int)block_coord_4[0], (int)block_coord_4[1],(int)block_coord_4[2], (int)block_coord_4[3]);
+
     for (i=0; i<9; i++) {
       printf("\n[ ");
       for (j=0; j<8; j++) {
@@ -490,17 +451,7 @@ int main(void)
     for (i=0; i<num_elem; i++) 
       file_id_array[i] = file_id;
 
-
-/*     status = H5LRmake_dataset(file_id, "/Group_2D/DS2a", H5T_NATIVE_INT, num_elem, file_id_array, ref6); */
-
-
-
-
-/*        printf("Selected  hyperslab: "); */
-/*     for (i=0; i<2; i++) */
-/*       for (j=0; j<2; j++) */
-/* 	for (k=0; k<2; k++) */
-/* 	  printf("%d %d %d %d \n ",i,j,k,data3D[i][j][k]); */
+    status = H5LRmake_dataset(file_id, "/Group_2D/DS2a", H5T_NATIVE_INT, num_elem, file_id_array, ref6);
 
     return 0;
 out:
-- 
cgit v0.12