10 files changed, 222 insertions, 358 deletions
diff --git a/tools/h5repack/testfiles/1_vds.h5-vds_dset_compa-v.ddl b/tools/h5repack/testfiles/1_vds.h5-vds_dset_chunk20x10x5-v.ddl
index 781c7dc..fab9494 100644
--- a/tools/h5repack/testfiles/1_vds.h5-vds_dset_compa-v.ddl
+++ b/tools/h5repack/testfiles/1_vds.h5-vds_dset_chunk20x10x5-v.ddl
@@ -1,10 +1,10 @@
-HDF5 "out-vds_dset_compa.1_vds.h5" {
+HDF5 "out-vds_dset_chunk20x10x5.1_vds.h5" {
 DATASET "vds_dset" {
    DATATYPE  H5T_STD_I32LE
-   DATASPACE  SIMPLE { ( 5, 18, 8 ) / ( 5, 18, 8 ) }
+   DATASPACE  SIMPLE { ( 5, 18, 8 ) / ( H5S_UNLIMITED, 18, 8 ) }
    STORAGE_LAYOUT {
-      COMPACT
-      SIZE 2880
+      CHUNKED ( 20, 10, 5 )
+      SIZE 16000
    }
    FILTERS {
       NONE
@@ -14,7 +14,7 @@ DATASET "vds_dset" {
       VALUE  -9
    }
    ALLOCATION_TIME {
-      H5D_ALLOC_TIME_EARLY
+      H5D_ALLOC_TIME_INCR
    }
    DATA {
    (0,0,0): 10, 10, 10, 10, 10, 10, 10, 10,
diff --git a/tools/h5repack/testfiles/1_vds.h5-vds_dset_conti-v.ddl b/tools/h5repack/testfiles/1_vds.h5-vds_dset_conti-v.ddl
deleted file mode 100644
index 994129b..0000000
--- a/tools/h5repack/testfiles/1_vds.h5-vds_dset_conti-v.ddl
+++ /dev/null
@@ -1,113 +0,0 @@
-HDF5 "out-vds_dset_conti.1_vds.h5" {
-DATASET "vds_dset" {
-   DATATYPE  H5T_STD_I32LE
-   DATASPACE  SIMPLE { ( 5, 18, 8 ) / ( 5, 18, 8 ) }
-   STORAGE_LAYOUT {
-      CONTIGUOUS
-      SIZE 2880
-      OFFSET 2144
-   }
-   FILTERS {
-      NONE
-   }
-   FILLVALUE {
-      FILL_TIME H5D_FILL_TIME_IFSET
-      VALUE  -9
-   }
-   ALLOCATION_TIME {
-      H5D_ALLOC_TIME_LATE
-   }
-   DATA {
-   (0,0,0): 10, 10, 10, 10, 10, 10, 10, 10,
-   (0,1,0): 10, 10, 10, 10, 10, 10, 10, 10,
-   (0,2,0): 20, 20, 20, 20, 20, 20, 20, 20,
-   (0,3,0): 20, 20, 20, 20, 20, 20, 20, 20,
-   (0,4,0): 20, 20, 20, 20, 20, 20, 20, 20,
-   (0,5,0): 20, 20, 20, 20, 20, 20, 20, 20,
-   (0,6,0): 30, 30, 30, 30, 30, 30, 30, 30,
-   (0,7,0): 30, 30, 30, 30, 30, 30, 30, 30,
-   (0,8,0): 40, 40, 40, 40, 40, 40, 40, 40,
-   (0,9,0): 40, 40, 40, 40, 40, 40, 40, 40,
-   (0,10,0): 40, 40, 40, 40, 40, 40, 40, 40,
-   (0,11,0): 40, 40, 40, 40, 40, 40, 40, 40,
-   (0,12,0): 50, 50, 50, 50, 50, 50, 50, 50,
-   (0,13,0): 50, 50, 50, 50, 50, 50, 50, 50,
-   (0,14,0): 60, 60, 60, 60, 60, 60, 60, 60,
-   (0,15,0): 60, 60, 60, 60, 60, 60, 60, 60,
-   (0,16,0): 60, 60, 60, 60, 60, 60, 60, 60,
-   (0,17,0): 60, 60, 60, 60, 60, 60, 60, 60,
-   (1,0,0): 11, 11, 11, 11, 11, 11, 11, 11,
-   (1,1,0): 11, 11, 11, 11, 11, 11, 11, 11,
-   (1,2,0): 21, 21, 21, 21, 21, 21, 21, 21,
-   (1,3,0): 21, 21, 21, 21, 21, 21, 21, 21,
-   (1,4,0): 21, 21, 21, 21, 21, 21, 21, 21,
-   (1,5,0): 21, 21, 21, 21, 21, 21, 21, 21,
-   (1,6,0): 31, 31, 31, 31, 31, 31, 31, 31,
-   (1,7,0): 31, 31, 31, 31, 31, 31, 31, 31,
-   (1,8,0): 41, 41, 41, 41, 41, 41, 41, 41,
-   (1,9,0): 41, 41, 41, 41, 41, 41, 41, 41,
-   (1,10,0): 41, 41, 41, 41, 41, 41, 41, 41,
-   (1,11,0): 41, 41, 41, 41, 41, 41, 41, 41,
-   (1,12,0): 51, 51, 51, 51, 51, 51, 51, 51,
-   (1,13,0): 51, 51, 51, 51, 51, 51, 51, 51,
-   (1,14,0): 61, 61, 61, 61, 61, 61, 61, 61,
-   (1,15,0): 61, 61, 61, 61, 61, 61, 61, 61,
-   (1,16,0): 61, 61, 61, 61, 61, 61, 61, 61,
-   (1,17,0): 61, 61, 61, 61, 61, 61, 61, 61,
-   (2,0,0): 12, 12, 12, 12, 12, 12, 12, 12,
-   (2,1,0): 12, 12, 12, 12, 12, 12, 12, 12,
-   (2,2,0): 22, 22, 22, 22, 22, 22, 22, 22,
-   (2,3,0): 22, 22, 22, 22, 22, 22, 22, 22,
-   (2,4,0): 22, 22, 22, 22, 22, 22, 22, 22,
-   (2,5,0): 22, 22, 22, 22, 22, 22, 22, 22,
-   (2,6,0): 32, 32, 32, 32, 32, 32, 32, 32,
-   (2,7,0): 32, 32, 32, 32, 32, 32, 32, 32,
-   (2,8,0): 42, 42, 42, 42, 42, 42, 42, 42,
-   (2,9,0): 42, 42, 42, 42, 42, 42, 42, 42,
-   (2,10,0): 42, 42, 42, 42, 42, 42, 42, 42,
-   (2,11,0): 42, 42, 42, 42, 42, 42, 42, 42,
-   (2,12,0): 52, 52, 52, 52, 52, 52, 52, 52,
-   (2,13,0): 52, 52, 52, 52, 52, 52, 52, 52,
-   (2,14,0): 62, 62, 62, 62, 62, 62, 62, 62,
-   (2,15,0): 62, 62, 62, 62, 62, 62, 62, 62,
-   (2,16,0): 62, 62, 62, 62, 62, 62, 62, 62,
-   (2,17,0): 62, 62, 62, 62, 62, 62, 62, 62,
-   (3,0,0): 13, 13, 13, 13, 13, 13, 13, 13,
-   (3,1,0): 13, 13, 13, 13, 13, 13, 13, 13,
-   (3,2,0): 23, 23, 23, 23, 23, 23, 23, 23,
-   (3,3,0): 23, 23, 23, 23, 23, 23, 23, 23,
-   (3,4,0): 23, 23, 23, 23, 23, 23, 23, 23,
-   (3,5,0): 23, 23, 23, 23, 23, 23, 23, 23,
-   (3,6,0): 33, 33, 33, 33, 33, 33, 33, 33,
-   (3,7,0): 33, 33, 33, 33, 33, 33, 33, 33,
-   (3,8,0): 43, 43, 43, 43, 43, 43, 43, 43,
-   (3,9,0): 43, 43, 43, 43, 43, 43, 43, 43,
-   (3,10,0): 43, 43, 43, 43, 43, 43, 43, 43,
-   (3,11,0): 43, 43, 43, 43, 43, 43, 43, 43,
-   (3,12,0): 53, 53, 53, 53, 53, 53, 53, 53,
-   (3,13,0): 53, 53, 53, 53, 53, 53, 53, 53,
-   (3,14,0): 63, 63, 63, 63, 63, 63, 63, 63,
-   (3,15,0): 63, 63, 63, 63, 63, 63, 63, 63,
-   (3,16,0): 63, 63, 63, 63, 63, 63, 63, 63,
-   (3,17,0): 63, 63, 63, 63, 63, 63, 63, 63,
-   (4,0,0): 14, 14, 14, 14, 14, 14, 14, 14,
-   (4,1,0): 14, 14, 14, 14, 14, 14, 14, 14,
-   (4,2,0): 24, 24, 24, 24, 24, 24, 24, 24,
-   (4,3,0): 24, 24, 24, 24, 24, 24, 24, 24,
-   (4,4,0): 24, 24, 24, 24, 24, 24, 24, 24,
-   (4,5,0): 24, 24, 24, 24, 24, 24, 24, 24,
-   (4,6,0): 34, 34, 34, 34, 34, 34, 34, 34,
-   (4,7,0): 34, 34, 34, 34, 34, 34, 34, 34,
-   (4,8,0): 44, 44, 44, 44, 44, 44, 44, 44,
-   (4,9,0): 44, 44, 44, 44, 44, 44, 44, 44,
-   (4,10,0): 44, 44, 44, 44, 44, 44, 44, 44,
-   (4,11,0): 44, 44, 44, 44, 44, 44, 44, 44,
-   (4,12,0): 54, 54, 54, 54, 54, 54, 54, 54,
-   (4,13,0): 54, 54, 54, 54, 54, 54, 54, 54,
-   (4,14,0): 64, 64, 64, 64, 64, 64, 64, 64,
-   (4,15,0): 64, 64, 64, 64, 64, 64, 64, 64,
-   (4,16,0): 64, 64, 64, 64, 64, 64, 64, 64,
-   (4,17,0): 64, 64, 64, 64, 64, 64, 64, 64
-   }
-}
-}
diff --git a/tools/h5repack/testfiles/2_vds.h5-vds_chunk3x6x9-v.ddl b/tools/h5repack/testfiles/2_vds.h5-vds_chunk3x6x9-v.ddl
new file mode 100644
index 0000000..51df9dd
--- /dev/null
+++ b/tools/h5repack/testfiles/2_vds.h5-vds_chunk3x6x9-v.ddl
@@ -0,0 +1,70 @@
+HDF5 "out-vds_chunk3x6x9.2_vds.h5" {
+DATASET "vds_dset" {
+   DATATYPE  H5T_STD_I32LE
+   DATASPACE  SIMPLE { ( 6, 8, 14 ) / ( H5S_UNLIMITED, 8, 14 ) }
+   STORAGE_LAYOUT {
+      CHUNKED ( 3, 6, 9 )
+      SIZE 5184
+   }
+   FILTERS {
+      NONE
+   }
+   FILLVALUE {
+      FILL_TIME H5D_FILL_TIME_IFSET
+      VALUE  -9
+   }
+   ALLOCATION_TIME {
+      H5D_ALLOC_TIME_INCR
+   }
+   DATA {
+   (0,0,0): 10, 10, 10, 10, 10, 10, 10, 40, 40, 40, 40, 40, 40, 40,
+   (0,1,0): 10, 10, 10, 10, 10, 10, 10, 40, 40, 40, 40, 40, 40, 40,
+   (0,2,0): 20, 20, 20, 20, 20, 20, 20, 40, 40, 40, 40, 40, 40, 40,
+   (0,3,0): 20, 20, 20, 20, 20, 20, 20, 40, 40, 40, 40, 40, 40, 40,
+   (0,4,0): 20, 20, 20, 20, 20, 20, 20, 40, 40, 40, 40, 40, 40, 40,
+   (0,5,0): 20, 20, 20, 20, 20, 20, 20, 50, 50, 50, 50, 50, 50, 50,
+   (0,6,0): 30, 30, 30, 30, 30, 30, 30, 50, 50, 50, 50, 50, 50, 50,
+   (0,7,0): 30, 30, 30, 30, 30, 30, 30, 50, 50, 50, 50, 50, 50, 50,
+   (1,0,0): 11, 11, 11, 11, 11, 11, 11, 41, 41, 41, 41, 41, 41, 41,
+   (1,1,0): 11, 11, 11, 11, 11, 11, 11, 41, 41, 41, 41, 41, 41, 41,
+   (1,2,0): 21, 21, 21, 21, 21, 21, 21, 41, 41, 41, 41, 41, 41, 41,
+   (1,3,0): 21, 21, 21, 21, 21, 21, 21, 41, 41, 41, 41, 41, 41, 41,
+   (1,4,0): 21, 21, 21, 21, 21, 21, 21, 41, 41, 41, 41, 41, 41, 41,
+   (1,5,0): 21, 21, 21, 21, 21, 21, 21, 51, 51, 51, 51, 51, 51, 51,
+   (1,6,0): 31, 31, 31, 31, 31, 31, 31, 51, 51, 51, 51, 51, 51, 51,
+   (1,7,0): 31, 31, 31, 31, 31, 31, 31, 51, 51, 51, 51, 51, 51, 51,
+   (2,0,0): 12, 12, 12, 12, 12, 12, 12, 42, 42, 42, 42, 42, 42, 42,
+   (2,1,0): 12, 12, 12, 12, 12, 12, 12, 42, 42, 42, 42, 42, 42, 42,
+   (2,2,0): 22, 22, 22, 22, 22, 22, 22, 42, 42, 42, 42, 42, 42, 42,
+   (2,3,0): 22, 22, 22, 22, 22, 22, 22, 42, 42, 42, 42, 42, 42, 42,
+   (2,4,0): 22, 22, 22, 22, 22, 22, 22, 42, 42, 42, 42, 42, 42, 42,
+   (2,5,0): 22, 22, 22, 22, 22, 22, 22, 52, 52, 52, 52, 52, 52, 52,
+   (2,6,0): 32, 32, 32, 32, 32, 32, 32, 52, 52, 52, 52, 52, 52, 52,
+   (2,7,0): 32, 32, 32, 32, 32, 32, 32, 52, 52, 52, 52, 52, 52, 52,
+   (3,0,0): 13, 13, 13, 13, 13, 13, 13, 43, 43, 43, 43, 43, 43, 43,
+   (3,1,0): 13, 13, 13, 13, 13, 13, 13, 43, 43, 43, 43, 43, 43, 43,
+   (3,2,0): 23, 23, 23, 23, 23, 23, 23, 43, 43, 43, 43, 43, 43, 43,
+   (3,3,0): 23, 23, 23, 23, 23, 23, 23, 43, 43, 43, 43, 43, 43, 43,
+   (3,4,0): 23, 23, 23, 23, 23, 23, 23, 43, 43, 43, 43, 43, 43, 43,
+   (3,5,0): 23, 23, 23, 23, 23, 23, 23, 53, 53, 53, 53, 53, 53, 53,
+   (3,6,0): 33, 33, 33, 33, 33, 33, 33, 53, 53, 53, 53, 53, 53, 53,
+   (3,7,0): 33, 33, 33, 33, 33, 33, 33, 53, 53, 53, 53, 53, 53, 53,
+   (4,0,0): 14, 14, 14, 14, 14, 14, 14, 44, 44, 44, 44, 44, 44, 44,
+   (4,1,0): 14, 14, 14, 14, 14, 14, 14, 44, 44, 44, 44, 44, 44, 44,
+   (4,2,0): 24, 24, 24, 24, 24, 24, 24, 44, 44, 44, 44, 44, 44, 44,
+   (4,3,0): 24, 24, 24, 24, 24, 24, 24, 44, 44, 44, 44, 44, 44, 44,
+   (4,4,0): 24, 24, 24, 24, 24, 24, 24, 44, 44, 44, 44, 44, 44, 44,
+   (4,5,0): 24, 24, 24, 24, 24, 24, 24, 54, 54, 54, 54, 54, 54, 54,
+   (4,6,0): 34, 34, 34, 34, 34, 34, 34, 54, 54, 54, 54, 54, 54, 54,
+   (4,7,0): 34, 34, 34, 34, 34, 34, 34, 54, 54, 54, 54, 54, 54, 54,
+   (5,0,0): 15, 15, 15, 15, 15, 15, 15, 45, 45, 45, 45, 45, 45, 45,
+   (5,1,0): 15, 15, 15, 15, 15, 15, 15, 45, 45, 45, 45, 45, 45, 45,
+   (5,2,0): 25, 25, 25, 25, 25, 25, 25, 45, 45, 45, 45, 45, 45, 45,
+   (5,3,0): 25, 25, 25, 25, 25, 25, 25, 45, 45, 45, 45, 45, 45, 45,
+   (5,4,0): 25, 25, 25, 25, 25, 25, 25, 45, 45, 45, 45, 45, 45, 45,
+   (5,5,0): 25, 25, 25, 25, 25, 25, 25, 55, 55, 55, 55, 55, 55, 55,
+   (5,6,0): 35, 35, 35, 35, 35, 35, 35, 55, 55, 55, 55, 55, 55, 55,
+   (5,7,0): 35, 35, 35, 35, 35, 35, 35, 55, 55, 55, 55, 55, 55, 55
+   }
+}
+}
diff --git a/tools/h5repack/testfiles/2_vds.h5-vds_null_compa-v.ddl b/tools/h5repack/testfiles/2_vds.h5-vds_null_compa-v.ddl
deleted file mode 100644
index 0efa6b4..0000000
--- a/tools/h5repack/testfiles/2_vds.h5-vds_null_compa-v.ddl
+++ /dev/null
@@ -1,3 +0,0 @@
-HDF5 "out-vds_null_compa.2_vds.h5" {
-}
-h5dump error: unable to get link info from "null"
diff --git a/tools/h5repack/testfiles/2_vds.h5-vds_null_conti-v.ddl b/tools/h5repack/testfiles/2_vds.h5-vds_null_conti-v.ddl
deleted file mode 100644
index ceb8cf7..0000000
--- a/tools/h5repack/testfiles/2_vds.h5-vds_null_conti-v.ddl
+++ /dev/null
@@ -1,3 +0,0 @@
-HDF5 "out-vds_null_conti.2_vds.h5" {
-}
-h5dump error: unable to get link info from "null"
diff --git a/tools/h5repack/testfiles/3_1_vds.h5-vds_chunk2x5x8-v.ddl b/tools/h5repack/testfiles/3_1_vds.h5-vds_chunk2x5x8-v.ddl
new file mode 100644
index 0000000..dcd172c
--- /dev/null
+++ b/tools/h5repack/testfiles/3_1_vds.h5-vds_chunk2x5x8-v.ddl
@@ -0,0 +1,147 @@
+HDF5 "out-vds_chunk2x5x8.3_1_vds.h5" {
+DATASET "vds_dset" {
+   DATATYPE  H5T_STD_I32LE
+   DATASPACE  SIMPLE { ( 5, 25, 8 ) / ( H5S_UNLIMITED, 25, 8 ) }
+   STORAGE_LAYOUT {
+      CHUNKED ( 2, 5, 8 )
+      SIZE 4800
+   }
+   FILTERS {
+      NONE
+   }
+   FILLVALUE {
+      FILL_TIME H5D_FILL_TIME_IFSET
+      VALUE  -9
+   }
+   ALLOCATION_TIME {
+      H5D_ALLOC_TIME_INCR
+   }
+   DATA {
+   (0,0,0): -9, -9, -9, -9, -9, -9, -9, -9,
+   (0,1,0): 10, 10, 10, 10, 10, 10, 10, 10,
+   (0,2,0): 10, 10, 10, 10, 10, 10, 10, 10,
+   (0,3,0): -9, -9, -9, -9, -9, -9, -9, -9,
+   (0,4,0): 20, 20, 20, 20, 20, 20, 20, 20,
+   (0,5,0): 20, 20, 20, 20, 20, 20, 20, 20,
+   (0,6,0): 20, 20, 20, 20, 20, 20, 20, 20,
+   (0,7,0): 20, 20, 20, 20, 20, 20, 20, 20,
+   (0,8,0): -9, -9, -9, -9, -9, -9, -9, -9,
+   (0,9,0): 30, 30, 30, 30, 30, 30, 30, 30,
+   (0,10,0): 30, 30, 30, 30, 30, 30, 30, 30,
+   (0,11,0): -9, -9, -9, -9, -9, -9, -9, -9,
+   (0,12,0): 40, 40, 40, 40, 40, 40, 40, 40,
+   (0,13,0): 40, 40, 40, 40, 40, 40, 40, 40,
+   (0,14,0): 40, 40, 40, 40, 40, 40, 40, 40,
+   (0,15,0): 40, 40, 40, 40, 40, 40, 40, 40,
+   (0,16,0): -9, -9, -9, -9, -9, -9, -9, -9,
+   (0,17,0): 50, 50, 50, 50, 50, 50, 50, 50,
+   (0,18,0): 50, 50, 50, 50, 50, 50, 50, 50,
+   (0,19,0): -9, -9, -9, -9, -9, -9, -9, -9,
+   (0,20,0): 60, 60, 60, 60, 60, 60, 60, 60,
+   (0,21,0): 60, 60, 60, 60, 60, 60, 60, 60,
+   (0,22,0): 60, 60, 60, 60, 60, 60, 60, 60,
+   (0,23,0): 60, 60, 60, 60, 60, 60, 60, 60,
+   (0,24,0): -9, -9, -9, -9, -9, -9, -9, -9,
+   (1,0,0): -9, -9, -9, -9, -9, -9, -9, -9,
+   (1,1,0): 11, 11, 11, 11, 11, 11, 11, 11,
+   (1,2,0): 11, 11, 11, 11, 11, 11, 11, 11,
+   (1,3,0): -9, -9, -9, -9, -9, -9, -9, -9,
+   (1,4,0): 21, 21, 21, 21, 21, 21, 21, 21,
+   (1,5,0): 21, 21, 21, 21, 21, 21, 21, 21,
+   (1,6,0): 21, 21, 21, 21, 21, 21, 21, 21,
+   (1,7,0): 21, 21, 21, 21, 21, 21, 21, 21,
+   (1,8,0): -9, -9, -9, -9, -9, -9, -9, -9,
+   (1,9,0): 31, 31, 31, 31, 31, 31, 31, 31,
+   (1,10,0): 31, 31, 31, 31, 31, 31, 31, 31,
+   (1,11,0): -9, -9, -9, -9, -9, -9, -9, -9,
+   (1,12,0): 41, 41, 41, 41, 41, 41, 41, 41,
+   (1,13,0): 41, 41, 41, 41, 41, 41, 41, 41,
+   (1,14,0): 41, 41, 41, 41, 41, 41, 41, 41,
+   (1,15,0): 41, 41, 41, 41, 41, 41, 41, 41,
+   (1,16,0): -9, -9, -9, -9, -9, -9, -9, -9,
+   (1,17,0): 51, 51, 51, 51, 51, 51, 51, 51,
+   (1,18,0): 51, 51, 51, 51, 51, 51, 51, 51,
+   (1,19,0): -9, -9, -9, -9, -9, -9, -9, -9,
+   (1,20,0): 61, 61, 61, 61, 61, 61, 61, 61,
+   (1,21,0): 61, 61, 61, 61, 61, 61, 61, 61,
+   (1,22,0): 61, 61, 61, 61, 61, 61, 61, 61,
+   (1,23,0): 61, 61, 61, 61, 61, 61, 61, 61,
+   (1,24,0): -9, -9, -9, -9, -9, -9, -9, -9,
+   (2,0,0): -9, -9, -9, -9, -9, -9, -9, -9,
+   (2,1,0): 12, 12, 12, 12, 12, 12, 12, 12,
+   (2,2,0): 12, 12, 12, 12, 12, 12, 12, 12,
+   (2,3,0): -9, -9, -9, -9, -9, -9, -9, -9,
+   (2,4,0): 22, 22, 22, 22, 22, 22, 22, 22,
+   (2,5,0): 22, 22, 22, 22, 22, 22, 22, 22,
+   (2,6,0): 22, 22, 22, 22, 22, 22, 22, 22,
+   (2,7,0): 22, 22, 22, 22, 22, 22, 22, 22,
+   (2,8,0): -9, -9, -9, -9, -9, -9, -9, -9,
+   (2,9,0): 32, 32, 32, 32, 32, 32, 32, 32,
+   (2,10,0): 32, 32, 32, 32, 32, 32, 32, 32,
+   (2,11,0): -9, -9, -9, -9, -9, -9, -9, -9,
+   (2,12,0): 42, 42, 42, 42, 42, 42, 42, 42,
+   (2,13,0): 42, 42, 42, 42, 42, 42, 42, 42,
+   (2,14,0): 42, 42, 42, 42, 42, 42, 42, 42,
+   (2,15,0): 42, 42, 42, 42, 42, 42, 42, 42,
+   (2,16,0): -9, -9, -9, -9, -9, -9, -9, -9,
+   (2,17,0): 52, 52, 52, 52, 52, 52, 52, 52,
+   (2,18,0): 52, 52, 52, 52, 52, 52, 52, 52,
+   (2,19,0): -9, -9, -9, -9, -9, -9, -9, -9,
+   (2,20,0): 62, 62, 62, 62, 62, 62, 62, 62,
+   (2,21,0): 62, 62, 62, 62, 62, 62, 62, 62,
+   (2,22,0): 62, 62, 62, 62, 62, 62, 62, 62,
+   (2,23,0): 62, 62, 62, 62, 62, 62, 62, 62,
+   (2,24,0): -9, -9, -9, -9, -9, -9, -9, -9,
+   (3,0,0): -9, -9, -9, -9, -9, -9, -9, -9,
+   (3,1,0): 13, 13, 13, 13, 13, 13, 13, 13,
+   (3,2,0): 13, 13, 13, 13, 13, 13, 13, 13,
+   (3,3,0): -9, -9, -9, -9, -9, -9, -9, -9,
+   (3,4,0): 23, 23, 23, 23, 23, 23, 23, 23,
+   (3,5,0): 23, 23, 23, 23, 23, 23, 23, 23,
+   (3,6,0): 23, 23, 23, 23, 23, 23, 23, 23,
+   (3,7,0): 23, 23, 23, 23, 23, 23, 23, 23,
+   (3,8,0): -9, -9, -9, -9, -9, -9, -9, -9,
+   (3,9,0): 33, 33, 33, 33, 33, 33, 33, 33,
+   (3,10,0): 33, 33, 33, 33, 33, 33, 33, 33,
+   (3,11,0): -9, -9, -9, -9, -9, -9, -9, -9,
+   (3,12,0): 43, 43, 43, 43, 43, 43, 43, 43,
+   (3,13,0): 43, 43, 43, 43, 43, 43, 43, 43,
+   (3,14,0): 43, 43, 43, 43, 43, 43, 43, 43,
+   (3,15,0): 43, 43, 43, 43, 43, 43, 43, 43,
+   (3,16,0): -9, -9, -9, -9, -9, -9, -9, -9,
+   (3,17,0): 53, 53, 53, 53, 53, 53, 53, 53,
+   (3,18,0): 53, 53, 53, 53, 53, 53, 53, 53,
+   (3,19,0): -9, -9, -9, -9, -9, -9, -9, -9,
+   (3,20,0): 63, 63, 63, 63, 63, 63, 63, 63,
+   (3,21,0): 63, 63, 63, 63, 63, 63, 63, 63,
+   (3,22,0): 63, 63, 63, 63, 63, 63, 63, 63,
+   (3,23,0): 63, 63, 63, 63, 63, 63, 63, 63,
+   (3,24,0): -9, -9, -9, -9, -9, -9, -9, -9,
+   (4,0,0): -9, -9, -9, -9, -9, -9, -9, -9,
+   (4,1,0): 14, 14, 14, 14, 14, 14, 14, 14,
+   (4,2,0): 14, 14, 14, 14, 14, 14, 14, 14,
+   (4,3,0): -9, -9, -9, -9, -9, -9, -9, -9,
+   (4,4,0): 24, 24, 24, 24, 24, 24, 24, 24,
+   (4,5,0): 24, 24, 24, 24, 24, 24, 24, 24,
+   (4,6,0): 24, 24, 24, 24, 24, 24, 24, 24,
+   (4,7,0): 24, 24, 24, 24, 24, 24, 24, 24,
+   (4,8,0): -9, -9, -9, -9, -9, -9, -9, -9,
+   (4,9,0): 34, 34, 34, 34, 34, 34, 34, 34,
+   (4,10,0): 34, 34, 34, 34, 34, 34, 34, 34,
+   (4,11,0): -9, -9, -9, -9, -9, -9, -9, -9,
+   (4,12,0): 44, 44, 44, 44, 44, 44, 44, 44,
+   (4,13,0): 44, 44, 44, 44, 44, 44, 44, 44,
+   (4,14,0): 44, 44, 44, 44, 44, 44, 44, 44,
+   (4,15,0): 44, 44, 44, 44, 44, 44, 44, 44,
+   (4,16,0): -9, -9, -9, -9, -9, -9, -9, -9,
+   (4,17,0): 54, 54, 54, 54, 54, 54, 54, 54,
+   (4,18,0): 54, 54, 54, 54, 54, 54, 54, 54,
+   (4,19,0): -9, -9, -9, -9, -9, -9, -9, -9,
+   (4,20,0): 64, 64, 64, 64, 64, 64, 64, 64,
+   (4,21,0): 64, 64, 64, 64, 64, 64, 64, 64,
+   (4,22,0): 64, 64, 64, 64, 64, 64, 64, 64,
+   (4,23,0): 64, 64, 64, 64, 64, 64, 64, 64,
+   (4,24,0): -9, -9, -9, -9, -9, -9, -9, -9
+   }
+}
+}
diff --git a/tools/h5repack/testfiles/4_vds.h5-vds_compa_compa-v.ddl b/tools/h5repack/testfiles/4_vds.h5-vds_compa_compa-v.ddl
deleted file mode 100644
index 1b7cdc0..0000000
--- a/tools/h5repack/testfiles/4_vds.h5-vds_compa_compa-v.ddl
+++ /dev/null
@@ -1,58 +0,0 @@
-HDF5 "out-vds_compa_compa.4_vds.h5" {
-DATASET "vds_dset" {
-   DATATYPE  H5T_STD_I32LE
-   DATASPACE  SIMPLE { ( 9, 4, 4 ) / ( 9, 4, 4 ) }
-   STORAGE_LAYOUT {
-      COMPACT
-      SIZE 576
-   }
-   FILTERS {
-      NONE
-   }
-   FILLVALUE {
-      FILL_TIME H5D_FILL_TIME_IFSET
-      VALUE  -9
-   }
-   ALLOCATION_TIME {
-      H5D_ALLOC_TIME_EARLY
-   }
-   DATA {
-   (0,0,0): 10, 10, 10, 10,
-   (0,1,0): 10, 10, 10, 10,
-   (0,2,0): 10, 10, 10, 10,
-   (0,3,0): 10, 10, 10, 10,
-   (1,0,0): 11, 11, 11, 11,
-   (1,1,0): 11, 11, 11, 11,
-   (1,2,0): 11, 11, 11, 11,
-   (1,3,0): 11, 11, 11, 11,
-   (2,0,0): 12, 12, 12, 12,
-   (2,1,0): 12, 12, 12, 12,
-   (2,2,0): 12, 12, 12, 12,
-   (2,3,0): 12, 12, 12, 12,
-   (3,0,0): 20, 20, 20, 20,
-   (3,1,0): 20, 20, 20, 20,
-   (3,2,0): 20, 20, 20, 20,
-   (3,3,0): 20, 20, 20, 20,
-   (4,0,0): 21, 21, 21, 21,
-   (4,1,0): 21, 21, 21, 21,
-   (4,2,0): 21, 21, 21, 21,
-   (4,3,0): 21, 21, 21, 21,
-   (5,0,0): 22, 22, 22, 22,
-   (5,1,0): 22, 22, 22, 22,
-   (5,2,0): 22, 22, 22, 22,
-   (5,3,0): 22, 22, 22, 22,
-   (6,0,0): 30, 30, 30, 30,
-   (6,1,0): 30, 30, 30, 30,
-   (6,2,0): 30, 30, 30, 30,
-   (6,3,0): 30, 30, 30, 30,
-   (7,0,0): 31, 31, 31, 31,
-   (7,1,0): 31, 31, 31, 31,
-   (7,2,0): 31, 31, 31, 31,
-   (7,3,0): 31, 31, 31, 31,
-   (8,0,0): 32, 32, 32, 32,
-   (8,1,0): 32, 32, 32, 32,
-   (8,2,0): 32, 32, 32, 32,
-   (8,3,0): 32, 32, 32, 32
-   }
-}
-}
diff --git a/tools/h5repack/testfiles/4_vds.h5-vds_compa_conti-v.ddl b/tools/h5repack/testfiles/4_vds.h5-vds_compa_conti-v.ddl
deleted file mode 100644
index 1a4b4b5..0000000
--- a/tools/h5repack/testfiles/4_vds.h5-vds_compa_conti-v.ddl
+++ /dev/null
@@ -1,59 +0,0 @@
-HDF5 "out-vds_compa_conti.4_vds.h5" {
-DATASET "vds_dset" {
-   DATATYPE  H5T_STD_I32LE
-   DATASPACE  SIMPLE { ( 9, 4, 4 ) / ( 9, 4, 4 ) }
-   STORAGE_LAYOUT {
-      CONTIGUOUS
-      SIZE 576
-      OFFSET 2144
-   }
-   FILTERS {
-      NONE
-   }
-   FILLVALUE {
-      FILL_TIME H5D_FILL_TIME_IFSET
-      VALUE  -9
-   }
-   ALLOCATION_TIME {
-      H5D_ALLOC_TIME_LATE
-   }
-   DATA {
-   (0,0,0): 10, 10, 10, 10,
-   (0,1,0): 10, 10, 10, 10,
-   (0,2,0): 10, 10, 10, 10,
-   (0,3,0): 10, 10, 10, 10,
-   (1,0,0): 11, 11, 11, 11,
-   (1,1,0): 11, 11, 11, 11,
-   (1,2,0): 11, 11, 11, 11,
-   (1,3,0): 11, 11, 11, 11,
-   (2,0,0): 12, 12, 12, 12,
-   (2,1,0): 12, 12, 12, 12,
-   (2,2,0): 12, 12, 12, 12,
-   (2,3,0): 12, 12, 12, 12,
-   (3,0,0): 20, 20, 20, 20,
-   (3,1,0): 20, 20, 20, 20,
-   (3,2,0): 20, 20, 20, 20,
-   (3,3,0): 20, 20, 20, 20,
-   (4,0,0): 21, 21, 21, 21,
-   (4,1,0): 21, 21, 21, 21,
-   (4,2,0): 21, 21, 21, 21,
-   (4,3,0): 21, 21, 21, 21,
-   (5,0,0): 22, 22, 22, 22,
-   (5,1,0): 22, 22, 22, 22,
-   (5,2,0): 22, 22, 22, 22,
-   (5,3,0): 22, 22, 22, 22,
-   (6,0,0): 30, 30, 30, 30,
-   (6,1,0): 30, 30, 30, 30,
-   (6,2,0): 30, 30, 30, 30,
-   (6,3,0): 30, 30, 30, 30,
-   (7,0,0): 31, 31, 31, 31,
-   (7,1,0): 31, 31, 31, 31,
-   (7,2,0): 31, 31, 31, 31,
-   (7,3,0): 31, 31, 31, 31,
-   (8,0,0): 32, 32, 32, 32,
-   (8,1,0): 32, 32, 32, 32,
-   (8,2,0): 32, 32, 32, 32,
-   (8,3,0): 32, 32, 32, 32
-   }
-}
-}
diff --git a/tools/h5repack/testfiles/4_vds.h5-vds_conti_compa-v.ddl b/tools/h5repack/testfiles/4_vds.h5-vds_conti_compa-v.ddl
deleted file mode 100644
index bc4fdd1..0000000
--- a/tools/h5repack/testfiles/4_vds.h5-vds_conti_compa-v.ddl
+++ /dev/null
@@ -1,58 +0,0 @@
-HDF5 "out-vds_conti_compa.4_vds.h5" {
-DATASET "vds_dset" {
-   DATATYPE  H5T_STD_I32LE
-   DATASPACE  SIMPLE { ( 9, 4, 4 ) / ( 9, 4, 4 ) }
-   STORAGE_LAYOUT {
-      COMPACT
-      SIZE 576
-   }
-   FILTERS {
-      NONE
-   }
-   FILLVALUE {
-      FILL_TIME H5D_FILL_TIME_IFSET
-      VALUE  -9
-   }
-   ALLOCATION_TIME {
-      H5D_ALLOC_TIME_EARLY
-   }
-   DATA {
-   (0,0,0): 10, 10, 10, 10,
-   (0,1,0): 10, 10, 10, 10,
-   (0,2,0): 10, 10, 10, 10,
-   (0,3,0): 10, 10, 10, 10,
-   (1,0,0): 11, 11, 11, 11,
-   (1,1,0): 11, 11, 11, 11,
-   (1,2,0): 11, 11, 11, 11,
-   (1,3,0): 11, 11, 11, 11,
-   (2,0,0): 12, 12, 12, 12,
-   (2,1,0): 12, 12, 12, 12,
-   (2,2,0): 12, 12, 12, 12,
-   (2,3,0): 12, 12, 12, 12,
-   (3,0,0): 20, 20, 20, 20,
-   (3,1,0): 20, 20, 20, 20,
-   (3,2,0): 20, 20, 20, 20,
-   (3,3,0): 20, 20, 20, 20,
-   (4,0,0): 21, 21, 21, 21,
-   (4,1,0): 21, 21, 21, 21,
-   (4,2,0): 21, 21, 21, 21,
-   (4,3,0): 21, 21, 21, 21,
-   (5,0,0): 22, 22, 22, 22,
-   (5,1,0): 22, 22, 22, 22,
-   (5,2,0): 22, 22, 22, 22,
-   (5,3,0): 22, 22, 22, 22,
-   (6,0,0): 30, 30, 30, 30,
-   (6,1,0): 30, 30, 30, 30,
-   (6,2,0): 30, 30, 30, 30,
-   (6,3,0): 30, 30, 30, 30,
-   (7,0,0): 31, 31, 31, 31,
-   (7,1,0): 31, 31, 31, 31,
-   (7,2,0): 31, 31, 31, 31,
-   (7,3,0): 31, 31, 31, 31,
-   (8,0,0): 32, 32, 32, 32,
-   (8,1,0): 32, 32, 32, 32,
-   (8,2,0): 32, 32, 32, 32,
-   (8,3,0): 32, 32, 32, 32
-   }
-}
-}
diff --git a/tools/h5repack/testfiles/4_vds.h5-vds_conti_conti-v.ddl b/tools/h5repack/testfiles/4_vds.h5-vds_conti_conti-v.ddl
deleted file mode 100644
index 88b1ab6..0000000
--- a/tools/h5repack/testfiles/4_vds.h5-vds_conti_conti-v.ddl
+++ /dev/null
@@ -1,59 +0,0 @@
-HDF5 "out-vds_conti_conti.4_vds.h5" {
-DATASET "vds_dset" {
-   DATATYPE  H5T_STD_I32LE
-   DATASPACE  SIMPLE { ( 9, 4, 4 ) / ( 9, 4, 4 ) }
-   STORAGE_LAYOUT {
-      CONTIGUOUS
-      SIZE 576
-      OFFSET 2144
-   }
-   FILTERS {
-      NONE
-   }
-   FILLVALUE {
-      FILL_TIME H5D_FILL_TIME_IFSET
-      VALUE  -9
-   }
-   ALLOCATION_TIME {
-      H5D_ALLOC_TIME_LATE
-   }
-   DATA {
-   (0,0,0): 10, 10, 10, 10,
-   (0,1,0): 10, 10, 10, 10,
-   (0,2,0): 10, 10, 10, 10,
-   (0,3,0): 10, 10, 10, 10,
-   (1,0,0): 11, 11, 11, 11,
-   (1,1,0): 11, 11, 11, 11,
-   (1,2,0): 11, 11, 11, 11,
-   (1,3,0): 11, 11, 11, 11,
-   (2,0,0): 12, 12, 12, 12,
-   (2,1,0): 12, 12, 12, 12,
-   (2,2,0): 12, 12, 12, 12,
-   (2,3,0): 12, 12, 12, 12,
-   (3,0,0): 20, 20, 20, 20,
-   (3,1,0): 20, 20, 20, 20,
-   (3,2,0): 20, 20, 20, 20,
-   (3,3,0): 20, 20, 20, 20,
-   (4,0,0): 21, 21, 21, 21,
-   (4,1,0): 21, 21, 21, 21,
-   (4,2,0): 21, 21, 21, 21,
-   (4,3,0): 21, 21, 21, 21,
-   (5,0,0): 22, 22, 22, 22,
-   (5,1,0): 22, 22, 22, 22,
-   (5,2,0): 22, 22, 22, 22,
-   (5,3,0): 22, 22, 22, 22,
-   (6,0,0): 30, 30, 30, 30,
-   (6,1,0): 30, 30, 30, 30,
-   (6,2,0): 30, 30, 30, 30,
-   (6,3,0): 30, 30, 30, 30,
-   (7,0,0): 31, 31, 31, 31,
-   (7,1,0): 31, 31, 31, 31,
-   (7,2,0): 31, 31, 31, 31,
-   (7,3,0): 31, 31, 31, 31,
-   (8,0,0): 32, 32, 32, 32,
-   (8,1,0): 32, 32, 32, 32,
-   (8,2,0): 32, 32, 32, 32,
-   (8,3,0): 32, 32, 32, 32
-   }
-}
-}