[svn-r24106] Add help text tests for h5dump and h5repack to the linux scripts. HDFFV-8498 merge from trunk.

Tested: local linux - cmake and autotools

13 files changed, 1099 insertions, 126 deletions

diff --git a/MANIFEST b/MANIFEST
index 2a888a6..1a63467 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -1593,7 +1593,6 @@
 ./tools/testfiles/tfpformat.h5
 
 # h5dump h5repack validation
-./tools/testfiles/h5repack_filters.h5.ddl
 ./tools/testfiles/zerodim.ddl
 ./tools/testfiles/zerodim.h5
 
@@ -1963,30 +1962,33 @@
 ./tools/h5diff/testfiles/non_comparables2.h5
 
 #test files for h5repack
-./tools/h5repack/testfiles/h5repack_fill.h5
-./tools/h5repack/testfiles/h5repack_objs.h5
 ./tools/h5repack/testfiles/h5repack_attr.h5
+./tools/h5repack/testfiles/h5repack_attr_refs.h5
+./tools/h5repack/testfiles/h5repack_deflate.h5
+./tools/h5repack/testfiles/h5repack_early.h5
+./tools/h5repack/testfiles/h5repack_ext.bin
+./tools/h5repack/testfiles/h5repack_ext.h5
+./tools/h5repack/testfiles/h5repack_fill.h5
+./tools/h5repack/testfiles/h5repack_filters.h5
+./tools/h5repack/testfiles/h5repack_fletcher.h5
 ./tools/h5repack/testfiles/h5repack_hlink.h5
+./tools/h5repack/testfiles/h5repack.info
 ./tools/h5repack/testfiles/h5repack_layout.h5
-./tools/h5repack/testfiles/h5repack_layout.h5.ddl
 ./tools/h5repack/testfiles/h5repack_layouto.h5
 ./tools/h5repack/testfiles/h5repack_layout2.h5
 ./tools/h5repack/testfiles/h5repack_layout3.h5
-./tools/h5repack/testfiles/h5repack_early.h5
-./tools/h5repack/testfiles/h5repack_szip.h5
-./tools/h5repack/testfiles/h5repack_deflate.h5
-./tools/h5repack/testfiles/h5repack_shuffle.h5
-./tools/h5repack/testfiles/h5repack_fletcher.h5
-./tools/h5repack/testfiles/h5repack_filters.h5
+./tools/h5repack/testfiles/h5repack_named_dtypes.h5
 ./tools/h5repack/testfiles/h5repack_nbit.h5
+./tools/h5repack/testfiles/h5repack_objs.h5
+./tools/h5repack/testfiles/h5repack_refs.h5
+./tools/h5repack/testfiles/h5repack_shuffle.h5
 ./tools/h5repack/testfiles/h5repack_soffset.h5
-./tools/h5repack/testfiles/h5repack.info
-./tools/h5repack/testfiles/h5repack_ext.bin
-./tools/h5repack/testfiles/h5repack_ext.h5
+./tools/h5repack/testfiles/h5repack_szip.h5
 ./tools/h5repack/testfiles/ublock.bin
-./tools/h5repack/testfiles/h5repack_named_dtypes.h5
-./tools/h5repack/testfiles/h5repack_refs.h5
-./tools/h5repack/testfiles/h5repack_attr_refs.h5
+./tools/h5repack/testfiles/deflate_limit.h5repack_layout.h5.ddl
+./tools/h5repack/testfiles/h5repack-help.txt
+./tools/h5repack/testfiles/h5repack_filters.h5.tst
+./tools/h5repack/testfiles/h5repack_layout.h5.ddl
 
 # jam utility and tests
 ./tools/h5jam/h5jam.c
diff --git a/src/Makefile.am b/src/Makefile.am
index 4ad1930..f94c811 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -27,7 +27,7 @@ include $(top_srcdir)/config/lt_vers.am
 # a long time to compile it with any optimization on.  H5detect is used
 # to generate H5Tinit.c once. So, optimization is not critical.
 noinst_PROGRAMS = H5detect H5make_libsettings
-H5detect_CFLAGS = -g $(AM_CFLAGS)
+H5detect_CFLAGS = $(AM_CFLAGS) -g -O0
 
 # Our main target, the HDF5 library
 lib_LTLIBRARIES=libhdf5.la
diff --git a/src/Makefile.in b/src/Makefile.in
index 5518623..062ee13 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -519,7 +519,7 @@ CHECK_CLEANFILES = *.chkexe *.chklog *.clog
 LT_VERS_INTERFACE = 8
 LT_VERS_REVISION = 1
 LT_VERS_AGE = 0
-H5detect_CFLAGS = -g $(AM_CFLAGS)
+H5detect_CFLAGS = $(AM_CFLAGS) -g -O0
 
 # Our main target, the HDF5 library
 lib_LTLIBRARIES = libhdf5.la
diff --git a/tools/h5dump/testh5dump.sh.in b/tools/h5dump/testh5dump.sh.in
index 797f9b8..b1c2a82 100644
--- a/tools/h5dump/testh5dump.sh.in
+++ b/tools/h5dump/testh5dump.sh.in
@@ -795,6 +795,40 @@ TOOLTEST5() {
     fi
 
 }
+# ADD_HELP_TEST
+TOOLTEST_HELP() {
+
+    expect="$TESTDIR/$1"
+    actual="$TESTDIR/`basename $1 .txt`.out"
+    actual_err="$TESTDIR/`basename $1 .txt`.err"
+    shift
+
+    # Run test.
+    TESTING $DUMPER $@
+    (
+      cd $TESTDIR
+      $RUNSERIAL $DUMPER_BIN "$@"
+    ) >$actual 2>$actual_err
+    cat $actual_err >> $actual
+
+    if [ ! -f $expectdata ]; then
+    # Create the expect data file if it doesn't yet exist.
+      echo " CREATED"
+      cp $actual $expect-CREATED
+    elif $CMP $expect $actual; then
+      echo " PASSED"
+    else
+      echo "*FAILED*"
+      echo "    Expected output (*.txt) differs from actual output (*.out)"
+      nerrors="`expr $nerrors + 1`"
+    fi
+    
+    # Clean up output file
+    if test -z "$HDF5_NOCLEANUP"; then
+     rm -f $actual $actual_err
+    fi
+
+}
 
 # Print a "SKIP" message
 SKIP() {
@@ -871,7 +905,7 @@ IMPORTTEST()
 # prepare for test
 COPY_TESTFILES_TO_TESTDIR
 
-#TOOLTEST h5dump-help.txt -h
+TOOLTEST_HELP h5dump-help.txt -h
 
 # test data output redirection
 TOOLTEST tnoddl.ddl --enable-error-stack --ddl -y packedbits.h5
diff --git a/tools/h5repack/CMakeTests.cmake b/tools/h5repack/CMakeTests.cmake
index c27aaa0..3f7ec7c 100644
--- a/tools/h5repack/CMakeTests.cmake
+++ b/tools/h5repack/CMakeTests.cmake
@@ -79,12 +79,13 @@
   )
 
   SET (LIST_OTHER_TEST_FILES
+      ${HDF5_TOOLS_H5REPACK_SOURCE_DIR}/testfiles/h5repack-help.txt
       ${HDF5_TOOLS_H5REPACK_SOURCE_DIR}/testfiles/h5repack_ext.bin
       ${HDF5_TOOLS_H5REPACK_SOURCE_DIR}/testfiles/ublock.bin
       ${HDF5_TOOLS_H5REPACK_SOURCE_DIR}/testfiles/h5repack.info
+      ${HDF5_TOOLS_H5REPACK_SOURCE_DIR}/testfiles/deflate_limit.h5repack_layout.h5.ddl
       ${HDF5_TOOLS_H5REPACK_SOURCE_DIR}/testfiles/h5repack_layout.h5.ddl
-      # tools/testfiles
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/h5repack_filters.h5.ddl
+      ${HDF5_TOOLS_H5REPACK_SOURCE_DIR}/testfiles/h5repack_filters.h5.tst
   )
 
   FOREACH (h5_file ${LIST_HDF5_TEST_FILES} ${LIST_OTHER_TEST_FILES})
@@ -105,6 +106,37 @@
 ##############################################################################
 ##############################################################################
 
+  MACRO (ADD_HELP_TEST testname resultcode)
+    # If using memchecker add tests without using scripts
+    IF (HDF5_ENABLE_USING_MEMCHECKER)
+      ADD_TEST (NAME H5REPACK-${testname} COMMAND $<TARGET_FILE:h5repack> ${ARGN})
+      SET_TESTS_PROPERTIES (H5REPACK-${testname} PROPERTIES WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles")
+      IF (NOT "${last_test}" STREQUAL "")
+        SET_TESTS_PROPERTIES (H5REPACK-${testname} PROPERTIES DEPENDS ${last_test})
+      ENDIF (NOT "${last_test}" STREQUAL "")
+      SET (last_test "H5REPACK-${testname}")
+    ELSE (HDF5_ENABLE_USING_MEMCHECKER)
+      ADD_TEST (
+          NAME H5REPACK-h5repack-${testname}-clear-objects
+          COMMAND    ${CMAKE_COMMAND}
+              -E remove h5repack-${testname}.out h5repack-${testname}.out.err
+      )
+      SET_TESTS_PROPERTIES (H5REPACK-h5repack-${testname}-clear-objects PROPERTIES WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles")
+      ADD_TEST (
+          NAME H5REPACK-h5repack-${testname}
+          COMMAND "${CMAKE_COMMAND}"
+              -D "TEST_PROGRAM=$<TARGET_FILE:h5repack>"
+              -D "TEST_ARGS:STRING=${ARGN}"
+              -D "TEST_FOLDER=${PROJECT_BINARY_DIR}/testfiles"
+              -D "TEST_OUTPUT=h5repack-${testname}.out"
+              -D "TEST_EXPECT=${resultcode}"
+              -D "TEST_REFERENCE=h5repack-${testname}.txt"
+              -P "${HDF5_RESOURCES_DIR}/runTest.cmake"
+      )
+      SET_TESTS_PROPERTIES (H5REPACK-h5repack-${testname} PROPERTIES DEPENDS "H5REPACK-h5repack-${testname}-clear-objects")
+    ENDIF (HDF5_ENABLE_USING_MEMCHECKER)
+  ENDMACRO (ADD_HELP_TEST)
+
   MACRO (ADD_H5_TEST_OLD testname testtype testfile)
     IF (${testtype} STREQUAL "SKIP")
       IF (NOT HDF5_ENABLE_USING_MEMCHECKER)
@@ -177,7 +209,7 @@
                 -D "TEST_OUTPUT=./testfiles/${resultfile}-${testname}.out"
                 -D "TEST_EXPECT=${resultcode}"
                 -D "TEST_FILTER:STRING=${testfilter}"
-                -D "TEST_REFERENCE=testfiles/${resultfile}.ddl"
+                -D "TEST_REFERENCE=testfiles/${resultfile}.tst"
                 -P "${HDF5_RESOURCES_DIR}/runTest.cmake"
         )
       ENDIF (HDF5_ENABLE_USING_MEMCHECKER)
@@ -212,7 +244,7 @@
                 -D "TEST_FOLDER=${PROJECT_BINARY_DIR}"
                 -D "TEST_OUTPUT=./testfiles/${resultfile}-${testname}.out"
                 -D "TEST_EXPECT=${resultcode}"
-                -D "TEST_REFERENCE=testfiles/${resultfile}.ddl"
+                -D "TEST_REFERENCE=testfiles/${testname}.${resultfile}.ddl"
                 -P "${HDF5_RESOURCES_DIR}/runTest.cmake"
         )
         SET_TESTS_PROPERTIES (H5REPACK_DMP-h5dump-${testname} PROPERTIES DEPENDS "H5REPACK_DMP-${testname}")
@@ -339,6 +371,7 @@
       NAME H5REPACK-clearall-objects
       COMMAND    ${CMAKE_COMMAND}
           -E remove 
+         ./testfiles/h5dump-help.out
          ./testfiles/h5repack_filters.h5-gzip_verbose_filters.out
          ./testfiles/h5repack_filters.h5-gzip_verbose_filters.out.err
          ./testfiles/h5repack_layout.h5-chunk_18x13-v.out
@@ -353,6 +386,8 @@
          ./testfiles/h5repack_layout.h5-compa-v.out.err
          ./testfiles/h5repack_layout.h5-conti-v.out
          ./testfiles/h5repack_layout.h5-conti-v.out.err
+         ./testfiles/h5repack_layout.h5-deflate_limit.out
+         ./testfiles/h5repack_layout.h5-deflate_limit.out.err
          ./testfiles/h5repack_layout.h5-dset2_chunk_20x10-v.out
          ./testfiles/h5repack_layout.h5-dset2_chunk_20x10-v.out.err
          ./testfiles/h5repack_layout.h5-dset2_compa-v.out
@@ -379,6 +414,10 @@
          ./testfiles/h5repack_layout2.h5-contig_small_compa-v.out.err
          ./testfiles/h5repack_layout2.h5-contig_small_fixed_compa-v.out
          ./testfiles/h5repack_layout2.h5-contig_small_fixed_compa-v.out.err
+         ./testfiles/h5repack_layout3.h5-ckdim_biger-v.out
+         ./testfiles/h5repack_layout3.h5-ckdim_biger-v.out.err
+         ./testfiles/h5repack_layout3.h5-ckdim_smaller-v.out
+         ./testfiles/h5repack_layout3.h5-ckdim_smaller-v.out.err
          ./testfiles/h5repack_layout3.h5-chunk2chunk-v.out
          ./testfiles/h5repack_layout3.h5-chunk2chunk-v.out.err
          ./testfiles/h5repack_layout3.h5-chunk2compa-v.out
@@ -436,6 +475,8 @@
          ./testfiles/out-upgrade_layout.h5repack_layouto.h5
          ./testfiles/out-contig_small_compa.h5repack_layout2.h5
          ./testfiles/out-contig_small_fixed_compa.h5repack_layout2.h5
+         ./testfiles/out-ckdim_biger.h5repack_layout3.h5
+         ./testfiles/out-ckdim_smaller.h5repack_layout3.h5
          ./testfiles/out-chunk2chunk.h5repack_layout3.h5
          ./testfiles/out-chunk2compa.h5repack_layout3.h5
          ./testfiles/out-chunk2conti.h5repack_layout3.h5
@@ -507,6 +548,8 @@
     SET_TESTS_PROPERTIES (H5REPACK-clearall-objects PROPERTIES DEPENDS ${last_test})
   ENDIF (NOT "${last_test}" STREQUAL "")
 
+  ADD_HELP_TEST(help 0 -h)
+
   ADD_TEST (NAME H5REPACK-testh5repack_detect_szip COMMAND $<TARGET_FILE:testh5repack_detect_szip>)
   IF (HDF5_ENABLE_SZIP_SUPPORT)
     IF (HDF5_ENABLE_SZIP_ENCODING)
diff --git a/tools/h5repack/h5repack.sh.in b/tools/h5repack/h5repack.sh.in
index 42b8ecb..2a17436 100644
--- a/tools/h5repack/h5repack.sh.in
+++ b/tools/h5repack/h5repack.sh.in
@@ -117,11 +117,13 @@ $SRC_TOOLS_TESTFILES/tfamily00010.h5
 "
 
 LIST_OTHER_TEST_FILES="
+$SRC_H5REPACK_TESTFILES/h5repack-help.txt
 $SRC_H5REPACK_TESTFILES/h5repack_ext.bin
 $SRC_H5REPACK_TESTFILES/ublock.bin
 $SRC_H5REPACK_TESTFILES/h5repack.info
+$SRC_H5REPACK_TESTFILES/deflate_limit.h5repack_layout.h5.ddl
 $SRC_H5REPACK_TESTFILES/h5repack_layout.h5.ddl
-$SRC_TOOLS_TESTFILES/h5repack_filters.h5.ddl
+$SRC_H5REPACK_TESTFILES/h5repack_filters.h5.tst
 "
 
 #
@@ -436,7 +438,7 @@ TOOLTEST1()
 #
 TOOLTESTV() 
 {
-    expect="$TESTDIR/$2.ddl"
+    expect="$TESTDIR/$2.tst"
     actual="$TESTDIR/`basename $2 .ddl`.out"
     actual_err="$TESTDIR/`basename $2 .ddl`.err"
 
@@ -468,7 +470,7 @@ TOOLTESTV()
      echo " PASSED"
     else
      echo "*FAILED*"
-     echo "    Expected result (*.ddl) differs from actual result (*.out)"
+     echo "    Expected result (*.tst) differs from actual result (*.out)"
      nerrors="`expr $nerrors + 1`"
      test yes = "$verbose" && diff -c $expect $actual |sed 's/^/    /'
     fi
@@ -484,7 +486,7 @@ TOOLTEST_DUMP()
 {
     infile=$TESTDIR/$2
     outfile=$TESTDIR/out-$1.$2
-    expect="$TESTDIR/$2.ddl"
+    expect="$TESTDIR/$1.$2.ddl"
     actual="$TESTDIR/out-$1.$2.out"
     actual_err="$TESTDIR/out-$1.$2.err"
 
@@ -592,6 +594,40 @@ TOOLTEST_META()
     
     rm -f $outfile
 }
+# ADD_HELP_TEST
+TOOLTEST_HELP() {
+
+    expect="$TESTDIR/$1"
+    actual="$TESTDIR/`basename $1 .txt`.out"
+    actual_err="$TESTDIR/`basename $1 .txt`.err"
+    shift
+
+    # Run test.
+    TESTING $H5REPACK $@
+    (
+      cd $TESTDIR
+      $RUNSERIAL $H5REPACK_BIN "$@"
+    ) >$actual 2>$actual_err
+    cat $actual_err >> $actual
+
+    if [ ! -f $expect ]; then
+    # Create the expect data file if it doesn't yet exist.
+      echo " CREATED"
+      cp $actual $expect-CREATED
+    elif cmp -s $expect $actual; then
+      echo " PASSED"
+    else
+      echo "*FAILED*"
+      echo "    Expected output (*.txt) differs from actual output (*.out)"
+      nerrors="`expr $nerrors + 1`"
+    fi
+    
+    # Clean up output file
+    if test -z "$HDF5_NOCLEANUP"; then
+     rm -f $actual $actual_err
+    fi
+
+}
 
 # This is different from $srcdir/../../bin/output_filter.sh
 STDOUT_FILTER() {
@@ -630,6 +666,8 @@ fi
 # prepare for test
 COPY_TESTFILES_TO_TESTDIR
 
+TOOLTEST_HELP h5repack-help.txt -h
+
 # copy files (these files have no filters) 
 TOOLTEST fill h5repack_fill.h5
 TOOLTEST objs h5repack_objs.h5
diff --git a/tools/h5repack/h5repack_copy.c b/tools/h5repack/h5repack_copy.c
index cfd542a..b2a8641 100644
--- a/tools/h5repack/h5repack_copy.c
+++ b/tools/h5repack/h5repack_copy.c
@@ -1232,7 +1232,6 @@ int do_copy_objects(hid_t fidin,
                         */
                         if (copy_attr(dset_in, dset_out, &named_dt_head, travt, options) < 0)
                             goto error;
-
                         /*close */
                         if (H5Dclose(dset_out) < 0)
                             goto error;
@@ -1315,7 +1314,6 @@ int do_copy_objects(hid_t fidin,
 
             } /* end do we have request for filter/chunking */
 
-
             break;
 
             /*-------------------------------------------------------------------------
diff --git a/tools/h5repack/h5repack_main.c b/tools/h5repack/h5repack_main.c
index 51bc4a5..b6ad0f5 100644
--- a/tools/h5repack/h5repack_main.c
+++ b/tools/h5repack/h5repack_main.c
@@ -156,21 +156,17 @@ static void usage(const char *prog)
  printf("   -v, --verbose           Verbose mode, print object information\n");
  printf("   -V, --version           Print version number and exit\n");
  printf("   -n, --native            Use a native HDF5 type when repacking\n");
-
  printf("   -L, --latest            Use latest version of file format\n");
  printf("   -c L1, --compact=L1     Maximum number of links in header messages\n");
  printf("   -d L2, --indexed=L2     Minimum number of links in the indexed format\n");
  printf("   -s S[:F], --ssize=S[:F] Shared object header message minimum size\n");
-
  printf("   -m M, --minimum=M       Do not apply the filter to datasets smaller than M\n");
  printf("   -e E, --file=E          Name of file E with the -f and -l options\n");
-
  printf("   -u U, --ublock=U        Name of file U with user block data to be added\n");
  printf("   -b B, --block=B         Size of user block to be added\n");
  printf("   -M A, --metadata_block_size=A  Metadata block size for H5Pset_meta_block_size\n");
  printf("   -t T, --threshold=T     Threshold value for H5Pset_alignment\n");
  printf("   -a A, --alignment=A     Alignment value for H5Pset_alignment\n");
-
  printf("   -f FILT, --filter=FILT  Filter type\n");
  printf("   -l LAYT, --layout=LAYT  Layout type\n");
 
@@ -186,7 +182,6 @@ static void usage(const char *prog)
  printf("        a power of 2 (1024 default)\n");
  printf("    F - is the shared object header message type, any of <dspace|dtype|fill|\n");
  printf("        pline|attr>. If F is not specified, S applies to all messages\n");
-
  printf("\n");
 
  printf("    FILT - is a string with the format:\n");
diff --git a/tools/h5repack/testfiles/deflate_limit.h5repack_layout.h5.ddl b/tools/h5repack/testfiles/deflate_limit.h5repack_layout.h5.ddl
new file mode 100644
index 0000000..d380201
--- /dev/null
+++ b/tools/h5repack/testfiles/deflate_limit.h5repack_layout.h5.ddl
@@ -0,0 +1,130 @@
+HDF5 "./testfiles/out-deflate_limit.h5repack_layout.h5" {
+GROUP "/" {
+   DATASET "dset1" {
+      DATATYPE  H5T_STD_I32LE
+      DATASPACE  SIMPLE { ( 40, 20 ) / ( 40, 20 ) }
+      STORAGE_LAYOUT {
+         CHUNKED ( 40, 20 )
+         SIZE 1150 (2.783:1 COMPRESSION)
+      }
+      FILTERS {
+         COMPRESSION DEFLATE { LEVEL 1 }
+      }
+      FILLVALUE {
+         FILL_TIME H5D_FILL_TIME_IFSET
+         VALUE  0
+      }
+      ALLOCATION_TIME {
+         H5D_ALLOC_TIME_INCR
+      }
+   }
+   DATASET "dset2" {
+      DATATYPE  H5T_STD_I32LE
+      DATASPACE  SIMPLE { ( 40, 20 ) / ( 40, 20 ) }
+      STORAGE_LAYOUT {
+         CHUNKED ( 40, 20 )
+         SIZE 1150 (2.783:1 COMPRESSION)
+      }
+      FILTERS {
+         COMPRESSION DEFLATE { LEVEL 1 }
+      }
+      FILLVALUE {
+         FILL_TIME H5D_FILL_TIME_IFSET
+         VALUE  0
+      }
+      ALLOCATION_TIME {
+         H5D_ALLOC_TIME_INCR
+      }
+   }
+   DATASET "dset3" {
+      DATATYPE  H5T_STD_I32LE
+      DATASPACE  SIMPLE { ( 40, 20 ) / ( 40, 20 ) }
+      STORAGE_LAYOUT {
+         CHUNKED ( 40, 20 )
+         SIZE 1150 (2.783:1 COMPRESSION)
+      }
+      FILTERS {
+         COMPRESSION DEFLATE { LEVEL 1 }
+      }
+      FILLVALUE {
+         FILL_TIME H5D_FILL_TIME_IFSET
+         VALUE  0
+      }
+      ALLOCATION_TIME {
+         H5D_ALLOC_TIME_INCR
+      }
+   }
+   DATASET "dset4" {
+      DATATYPE  H5T_STD_I32LE
+      DATASPACE  SIMPLE { ( 40, 20 ) / ( 40, 20 ) }
+      STORAGE_LAYOUT {
+         CHUNKED ( 40, 20 )
+         SIZE 1150 (2.783:1 COMPRESSION)
+      }
+      FILTERS {
+         COMPRESSION DEFLATE { LEVEL 1 }
+      }
+      FILLVALUE {
+         FILL_TIME H5D_FILL_TIME_IFSET
+         VALUE  0
+      }
+      ALLOCATION_TIME {
+         H5D_ALLOC_TIME_INCR
+      }
+   }
+   DATASET "dset_chunk" {
+      DATATYPE  H5T_STD_I32LE
+      DATASPACE  SIMPLE { ( 40, 20 ) / ( 40, H5S_UNLIMITED ) }
+      STORAGE_LAYOUT {
+         CHUNKED ( 20, 10 )
+         SIZE 1283 (2.494:1 COMPRESSION)
+      }
+      FILTERS {
+         COMPRESSION DEFLATE { LEVEL 1 }
+      }
+      FILLVALUE {
+         FILL_TIME H5D_FILL_TIME_IFSET
+         VALUE  0
+      }
+      ALLOCATION_TIME {
+         H5D_ALLOC_TIME_INCR
+      }
+   }
+   DATASET "dset_compact" {
+      DATATYPE  H5T_STD_I32LE
+      DATASPACE  SIMPLE { ( 40, 20 ) / ( 40, 20 ) }
+      STORAGE_LAYOUT {
+         CHUNKED ( 40, 20 )
+         SIZE 1150 (2.783:1 COMPRESSION)
+      }
+      FILTERS {
+         COMPRESSION DEFLATE { LEVEL 1 }
+      }
+      FILLVALUE {
+         FILL_TIME H5D_FILL_TIME_IFSET
+         VALUE  0
+      }
+      ALLOCATION_TIME {
+         H5D_ALLOC_TIME_INCR
+      }
+   }
+   DATASET "dset_contiguous" {
+      DATATYPE  H5T_STD_I32LE
+      DATASPACE  SIMPLE { ( 40, 20 ) / ( 40, 20 ) }
+      STORAGE_LAYOUT {
+         CHUNKED ( 40, 20 )
+         SIZE 1150 (2.783:1 COMPRESSION)
+      }
+      FILTERS {
+         COMPRESSION DEFLATE { LEVEL 1 }
+      }
+      FILLVALUE {
+         FILL_TIME H5D_FILL_TIME_IFSET
+         VALUE  0
+      }
+      ALLOCATION_TIME {
+         H5D_ALLOC_TIME_INCR
+      }
+   }
+}
+}
diff --git a/tools/h5repack/testfiles/h5repack-help.txt b/tools/h5repack/testfiles/h5repack-help.txt
new file mode 100644
index 0000000..67e31fe
--- /dev/null
+++ b/tools/h5repack/testfiles/h5repack-help.txt
@@ -0,0 +1,99 @@
+usage: h5repack [OPTIONS] file1 file2
+  file1                    Input HDF5 File
+  file2                    Output HDF5 File
+  OPTIONS
+   -h, --help              Print a usage message and exit
+   -v, --verbose           Verbose mode, print object information
+   -V, --version           Print version number and exit
+   -n, --native            Use a native HDF5 type when repacking
+   -L, --latest            Use latest version of file format
+   -c L1, --compact=L1     Maximum number of links in header messages
+   -d L2, --indexed=L2     Minimum number of links in the indexed format
+   -s S[:F], --ssize=S[:F] Shared object header message minimum size
+   -m M, --minimum=M       Do not apply the filter to datasets smaller than M
+   -e E, --file=E          Name of file E with the -f and -l options
+   -u U, --ublock=U        Name of file U with user block data to be added
+   -b B, --block=B         Size of user block to be added
+   -M A, --metadata_block_size=A  Metadata block size for H5Pset_meta_block_size
+   -t T, --threshold=T     Threshold value for H5Pset_alignment
+   -a A, --alignment=A     Alignment value for H5Pset_alignment
+   -f FILT, --filter=FILT  Filter type
+   -l LAYT, --layout=LAYT  Layout type
+
+    M - is an integer greater than 1, size of dataset in bytes (default is 0) 
+    E - is a filename.
+    S - is an integer
+    U - is a filename.
+    T - is an integer
+    A - is an integer greater than zero
+    B - is the user block size, any value that is 512 or greater and is
+        a power of 2 (1024 default)
+    F - is the shared object header message type, any of <dspace|dtype|fill|
+        pline|attr>. If F is not specified, S applies to all messages
+
+    FILT - is a string with the format:
+
+      <list of objects>:<name of filter>=<filter parameters>
+
+      <list of objects> is a comma separated list of object names, meaning apply
+        compression only to those objects. If no names are specified, the filter
+        is applied to all objects
+      <name of filter> can be:
+        GZIP, to apply the HDF5 GZIP filter (GZIP compression)
+        SZIP, to apply the HDF5 SZIP filter (SZIP compression)
+        SHUF, to apply the HDF5 shuffle filter
+        FLET, to apply the HDF5 checksum filter
+        NBIT, to apply the HDF5 NBIT filter (NBIT compression)
+        SOFF, to apply the HDF5 Scale/Offset filter
+        NONE, to remove all filters
+      <filter parameters> is optional filter parameter information
+        GZIP=<deflation level> from 1-9
+        SZIP=<pixels per block,coding> pixels per block is a even number in
+            2-32 and coding method is either EC or NN
+        SHUF (no parameter)
+        FLET (no parameter)
+        NBIT (no parameter)
+        SOFF=<scale_factor,scale_type> scale_factor is an integer and scale_type
+            is either IN or DS
+        NONE (no parameter)
+
+    LAYT - is a string with the format:
+
+      <list of objects>:<layout type>=<layout parameters>
+
+      <list of objects> is a comma separated list of object names, meaning that
+        layout information is supplied for those objects. If no names are
+        specified, the layout type is applied to all objects
+      <layout type> can be:
+        CHUNK, to apply chunking layout
+        COMPA, to apply compact layout
+        CONTI, to apply contiguous layout
+      <layout parameters> is optional layout information
+        CHUNK=DIM[xDIM...xDIM], the chunk size of each dimension
+        COMPA (no parameter)
+        CONTI (no parameter)
+
+Examples of use:
+
+1) h5repack -v -f GZIP=1 file1 file2
+
+   GZIP compression with level 1 to all objects
+
+2) h5repack -v -f A:SZIP=8,NN file1 file2
+
+   SZIP compression with 8 pixels per block and NN coding method to object A
+
+3) h5repack -v -l A,B:CHUNK=20x10 -f C,D,F:NONE file1 file2
+
+   Chunked layout, with a layout size of 20x10, to objects A and B
+   and remove filters to objects C, D, F
+
+4) h5repack -L -c 10 -s 20:dtype file1 file2 
+
+   Using latest file format with maximum compact group size of 10 and
+   and minimum shared datatype size of 20
+
+5) h5repack -f SHUF -f GZIP=1 file1 file2 
+
+   Add both filters SHUF and GZIP in this order to all datasets
+
diff --git a/tools/testfiles/h5repack_filters.h5.ddl b/tools/h5repack/testfiles/h5repack_filters.h5.tst
index 36e65b9..36e65b9 100644
--- a/tools/testfiles/h5repack_filters.h5.ddl
+++ b/tools/h5repack/testfiles/h5repack_filters.h5.tst
diff --git a/tools/h5repack/testfiles/h5repack_layout.h5-plugin_test.ddl b/tools/h5repack/testfiles/h5repack_layout.h5-plugin_test.ddl
new file mode 100644
index 0000000..a7ba967
--- /dev/null
+++ b/tools/h5repack/testfiles/h5repack_layout.h5-plugin_test.ddl
@@ -0,0 +1,158 @@
+HDF5 "testfiles/out-plugin_test.h5repack_layout.h5" {
+GROUP "/" {
+   DATASET "dset1" {
+      DATATYPE  H5T_STD_I32LE
+      DATASPACE  SIMPLE { ( 40, 20 ) / ( 40, 20 ) }
+      STORAGE_LAYOUT {
+         CHUNKED ( 40, 20 )
+         SIZE 3200 (1.000:1 COMPRESSION)
+      }
+      FILTERS {
+         USER_DEFINED_FILTER {
+            FILTER_ID 257
+            COMMENT dynlib1
+            PARAMS { 9 }
+         }
+      }
+      FILLVALUE {
+         FILL_TIME H5D_FILL_TIME_IFSET
+         VALUE  0
+      }
+      ALLOCATION_TIME {
+         H5D_ALLOC_TIME_INCR
+      }
+   }
+   DATASET "dset2" {
+      DATATYPE  H5T_STD_I32LE
+      DATASPACE  SIMPLE { ( 40, 20 ) / ( 40, 20 ) }
+      STORAGE_LAYOUT {
+         CHUNKED ( 40, 20 )
+         SIZE 3200 (1.000:1 COMPRESSION)
+      }
+      FILTERS {
+         USER_DEFINED_FILTER {
+            FILTER_ID 257
+            COMMENT dynlib1
+            PARAMS { 9 }
+         }
+      }
+      FILLVALUE {
+         FILL_TIME H5D_FILL_TIME_IFSET
+         VALUE  0
+      }
+      ALLOCATION_TIME {
+         H5D_ALLOC_TIME_INCR
+      }
+   }
+   DATASET "dset3" {
+      DATATYPE  H5T_STD_I32LE
+      DATASPACE  SIMPLE { ( 40, 20 ) / ( 40, 20 ) }
+      STORAGE_LAYOUT {
+         CHUNKED ( 40, 20 )
+         SIZE 3200 (1.000:1 COMPRESSION)
+      }
+      FILTERS {
+         USER_DEFINED_FILTER {
+            FILTER_ID 257
+            COMMENT dynlib1
+            PARAMS { 9 }
+         }
+      }
+      FILLVALUE {
+         FILL_TIME H5D_FILL_TIME_IFSET
+         VALUE  0
+      }
+      ALLOCATION_TIME {
+         H5D_ALLOC_TIME_INCR
+      }
+   }
+   DATASET "dset4" {
+      DATATYPE  H5T_STD_I32LE
+      DATASPACE  SIMPLE { ( 40, 20 ) / ( 40, 20 ) }
+      STORAGE_LAYOUT {
+         CHUNKED ( 40, 20 )
+         SIZE 3200 (1.000:1 COMPRESSION)
+      }
+      FILTERS {
+         USER_DEFINED_FILTER {
+            FILTER_ID 257
+            COMMENT dynlib1
+            PARAMS { 9 }
+         }
+      }
+      FILLVALUE {
+         FILL_TIME H5D_FILL_TIME_IFSET
+         VALUE  0
+      }
+      ALLOCATION_TIME {
+         H5D_ALLOC_TIME_INCR
+      }
+   }
+   DATASET "dset_chunk" {
+      DATATYPE  H5T_STD_I32LE
+      DATASPACE  SIMPLE { ( 40, 20 ) / ( 40, H5S_UNLIMITED ) }
+      STORAGE_LAYOUT {
+         CHUNKED ( 20, 10 )
+         SIZE 3200 (1.000:1 COMPRESSION)
+      }
+      FILTERS {
+         USER_DEFINED_FILTER {
+            FILTER_ID 257
+            COMMENT dynlib1
+            PARAMS { 9 }
+         }
+      }
+      FILLVALUE {
+         FILL_TIME H5D_FILL_TIME_IFSET
+         VALUE  0
+      }
+      ALLOCATION_TIME {
+         H5D_ALLOC_TIME_INCR
+      }
+   }
+   DATASET "dset_compact" {
+      DATATYPE  H5T_STD_I32LE
+      DATASPACE  SIMPLE { ( 40, 20 ) / ( 40, 20 ) }
+      STORAGE_LAYOUT {
+         CHUNKED ( 40, 20 )
+         SIZE 3200 (1.000:1 COMPRESSION)
+      }
+      FILTERS {
+         USER_DEFINED_FILTER {
+            FILTER_ID 257
+            COMMENT dynlib1
+            PARAMS { 9 }
+         }
+      }
+      FILLVALUE {
+         FILL_TIME H5D_FILL_TIME_IFSET
+         VALUE  0
+      }
+      ALLOCATION_TIME {
+         H5D_ALLOC_TIME_INCR
+      }
+   }
+   DATASET "dset_contiguous" {
+      DATATYPE  H5T_STD_I32LE
+      DATASPACE  SIMPLE { ( 40, 20 ) / ( 40, 20 ) }
+      STORAGE_LAYOUT {
+         CHUNKED ( 40, 20 )
+         SIZE 3200 (1.000:1 COMPRESSION)
+      }
+      FILTERS {
+         USER_DEFINED_FILTER {
+            FILTER_ID 257
+            COMMENT dynlib1
+            PARAMS { 9 }
+         }
+      }
+      FILLVALUE {
+         FILL_TIME H5D_FILL_TIME_IFSET
+         VALUE  0
+      }
+      ALLOCATION_TIME {
+         H5D_ALLOC_TIME_INCR
+      }
+   }
+}
+}
diff --git a/tools/h5repack/testfiles/h5repack_layout.h5.ddl b/tools/h5repack/testfiles/h5repack_layout.h5.ddl
index d380201..00c74f4 100644
--- a/tools/h5repack/testfiles/h5repack_layout.h5.ddl
+++ b/tools/h5repack/testfiles/h5repack_layout.h5.ddl
@@ -1,129 +1,605 @@
-HDF5 "./testfiles/out-deflate_limit.h5repack_layout.h5" {
+HDF5 "h5repack_layout.h5" {
 GROUP "/" {
    DATASET "dset1" {
       DATATYPE  H5T_STD_I32LE
       DATASPACE  SIMPLE { ( 40, 20 ) / ( 40, 20 ) }
-      STORAGE_LAYOUT {
-         CHUNKED ( 40, 20 )
-         SIZE 1150 (2.783:1 COMPRESSION)
-      }
-      FILTERS {
-         COMPRESSION DEFLATE { LEVEL 1 }
-      }
-      FILLVALUE {
-         FILL_TIME H5D_FILL_TIME_IFSET
-         VALUE  0
-      }
-      ALLOCATION_TIME {
-         H5D_ALLOC_TIME_INCR
+      DATA {
+      (0,0): 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17,
+      (0,18): 18, 19,
+      (1,0): 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35,
+      (1,16): 36, 37, 38, 39,
+      (2,0): 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55,
+      (2,16): 56, 57, 58, 59,
+      (3,0): 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75,
+      (3,16): 76, 77, 78, 79,
+      (4,0): 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95,
+      (4,16): 96, 97, 98, 99,
+      (5,0): 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112,
+      (5,13): 113, 114, 115, 116, 117, 118, 119,
+      (6,0): 120, 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, 132,
+      (6,13): 133, 134, 135, 136, 137, 138, 139,
+      (7,0): 140, 141, 142, 143, 144, 145, 146, 147, 148, 149, 150, 151, 152,
+      (7,13): 153, 154, 155, 156, 157, 158, 159,
+      (8,0): 160, 161, 162, 163, 164, 165, 166, 167, 168, 169, 170, 171, 172,
+      (8,13): 173, 174, 175, 176, 177, 178, 179,
+      (9,0): 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191, 192,
+      (9,13): 193, 194, 195, 196, 197, 198, 199,
+      (10,0): 200, 201, 202, 203, 204, 205, 206, 207, 208, 209, 210, 211,
+      (10,12): 212, 213, 214, 215, 216, 217, 218, 219,
+      (11,0): 220, 221, 222, 223, 224, 225, 226, 227, 228, 229, 230, 231,
+      (11,12): 232, 233, 234, 235, 236, 237, 238, 239,
+      (12,0): 240, 241, 242, 243, 244, 245, 246, 247, 248, 249, 250, 251,
+      (12,12): 252, 253, 254, 255, 256, 257, 258, 259,
+      (13,0): 260, 261, 262, 263, 264, 265, 266, 267, 268, 269, 270, 271,
+      (13,12): 272, 273, 274, 275, 276, 277, 278, 279,
+      (14,0): 280, 281, 282, 283, 284, 285, 286, 287, 288, 289, 290, 291,
+      (14,12): 292, 293, 294, 295, 296, 297, 298, 299,
+      (15,0): 300, 301, 302, 303, 304, 305, 306, 307, 308, 309, 310, 311,
+      (15,12): 312, 313, 314, 315, 316, 317, 318, 319,
+      (16,0): 320, 321, 322, 323, 324, 325, 326, 327, 328, 329, 330, 331,
+      (16,12): 332, 333, 334, 335, 336, 337, 338, 339,
+      (17,0): 340, 341, 342, 343, 344, 345, 346, 347, 348, 349, 350, 351,
+      (17,12): 352, 353, 354, 355, 356, 357, 358, 359,
+      (18,0): 360, 361, 362, 363, 364, 365, 366, 367, 368, 369, 370, 371,
+      (18,12): 372, 373, 374, 375, 376, 377, 378, 379,
+      (19,0): 380, 381, 382, 383, 384, 385, 386, 387, 388, 389, 390, 391,
+      (19,12): 392, 393, 394, 395, 396, 397, 398, 399,
+      (20,0): 400, 401, 402, 403, 404, 405, 406, 407, 408, 409, 410, 411,
+      (20,12): 412, 413, 414, 415, 416, 417, 418, 419,
+      (21,0): 420, 421, 422, 423, 424, 425, 426, 427, 428, 429, 430, 431,
+      (21,12): 432, 433, 434, 435, 436, 437, 438, 439,
+      (22,0): 440, 441, 442, 443, 444, 445, 446, 447, 448, 449, 450, 451,
+      (22,12): 452, 453, 454, 455, 456, 457, 458, 459,
+      (23,0): 460, 461, 462, 463, 464, 465, 466, 467, 468, 469, 470, 471,
+      (23,12): 472, 473, 474, 475, 476, 477, 478, 479,
+      (24,0): 480, 481, 482, 483, 484, 485, 486, 487, 488, 489, 490, 491,
+      (24,12): 492, 493, 494, 495, 496, 497, 498, 499,
+      (25,0): 500, 501, 502, 503, 504, 505, 506, 507, 508, 509, 510, 511,
+      (25,12): 512, 513, 514, 515, 516, 517, 518, 519,
+      (26,0): 520, 521, 522, 523, 524, 525, 526, 527, 528, 529, 530, 531,
+      (26,12): 532, 533, 534, 535, 536, 537, 538, 539,
+      (27,0): 540, 541, 542, 543, 544, 545, 546, 547, 548, 549, 550, 551,
+      (27,12): 552, 553, 554, 555, 556, 557, 558, 559,
+      (28,0): 560, 561, 562, 563, 564, 565, 566, 567, 568, 569, 570, 571,
+      (28,12): 572, 573, 574, 575, 576, 577, 578, 579,
+      (29,0): 580, 581, 582, 583, 584, 585, 586, 587, 588, 589, 590, 591,
+      (29,12): 592, 593, 594, 595, 596, 597, 598, 599,
+      (30,0): 600, 601, 602, 603, 604, 605, 606, 607, 608, 609, 610, 611,
+      (30,12): 612, 613, 614, 615, 616, 617, 618, 619,
+      (31,0): 620, 621, 622, 623, 624, 625, 626, 627, 628, 629, 630, 631,
+      (31,12): 632, 633, 634, 635, 636, 637, 638, 639,
+      (32,0): 640, 641, 642, 643, 644, 645, 646, 647, 648, 649, 650, 651,
+      (32,12): 652, 653, 654, 655, 656, 657, 658, 659,
+      (33,0): 660, 661, 662, 663, 664, 665, 666, 667, 668, 669, 670, 671,
+      (33,12): 672, 673, 674, 675, 676, 677, 678, 679,
+      (34,0): 680, 681, 682, 683, 684, 685, 686, 687, 688, 689, 690, 691,
+      (34,12): 692, 693, 694, 695, 696, 697, 698, 699,
+      (35,0): 700, 701, 702, 703, 704, 705, 706, 707, 708, 709, 710, 711,
+      (35,12): 712, 713, 714, 715, 716, 717, 718, 719,
+      (36,0): 720, 721, 722, 723, 724, 725, 726, 727, 728, 729, 730, 731,
+      (36,12): 732, 733, 734, 735, 736, 737, 738, 739,
+      (37,0): 740, 741, 742, 743, 744, 745, 746, 747, 748, 749, 750, 751,
+      (37,12): 752, 753, 754, 755, 756, 757, 758, 759,
+      (38,0): 760, 761, 762, 763, 764, 765, 766, 767, 768, 769, 770, 771,
+      (38,12): 772, 773, 774, 775, 776, 777, 778, 779,
+      (39,0): 780, 781, 782, 783, 784, 785, 786, 787, 788, 789, 790, 791,
+      (39,12): 792, 793, 794, 795, 796, 797, 798, 799
       }
    }
    DATASET "dset2" {
       DATATYPE  H5T_STD_I32LE
       DATASPACE  SIMPLE { ( 40, 20 ) / ( 40, 20 ) }
-      STORAGE_LAYOUT {
-         CHUNKED ( 40, 20 )
-         SIZE 1150 (2.783:1 COMPRESSION)
-      }
-      FILTERS {
-         COMPRESSION DEFLATE { LEVEL 1 }
-      }
-      FILLVALUE {
-         FILL_TIME H5D_FILL_TIME_IFSET
-         VALUE  0
-      }
-      ALLOCATION_TIME {
-         H5D_ALLOC_TIME_INCR
+      DATA {
+      (0,0): 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17,
+      (0,18): 18, 19,
+      (1,0): 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35,
+      (1,16): 36, 37, 38, 39,
+      (2,0): 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55,
+      (2,16): 56, 57, 58, 59,
+      (3,0): 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75,
+      (3,16): 76, 77, 78, 79,
+      (4,0): 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95,
+      (4,16): 96, 97, 98, 99,
+      (5,0): 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112,
+      (5,13): 113, 114, 115, 116, 117, 118, 119,
+      (6,0): 120, 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, 132,
+      (6,13): 133, 134, 135, 136, 137, 138, 139,
+      (7,0): 140, 141, 142, 143, 144, 145, 146, 147, 148, 149, 150, 151, 152,
+      (7,13): 153, 154, 155, 156, 157, 158, 159,
+      (8,0): 160, 161, 162, 163, 164, 165, 166, 167, 168, 169, 170, 171, 172,
+      (8,13): 173, 174, 175, 176, 177, 178, 179,
+      (9,0): 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191, 192,
+      (9,13): 193, 194, 195, 196, 197, 198, 199,
+      (10,0): 200, 201, 202, 203, 204, 205, 206, 207, 208, 209, 210, 211,
+      (10,12): 212, 213, 214, 215, 216, 217, 218, 219,
+      (11,0): 220, 221, 222, 223, 224, 225, 226, 227, 228, 229, 230, 231,
+      (11,12): 232, 233, 234, 235, 236, 237, 238, 239,
+      (12,0): 240, 241, 242, 243, 244, 245, 246, 247, 248, 249, 250, 251,
+      (12,12): 252, 253, 254, 255, 256, 257, 258, 259,
+      (13,0): 260, 261, 262, 263, 264, 265, 266, 267, 268, 269, 270, 271,
+      (13,12): 272, 273, 274, 275, 276, 277, 278, 279,
+      (14,0): 280, 281, 282, 283, 284, 285, 286, 287, 288, 289, 290, 291,
+      (14,12): 292, 293, 294, 295, 296, 297, 298, 299,
+      (15,0): 300, 301, 302, 303, 304, 305, 306, 307, 308, 309, 310, 311,
+      (15,12): 312, 313, 314, 315, 316, 317, 318, 319,
+      (16,0): 320, 321, 322, 323, 324, 325, 326, 327, 328, 329, 330, 331,
+      (16,12): 332, 333, 334, 335, 336, 337, 338, 339,
+      (17,0): 340, 341, 342, 343, 344, 345, 346, 347, 348, 349, 350, 351,
+      (17,12): 352, 353, 354, 355, 356, 357, 358, 359,
+      (18,0): 360, 361, 362, 363, 364, 365, 366, 367, 368, 369, 370, 371,
+      (18,12): 372, 373, 374, 375, 376, 377, 378, 379,
+      (19,0): 380, 381, 382, 383, 384, 385, 386, 387, 388, 389, 390, 391,
+      (19,12): 392, 393, 394, 395, 396, 397, 398, 399,
+      (20,0): 400, 401, 402, 403, 404, 405, 406, 407, 408, 409, 410, 411,
+      (20,12): 412, 413, 414, 415, 416, 417, 418, 419,
+      (21,0): 420, 421, 422, 423, 424, 425, 426, 427, 428, 429, 430, 431,
+      (21,12): 432, 433, 434, 435, 436, 437, 438, 439,
+      (22,0): 440, 441, 442, 443, 444, 445, 446, 447, 448, 449, 450, 451,
+      (22,12): 452, 453, 454, 455, 456, 457, 458, 459,
+      (23,0): 460, 461, 462, 463, 464, 465, 466, 467, 468, 469, 470, 471,
+      (23,12): 472, 473, 474, 475, 476, 477, 478, 479,
+      (24,0): 480, 481, 482, 483, 484, 485, 486, 487, 488, 489, 490, 491,
+      (24,12): 492, 493, 494, 495, 496, 497, 498, 499,
+      (25,0): 500, 501, 502, 503, 504, 505, 506, 507, 508, 509, 510, 511,
+      (25,12): 512, 513, 514, 515, 516, 517, 518, 519,
+      (26,0): 520, 521, 522, 523, 524, 525, 526, 527, 528, 529, 530, 531,
+      (26,12): 532, 533, 534, 535, 536, 537, 538, 539,
+      (27,0): 540, 541, 542, 543, 544, 545, 546, 547, 548, 549, 550, 551,
+      (27,12): 552, 553, 554, 555, 556, 557, 558, 559,
+      (28,0): 560, 561, 562, 563, 564, 565, 566, 567, 568, 569, 570, 571,
+      (28,12): 572, 573, 574, 575, 576, 577, 578, 579,
+      (29,0): 580, 581, 582, 583, 584, 585, 586, 587, 588, 589, 590, 591,
+      (29,12): 592, 593, 594, 595, 596, 597, 598, 599,
+      (30,0): 600, 601, 602, 603, 604, 605, 606, 607, 608, 609, 610, 611,
+      (30,12): 612, 613, 614, 615, 616, 617, 618, 619,
+      (31,0): 620, 621, 622, 623, 624, 625, 626, 627, 628, 629, 630, 631,
+      (31,12): 632, 633, 634, 635, 636, 637, 638, 639,
+      (32,0): 640, 641, 642, 643, 644, 645, 646, 647, 648, 649, 650, 651,
+      (32,12): 652, 653, 654, 655, 656, 657, 658, 659,
+      (33,0): 660, 661, 662, 663, 664, 665, 666, 667, 668, 669, 670, 671,
+      (33,12): 672, 673, 674, 675, 676, 677, 678, 679,
+      (34,0): 680, 681, 682, 683, 684, 685, 686, 687, 688, 689, 690, 691,
+      (34,12): 692, 693, 694, 695, 696, 697, 698, 699,
+      (35,0): 700, 701, 702, 703, 704, 705, 706, 707, 708, 709, 710, 711,
+      (35,12): 712, 713, 714, 715, 716, 717, 718, 719,
+      (36,0): 720, 721, 722, 723, 724, 725, 726, 727, 728, 729, 730, 731,
+      (36,12): 732, 733, 734, 735, 736, 737, 738, 739,
+      (37,0): 740, 741, 742, 743, 744, 745, 746, 747, 748, 749, 750, 751,
+      (37,12): 752, 753, 754, 755, 756, 757, 758, 759,
+      (38,0): 760, 761, 762, 763, 764, 765, 766, 767, 768, 769, 770, 771,
+      (38,12): 772, 773, 774, 775, 776, 777, 778, 779,
+      (39,0): 780, 781, 782, 783, 784, 785, 786, 787, 788, 789, 790, 791,
+      (39,12): 792, 793, 794, 795, 796, 797, 798, 799
       }
    }
    DATASET "dset3" {
       DATATYPE  H5T_STD_I32LE
       DATASPACE  SIMPLE { ( 40, 20 ) / ( 40, 20 ) }
-      STORAGE_LAYOUT {
-         CHUNKED ( 40, 20 )
-         SIZE 1150 (2.783:1 COMPRESSION)
-      }
-      FILTERS {
-         COMPRESSION DEFLATE { LEVEL 1 }
-      }
-      FILLVALUE {
-         FILL_TIME H5D_FILL_TIME_IFSET
-         VALUE  0
-      }
-      ALLOCATION_TIME {
-         H5D_ALLOC_TIME_INCR
+      DATA {
+      (0,0): 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17,
+      (0,18): 18, 19,
+      (1,0): 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35,
+      (1,16): 36, 37, 38, 39,
+      (2,0): 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55,
+      (2,16): 56, 57, 58, 59,
+      (3,0): 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75,
+      (3,16): 76, 77, 78, 79,
+      (4,0): 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95,
+      (4,16): 96, 97, 98, 99,
+      (5,0): 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112,
+      (5,13): 113, 114, 115, 116, 117, 118, 119,
+      (6,0): 120, 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, 132,
+      (6,13): 133, 134, 135, 136, 137, 138, 139,
+      (7,0): 140, 141, 142, 143, 144, 145, 146, 147, 148, 149, 150, 151, 152,
+      (7,13): 153, 154, 155, 156, 157, 158, 159,
+      (8,0): 160, 161, 162, 163, 164, 165, 166, 167, 168, 169, 170, 171, 172,
+      (8,13): 173, 174, 175, 176, 177, 178, 179,
+      (9,0): 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191, 192,
+      (9,13): 193, 194, 195, 196, 197, 198, 199,
+      (10,0): 200, 201, 202, 203, 204, 205, 206, 207, 208, 209, 210, 211,
+      (10,12): 212, 213, 214, 215, 216, 217, 218, 219,
+      (11,0): 220, 221, 222, 223, 224, 225, 226, 227, 228, 229, 230, 231,
+      (11,12): 232, 233, 234, 235, 236, 237, 238, 239,
+      (12,0): 240, 241, 242, 243, 244, 245, 246, 247, 248, 249, 250, 251,
+      (12,12): 252, 253, 254, 255, 256, 257, 258, 259,
+      (13,0): 260, 261, 262, 263, 264, 265, 266, 267, 268, 269, 270, 271,
+      (13,12): 272, 273, 274, 275, 276, 277, 278, 279,
+      (14,0): 280, 281, 282, 283, 284, 285, 286, 287, 288, 289, 290, 291,
+      (14,12): 292, 293, 294, 295, 296, 297, 298, 299,
+      (15,0): 300, 301, 302, 303, 304, 305, 306, 307, 308, 309, 310, 311,
+      (15,12): 312, 313, 314, 315, 316, 317, 318, 319,
+      (16,0): 320, 321, 322, 323, 324, 325, 326, 327, 328, 329, 330, 331,
+      (16,12): 332, 333, 334, 335, 336, 337, 338, 339,
+      (17,0): 340, 341, 342, 343, 344, 345, 346, 347, 348, 349, 350, 351,
+      (17,12): 352, 353, 354, 355, 356, 357, 358, 359,
+      (18,0): 360, 361, 362, 363, 364, 365, 366, 367, 368, 369, 370, 371,
+      (18,12): 372, 373, 374, 375, 376, 377, 378, 379,
+      (19,0): 380, 381, 382, 383, 384, 385, 386, 387, 388, 389, 390, 391,
+      (19,12): 392, 393, 394, 395, 396, 397, 398, 399,
+      (20,0): 400, 401, 402, 403, 404, 405, 406, 407, 408, 409, 410, 411,
+      (20,12): 412, 413, 414, 415, 416, 417, 418, 419,
+      (21,0): 420, 421, 422, 423, 424, 425, 426, 427, 428, 429, 430, 431,
+      (21,12): 432, 433, 434, 435, 436, 437, 438, 439,
+      (22,0): 440, 441, 442, 443, 444, 445, 446, 447, 448, 449, 450, 451,
+      (22,12): 452, 453, 454, 455, 456, 457, 458, 459,
+      (23,0): 460, 461, 462, 463, 464, 465, 466, 467, 468, 469, 470, 471,
+      (23,12): 472, 473, 474, 475, 476, 477, 478, 479,
+      (24,0): 480, 481, 482, 483, 484, 485, 486, 487, 488, 489, 490, 491,
+      (24,12): 492, 493, 494, 495, 496, 497, 498, 499,
+      (25,0): 500, 501, 502, 503, 504, 505, 506, 507, 508, 509, 510, 511,
+      (25,12): 512, 513, 514, 515, 516, 517, 518, 519,
+      (26,0): 520, 521, 522, 523, 524, 525, 526, 527, 528, 529, 530, 531,
+      (26,12): 532, 533, 534, 535, 536, 537, 538, 539,
+      (27,0): 540, 541, 542, 543, 544, 545, 546, 547, 548, 549, 550, 551,
+      (27,12): 552, 553, 554, 555, 556, 557, 558, 559,
+      (28,0): 560, 561, 562, 563, 564, 565, 566, 567, 568, 569, 570, 571,
+      (28,12): 572, 573, 574, 575, 576, 577, 578, 579,
+      (29,0): 580, 581, 582, 583, 584, 585, 586, 587, 588, 589, 590, 591,
+      (29,12): 592, 593, 594, 595, 596, 597, 598, 599,
+      (30,0): 600, 601, 602, 603, 604, 605, 606, 607, 608, 609, 610, 611,
+      (30,12): 612, 613, 614, 615, 616, 617, 618, 619,
+      (31,0): 620, 621, 622, 623, 624, 625, 626, 627, 628, 629, 630, 631,
+      (31,12): 632, 633, 634, 635, 636, 637, 638, 639,
+      (32,0): 640, 641, 642, 643, 644, 645, 646, 647, 648, 649, 650, 651,
+      (32,12): 652, 653, 654, 655, 656, 657, 658, 659,
+      (33,0): 660, 661, 662, 663, 664, 665, 666, 667, 668, 669, 670, 671,
+      (33,12): 672, 673, 674, 675, 676, 677, 678, 679,
+      (34,0): 680, 681, 682, 683, 684, 685, 686, 687, 688, 689, 690, 691,
+      (34,12): 692, 693, 694, 695, 696, 697, 698, 699,
+      (35,0): 700, 701, 702, 703, 704, 705, 706, 707, 708, 709, 710, 711,
+      (35,12): 712, 713, 714, 715, 716, 717, 718, 719,
+      (36,0): 720, 721, 722, 723, 724, 725, 726, 727, 728, 729, 730, 731,
+      (36,12): 732, 733, 734, 735, 736, 737, 738, 739,
+      (37,0): 740, 741, 742, 743, 744, 745, 746, 747, 748, 749, 750, 751,
+      (37,12): 752, 753, 754, 755, 756, 757, 758, 759,
+      (38,0): 760, 761, 762, 763, 764, 765, 766, 767, 768, 769, 770, 771,
+      (38,12): 772, 773, 774, 775, 776, 777, 778, 779,
+      (39,0): 780, 781, 782, 783, 784, 785, 786, 787, 788, 789, 790, 791,
+      (39,12): 792, 793, 794, 795, 796, 797, 798, 799
       }
    }
    DATASET "dset4" {
       DATATYPE  H5T_STD_I32LE
       DATASPACE  SIMPLE { ( 40, 20 ) / ( 40, 20 ) }
-      STORAGE_LAYOUT {
-         CHUNKED ( 40, 20 )
-         SIZE 1150 (2.783:1 COMPRESSION)
-      }
-      FILTERS {
-         COMPRESSION DEFLATE { LEVEL 1 }
-      }
-      FILLVALUE {
-         FILL_TIME H5D_FILL_TIME_IFSET
-         VALUE  0
-      }
-      ALLOCATION_TIME {
-         H5D_ALLOC_TIME_INCR
+      DATA {
+      (0,0): 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17,
+      (0,18): 18, 19,
+      (1,0): 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35,
+      (1,16): 36, 37, 38, 39,
+      (2,0): 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55,
+      (2,16): 56, 57, 58, 59,
+      (3,0): 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75,
+      (3,16): 76, 77, 78, 79,
+      (4,0): 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95,
+      (4,16): 96, 97, 98, 99,
+      (5,0): 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112,
+      (5,13): 113, 114, 115, 116, 117, 118, 119,
+      (6,0): 120, 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, 132,
+      (6,13): 133, 134, 135, 136, 137, 138, 139,
+      (7,0): 140, 141, 142, 143, 144, 145, 146, 147, 148, 149, 150, 151, 152,
+      (7,13): 153, 154, 155, 156, 157, 158, 159,
+      (8,0): 160, 161, 162, 163, 164, 165, 166, 167, 168, 169, 170, 171, 172,
+      (8,13): 173, 174, 175, 176, 177, 178, 179,
+      (9,0): 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191, 192,
+      (9,13): 193, 194, 195, 196, 197, 198, 199,
+      (10,0): 200, 201, 202, 203, 204, 205, 206, 207, 208, 209, 210, 211,
+      (10,12): 212, 213, 214, 215, 216, 217, 218, 219,
+      (11,0): 220, 221, 222, 223, 224, 225, 226, 227, 228, 229, 230, 231,
+      (11,12): 232, 233, 234, 235, 236, 237, 238, 239,
+      (12,0): 240, 241, 242, 243, 244, 245, 246, 247, 248, 249, 250, 251,
+      (12,12): 252, 253, 254, 255, 256, 257, 258, 259,
+      (13,0): 260, 261, 262, 263, 264, 265, 266, 267, 268, 269, 270, 271,
+      (13,12): 272, 273, 274, 275, 276, 277, 278, 279,
+      (14,0): 280, 281, 282, 283, 284, 285, 286, 287, 288, 289, 290, 291,
+      (14,12): 292, 293, 294, 295, 296, 297, 298, 299,
+      (15,0): 300, 301, 302, 303, 304, 305, 306, 307, 308, 309, 310, 311,
+      (15,12): 312, 313, 314, 315, 316, 317, 318, 319,
+      (16,0): 320, 321, 322, 323, 324, 325, 326, 327, 328, 329, 330, 331,
+      (16,12): 332, 333, 334, 335, 336, 337, 338, 339,
+      (17,0): 340, 341, 342, 343, 344, 345, 346, 347, 348, 349, 350, 351,
+      (17,12): 352, 353, 354, 355, 356, 357, 358, 359,
+      (18,0): 360, 361, 362, 363, 364, 365, 366, 367, 368, 369, 370, 371,
+      (18,12): 372, 373, 374, 375, 376, 377, 378, 379,
+      (19,0): 380, 381, 382, 383, 384, 385, 386, 387, 388, 389, 390, 391,
+      (19,12): 392, 393, 394, 395, 396, 397, 398, 399,
+      (20,0): 400, 401, 402, 403, 404, 405, 406, 407, 408, 409, 410, 411,
+      (20,12): 412, 413, 414, 415, 416, 417, 418, 419,
+      (21,0): 420, 421, 422, 423, 424, 425, 426, 427, 428, 429, 430, 431,
+      (21,12): 432, 433, 434, 435, 436, 437, 438, 439,
+      (22,0): 440, 441, 442, 443, 444, 445, 446, 447, 448, 449, 450, 451,
+      (22,12): 452, 453, 454, 455, 456, 457, 458, 459,
+      (23,0): 460, 461, 462, 463, 464, 465, 466, 467, 468, 469, 470, 471,
+      (23,12): 472, 473, 474, 475, 476, 477, 478, 479,
+      (24,0): 480, 481, 482, 483, 484, 485, 486, 487, 488, 489, 490, 491,
+      (24,12): 492, 493, 494, 495, 496, 497, 498, 499,
+      (25,0): 500, 501, 502, 503, 504, 505, 506, 507, 508, 509, 510, 511,
+      (25,12): 512, 513, 514, 515, 516, 517, 518, 519,
+      (26,0): 520, 521, 522, 523, 524, 525, 526, 527, 528, 529, 530, 531,
+      (26,12): 532, 533, 534, 535, 536, 537, 538, 539,
+      (27,0): 540, 541, 542, 543, 544, 545, 546, 547, 548, 549, 550, 551,
+      (27,12): 552, 553, 554, 555, 556, 557, 558, 559,
+      (28,0): 560, 561, 562, 563, 564, 565, 566, 567, 568, 569, 570, 571,
+      (28,12): 572, 573, 574, 575, 576, 577, 578, 579,
+      (29,0): 580, 581, 582, 583, 584, 585, 586, 587, 588, 589, 590, 591,
+      (29,12): 592, 593, 594, 595, 596, 597, 598, 599,
+      (30,0): 600, 601, 602, 603, 604, 605, 606, 607, 608, 609, 610, 611,
+      (30,12): 612, 613, 614, 615, 616, 617, 618, 619,
+      (31,0): 620, 621, 622, 623, 624, 625, 626, 627, 628, 629, 630, 631,
+      (31,12): 632, 633, 634, 635, 636, 637, 638, 639,
+      (32,0): 640, 641, 642, 643, 644, 645, 646, 647, 648, 649, 650, 651,
+      (32,12): 652, 653, 654, 655, 656, 657, 658, 659,
+      (33,0): 660, 661, 662, 663, 664, 665, 666, 667, 668, 669, 670, 671,
+      (33,12): 672, 673, 674, 675, 676, 677, 678, 679,
+      (34,0): 680, 681, 682, 683, 684, 685, 686, 687, 688, 689, 690, 691,
+      (34,12): 692, 693, 694, 695, 696, 697, 698, 699,
+      (35,0): 700, 701, 702, 703, 704, 705, 706, 707, 708, 709, 710, 711,
+      (35,12): 712, 713, 714, 715, 716, 717, 718, 719,
+      (36,0): 720, 721, 722, 723, 724, 725, 726, 727, 728, 729, 730, 731,
+      (36,12): 732, 733, 734, 735, 736, 737, 738, 739,
+      (37,0): 740, 741, 742, 743, 744, 745, 746, 747, 748, 749, 750, 751,
+      (37,12): 752, 753, 754, 755, 756, 757, 758, 759,
+      (38,0): 760, 761, 762, 763, 764, 765, 766, 767, 768, 769, 770, 771,
+      (38,12): 772, 773, 774, 775, 776, 777, 778, 779,
+      (39,0): 780, 781, 782, 783, 784, 785, 786, 787, 788, 789, 790, 791,
+      (39,12): 792, 793, 794, 795, 796, 797, 798, 799
       }
    }
    DATASET "dset_chunk" {
       DATATYPE  H5T_STD_I32LE
       DATASPACE  SIMPLE { ( 40, 20 ) / ( 40, H5S_UNLIMITED ) }
-      STORAGE_LAYOUT {
-         CHUNKED ( 20, 10 )
-         SIZE 1283 (2.494:1 COMPRESSION)
-      }
-      FILTERS {
-         COMPRESSION DEFLATE { LEVEL 1 }
-      }
-      FILLVALUE {
-         FILL_TIME H5D_FILL_TIME_IFSET
-         VALUE  0
-      }
-      ALLOCATION_TIME {
-         H5D_ALLOC_TIME_INCR
+      DATA {
+      (0,0): 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17,
+      (0,18): 18, 19,
+      (1,0): 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35,
+      (1,16): 36, 37, 38, 39,
+      (2,0): 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55,
+      (2,16): 56, 57, 58, 59,
+      (3,0): 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75,
+      (3,16): 76, 77, 78, 79,
+      (4,0): 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95,
+      (4,16): 96, 97, 98, 99,
+      (5,0): 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112,
+      (5,13): 113, 114, 115, 116, 117, 118, 119,
+      (6,0): 120, 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, 132,
+      (6,13): 133, 134, 135, 136, 137, 138, 139,
+      (7,0): 140, 141, 142, 143, 144, 145, 146, 147, 148, 149, 150, 151, 152,
+      (7,13): 153, 154, 155, 156, 157, 158, 159,
+      (8,0): 160, 161, 162, 163, 164, 165, 166, 167, 168, 169, 170, 171, 172,
+      (8,13): 173, 174, 175, 176, 177, 178, 179,
+      (9,0): 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191, 192,
+      (9,13): 193, 194, 195, 196, 197, 198, 199,
+      (10,0): 200, 201, 202, 203, 204, 205, 206, 207, 208, 209, 210, 211,
+      (10,12): 212, 213, 214, 215, 216, 217, 218, 219,
+      (11,0): 220, 221, 222, 223, 224, 225, 226, 227, 228, 229, 230, 231,
+      (11,12): 232, 233, 234, 235, 236, 237, 238, 239,
+      (12,0): 240, 241, 242, 243, 244, 245, 246, 247, 248, 249, 250, 251,
+      (12,12): 252, 253, 254, 255, 256, 257, 258, 259,
+      (13,0): 260, 261, 262, 263, 264, 265, 266, 267, 268, 269, 270, 271,
+      (13,12): 272, 273, 274, 275, 276, 277, 278, 279,
+      (14,0): 280, 281, 282, 283, 284, 285, 286, 287, 288, 289, 290, 291,
+      (14,12): 292, 293, 294, 295, 296, 297, 298, 299,
+      (15,0): 300, 301, 302, 303, 304, 305, 306, 307, 308, 309, 310, 311,
+      (15,12): 312, 313, 314, 315, 316, 317, 318, 319,
+      (16,0): 320, 321, 322, 323, 324, 325, 326, 327, 328, 329, 330, 331,
+      (16,12): 332, 333, 334, 335, 336, 337, 338, 339,
+      (17,0): 340, 341, 342, 343, 344, 345, 346, 347, 348, 349, 350, 351,
+      (17,12): 352, 353, 354, 355, 356, 357, 358, 359,
+      (18,0): 360, 361, 362, 363, 364, 365, 366, 367, 368, 369, 370, 371,
+      (18,12): 372, 373, 374, 375, 376, 377, 378, 379,
+      (19,0): 380, 381, 382, 383, 384, 385, 386, 387, 388, 389, 390, 391,
+      (19,12): 392, 393, 394, 395, 396, 397, 398, 399,
+      (20,0): 400, 401, 402, 403, 404, 405, 406, 407, 408, 409, 410, 411,
+      (20,12): 412, 413, 414, 415, 416, 417, 418, 419,
+      (21,0): 420, 421, 422, 423, 424, 425, 426, 427, 428, 429, 430, 431,
+      (21,12): 432, 433, 434, 435, 436, 437, 438, 439,
+      (22,0): 440, 441, 442, 443, 444, 445, 446, 447, 448, 449, 450, 451,
+      (22,12): 452, 453, 454, 455, 456, 457, 458, 459,
+      (23,0): 460, 461, 462, 463, 464, 465, 466, 467, 468, 469, 470, 471,
+      (23,12): 472, 473, 474, 475, 476, 477, 478, 479,
+      (24,0): 480, 481, 482, 483, 484, 485, 486, 487, 488, 489, 490, 491,
+      (24,12): 492, 493, 494, 495, 496, 497, 498, 499,
+      (25,0): 500, 501, 502, 503, 504, 505, 506, 507, 508, 509, 510, 511,
+      (25,12): 512, 513, 514, 515, 516, 517, 518, 519,
+      (26,0): 520, 521, 522, 523, 524, 525, 526, 527, 528, 529, 530, 531,
+      (26,12): 532, 533, 534, 535, 536, 537, 538, 539,
+      (27,0): 540, 541, 542, 543, 544, 545, 546, 547, 548, 549, 550, 551,
+      (27,12): 552, 553, 554, 555, 556, 557, 558, 559,
+      (28,0): 560, 561, 562, 563, 564, 565, 566, 567, 568, 569, 570, 571,
+      (28,12): 572, 573, 574, 575, 576, 577, 578, 579,
+      (29,0): 580, 581, 582, 583, 584, 585, 586, 587, 588, 589, 590, 591,
+      (29,12): 592, 593, 594, 595, 596, 597, 598, 599,
+      (30,0): 600, 601, 602, 603, 604, 605, 606, 607, 608, 609, 610, 611,
+      (30,12): 612, 613, 614, 615, 616, 617, 618, 619,
+      (31,0): 620, 621, 622, 623, 624, 625, 626, 627, 628, 629, 630, 631,
+      (31,12): 632, 633, 634, 635, 636, 637, 638, 639,
+      (32,0): 640, 641, 642, 643, 644, 645, 646, 647, 648, 649, 650, 651,
+      (32,12): 652, 653, 654, 655, 656, 657, 658, 659,
+      (33,0): 660, 661, 662, 663, 664, 665, 666, 667, 668, 669, 670, 671,
+      (33,12): 672, 673, 674, 675, 676, 677, 678, 679,
+      (34,0): 680, 681, 682, 683, 684, 685, 686, 687, 688, 689, 690, 691,
+      (34,12): 692, 693, 694, 695, 696, 697, 698, 699,
+      (35,0): 700, 701, 702, 703, 704, 705, 706, 707, 708, 709, 710, 711,
+      (35,12): 712, 713, 714, 715, 716, 717, 718, 719,
+      (36,0): 720, 721, 722, 723, 724, 725, 726, 727, 728, 729, 730, 731,
+      (36,12): 732, 733, 734, 735, 736, 737, 738, 739,
+      (37,0): 740, 741, 742, 743, 744, 745, 746, 747, 748, 749, 750, 751,
+      (37,12): 752, 753, 754, 755, 756, 757, 758, 759,
+      (38,0): 760, 761, 762, 763, 764, 765, 766, 767, 768, 769, 770, 771,
+      (38,12): 772, 773, 774, 775, 776, 777, 778, 779,
+      (39,0): 780, 781, 782, 783, 784, 785, 786, 787, 788, 789, 790, 791,
+      (39,12): 792, 793, 794, 795, 796, 797, 798, 799
       }
    }
    DATASET "dset_compact" {
       DATATYPE  H5T_STD_I32LE
       DATASPACE  SIMPLE { ( 40, 20 ) / ( 40, 20 ) }
-      STORAGE_LAYOUT {
-         CHUNKED ( 40, 20 )
-         SIZE 1150 (2.783:1 COMPRESSION)
-      }
-      FILTERS {
-         COMPRESSION DEFLATE { LEVEL 1 }
-      }
-      FILLVALUE {
-         FILL_TIME H5D_FILL_TIME_IFSET
-         VALUE  0
-      }
-      ALLOCATION_TIME {
-         H5D_ALLOC_TIME_INCR
+      DATA {
+      (0,0): 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17,
+      (0,18): 18, 19,
+      (1,0): 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35,
+      (1,16): 36, 37, 38, 39,
+      (2,0): 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55,
+      (2,16): 56, 57, 58, 59,
+      (3,0): 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75,
+      (3,16): 76, 77, 78, 79,
+      (4,0): 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95,
+      (4,16): 96, 97, 98, 99,
+      (5,0): 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112,
+      (5,13): 113, 114, 115, 116, 117, 118, 119,
+      (6,0): 120, 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, 132,
+      (6,13): 133, 134, 135, 136, 137, 138, 139,
+      (7,0): 140, 141, 142, 143, 144, 145, 146, 147, 148, 149, 150, 151, 152,
+      (7,13): 153, 154, 155, 156, 157, 158, 159,
+      (8,0): 160, 161, 162, 163, 164, 165, 166, 167, 168, 169, 170, 171, 172,
+      (8,13): 173, 174, 175, 176, 177, 178, 179,
+      (9,0): 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191, 192,
+      (9,13): 193, 194, 195, 196, 197, 198, 199,
+      (10,0): 200, 201, 202, 203, 204, 205, 206, 207, 208, 209, 210, 211,
+      (10,12): 212, 213, 214, 215, 216, 217, 218, 219,
+      (11,0): 220, 221, 222, 223, 224, 225, 226, 227, 228, 229, 230, 231,
+      (11,12): 232, 233, 234, 235, 236, 237, 238, 239,
+      (12,0): 240, 241, 242, 243, 244, 245, 246, 247, 248, 249, 250, 251,
+      (12,12): 252, 253, 254, 255, 256, 257, 258, 259,
+      (13,0): 260, 261, 262, 263, 264, 265, 266, 267, 268, 269, 270, 271,
+      (13,12): 272, 273, 274, 275, 276, 277, 278, 279,
+      (14,0): 280, 281, 282, 283, 284, 285, 286, 287, 288, 289, 290, 291,
+      (14,12): 292, 293, 294, 295, 296, 297, 298, 299,
+      (15,0): 300, 301, 302, 303, 304, 305, 306, 307, 308, 309, 310, 311,
+      (15,12): 312, 313, 314, 315, 316, 317, 318, 319,
+      (16,0): 320, 321, 322, 323, 324, 325, 326, 327, 328, 329, 330, 331,
+      (16,12): 332, 333, 334, 335, 336, 337, 338, 339,
+      (17,0): 340, 341, 342, 343, 344, 345, 346, 347, 348, 349, 350, 351,
+      (17,12): 352, 353, 354, 355, 356, 357, 358, 359,
+      (18,0): 360, 361, 362, 363, 364, 365, 366, 367, 368, 369, 370, 371,
+      (18,12): 372, 373, 374, 375, 376, 377, 378, 379,
+      (19,0): 380, 381, 382, 383, 384, 385, 386, 387, 388, 389, 390, 391,
+      (19,12): 392, 393, 394, 395, 396, 397, 398, 399,
+      (20,0): 400, 401, 402, 403, 404, 405, 406, 407, 408, 409, 410, 411,
+      (20,12): 412, 413, 414, 415, 416, 417, 418, 419,
+      (21,0): 420, 421, 422, 423, 424, 425, 426, 427, 428, 429, 430, 431,
+      (21,12): 432, 433, 434, 435, 436, 437, 438, 439,
+      (22,0): 440, 441, 442, 443, 444, 445, 446, 447, 448, 449, 450, 451,
+      (22,12): 452, 453, 454, 455, 456, 457, 458, 459,
+      (23,0): 460, 461, 462, 463, 464, 465, 466, 467, 468, 469, 470, 471,
+      (23,12): 472, 473, 474, 475, 476, 477, 478, 479,
+      (24,0): 480, 481, 482, 483, 484, 485, 486, 487, 488, 489, 490, 491,
+      (24,12): 492, 493, 494, 495, 496, 497, 498, 499,
+      (25,0): 500, 501, 502, 503, 504, 505, 506, 507, 508, 509, 510, 511,
+      (25,12): 512, 513, 514, 515, 516, 517, 518, 519,
+      (26,0): 520, 521, 522, 523, 524, 525, 526, 527, 528, 529, 530, 531,
+      (26,12): 532, 533, 534, 535, 536, 537, 538, 539,
+      (27,0): 540, 541, 542, 543, 544, 545, 546, 547, 548, 549, 550, 551,
+      (27,12): 552, 553, 554, 555, 556, 557, 558, 559,
+      (28,0): 560, 561, 562, 563, 564, 565, 566, 567, 568, 569, 570, 571,
+      (28,12): 572, 573, 574, 575, 576, 577, 578, 579,
+      (29,0): 580, 581, 582, 583, 584, 585, 586, 587, 588, 589, 590, 591,
+      (29,12): 592, 593, 594, 595, 596, 597, 598, 599,
+      (30,0): 600, 601, 602, 603, 604, 605, 606, 607, 608, 609, 610, 611,
+      (30,12): 612, 613, 614, 615, 616, 617, 618, 619,
+      (31,0): 620, 621, 622, 623, 624, 625, 626, 627, 628, 629, 630, 631,
+      (31,12): 632, 633, 634, 635, 636, 637, 638, 639,
+      (32,0): 640, 641, 642, 643, 644, 645, 646, 647, 648, 649, 650, 651,
+      (32,12): 652, 653, 654, 655, 656, 657, 658, 659,
+      (33,0): 660, 661, 662, 663, 664, 665, 666, 667, 668, 669, 670, 671,
+      (33,12): 672, 673, 674, 675, 676, 677, 678, 679,
+      (34,0): 680, 681, 682, 683, 684, 685, 686, 687, 688, 689, 690, 691,
+      (34,12): 692, 693, 694, 695, 696, 697, 698, 699,
+      (35,0): 700, 701, 702, 703, 704, 705, 706, 707, 708, 709, 710, 711,
+      (35,12): 712, 713, 714, 715, 716, 717, 718, 719,
+      (36,0): 720, 721, 722, 723, 724, 725, 726, 727, 728, 729, 730, 731,
+      (36,12): 732, 733, 734, 735, 736, 737, 738, 739,
+      (37,0): 740, 741, 742, 743, 744, 745, 746, 747, 748, 749, 750, 751,
+      (37,12): 752, 753, 754, 755, 756, 757, 758, 759,
+      (38,0): 760, 761, 762, 763, 764, 765, 766, 767, 768, 769, 770, 771,
+      (38,12): 772, 773, 774, 775, 776, 777, 778, 779,
+      (39,0): 780, 781, 782, 783, 784, 785, 786, 787, 788, 789, 790, 791,
+      (39,12): 792, 793, 794, 795, 796, 797, 798, 799
       }
    }
    DATASET "dset_contiguous" {
       DATATYPE  H5T_STD_I32LE
       DATASPACE  SIMPLE { ( 40, 20 ) / ( 40, 20 ) }
-      STORAGE_LAYOUT {
-         CHUNKED ( 40, 20 )
-         SIZE 1150 (2.783:1 COMPRESSION)
-      }
-      FILTERS {
-         COMPRESSION DEFLATE { LEVEL 1 }
-      }
-      FILLVALUE {
-         FILL_TIME H5D_FILL_TIME_IFSET
-         VALUE  0
-      }
-      ALLOCATION_TIME {
-         H5D_ALLOC_TIME_INCR
+      DATA {
+      (0,0): 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17,
+      (0,18): 18, 19,
+      (1,0): 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35,
+      (1,16): 36, 37, 38, 39,
+      (2,0): 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55,
+      (2,16): 56, 57, 58, 59,
+      (3,0): 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75,
+      (3,16): 76, 77, 78, 79,
+      (4,0): 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95,
+      (4,16): 96, 97, 98, 99,
+      (5,0): 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112,
+      (5,13): 113, 114, 115, 116, 117, 118, 119,
+      (6,0): 120, 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, 132,
+      (6,13): 133, 134, 135, 136, 137, 138, 139,
+      (7,0): 140, 141, 142, 143, 144, 145, 146, 147, 148, 149, 150, 151, 152,
+      (7,13): 153, 154, 155, 156, 157, 158, 159,
+      (8,0): 160, 161, 162, 163, 164, 165, 166, 167, 168, 169, 170, 171, 172,
+      (8,13): 173, 174, 175, 176, 177, 178, 179,
+      (9,0): 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191, 192,
+      (9,13): 193, 194, 195, 196, 197, 198, 199,
+      (10,0): 200, 201, 202, 203, 204, 205, 206, 207, 208, 209, 210, 211,
+      (10,12): 212, 213, 214, 215, 216, 217, 218, 219,
+      (11,0): 220, 221, 222, 223, 224, 225, 226, 227, 228, 229, 230, 231,
+      (11,12): 232, 233, 234, 235, 236, 237, 238, 239,
+      (12,0): 240, 241, 242, 243, 244, 245, 246, 247, 248, 249, 250, 251,
+      (12,12): 252, 253, 254, 255, 256, 257, 258, 259,
+      (13,0): 260, 261, 262, 263, 264, 265, 266, 267, 268, 269, 270, 271,
+      (13,12): 272, 273, 274, 275, 276, 277, 278, 279,
+      (14,0): 280, 281, 282, 283, 284, 285, 286, 287, 288, 289, 290, 291,
+      (14,12): 292, 293, 294, 295, 296, 297, 298, 299,
+      (15,0): 300, 301, 302, 303, 304, 305, 306, 307, 308, 309, 310, 311,
+      (15,12): 312, 313, 314, 315, 316, 317, 318, 319,
+      (16,0): 320, 321, 322, 323, 324, 325, 326, 327, 328, 329, 330, 331,
+      (16,12): 332, 333, 334, 335, 336, 337, 338, 339,
+      (17,0): 340, 341, 342, 343, 344, 345, 346, 347, 348, 349, 350, 351,
+      (17,12): 352, 353, 354, 355, 356, 357, 358, 359,
+      (18,0): 360, 361, 362, 363, 364, 365, 366, 367, 368, 369, 370, 371,
+      (18,12): 372, 373, 374, 375, 376, 377, 378, 379,
+      (19,0): 380, 381, 382, 383, 384, 385, 386, 387, 388, 389, 390, 391,
+      (19,12): 392, 393, 394, 395, 396, 397, 398, 399,
+      (20,0): 400, 401, 402, 403, 404, 405, 406, 407, 408, 409, 410, 411,
+      (20,12): 412, 413, 414, 415, 416, 417, 418, 419,
+      (21,0): 420, 421, 422, 423, 424, 425, 426, 427, 428, 429, 430, 431,
+      (21,12): 432, 433, 434, 435, 436, 437, 438, 439,
+      (22,0): 440, 441, 442, 443, 444, 445, 446, 447, 448, 449, 450, 451,
+      (22,12): 452, 453, 454, 455, 456, 457, 458, 459,
+      (23,0): 460, 461, 462, 463, 464, 465, 466, 467, 468, 469, 470, 471,
+      (23,12): 472, 473, 474, 475, 476, 477, 478, 479,
+      (24,0): 480, 481, 482, 483, 484, 485, 486, 487, 488, 489, 490, 491,
+      (24,12): 492, 493, 494, 495, 496, 497, 498, 499,
+      (25,0): 500, 501, 502, 503, 504, 505, 506, 507, 508, 509, 510, 511,
+      (25,12): 512, 513, 514, 515, 516, 517, 518, 519,
+      (26,0): 520, 521, 522, 523, 524, 525, 526, 527, 528, 529, 530, 531,
+      (26,12): 532, 533, 534, 535, 536, 537, 538, 539,
+      (27,0): 540, 541, 542, 543, 544, 545, 546, 547, 548, 549, 550, 551,
+      (27,12): 552, 553, 554, 555, 556, 557, 558, 559,
+      (28,0): 560, 561, 562, 563, 564, 565, 566, 567, 568, 569, 570, 571,
+      (28,12): 572, 573, 574, 575, 576, 577, 578, 579,
+      (29,0): 580, 581, 582, 583, 584, 585, 586, 587, 588, 589, 590, 591,
+      (29,12): 592, 593, 594, 595, 596, 597, 598, 599,
+      (30,0): 600, 601, 602, 603, 604, 605, 606, 607, 608, 609, 610, 611,
+      (30,12): 612, 613, 614, 615, 616, 617, 618, 619,
+      (31,0): 620, 621, 622, 623, 624, 625, 626, 627, 628, 629, 630, 631,
+      (31,12): 632, 633, 634, 635, 636, 637, 638, 639,
+      (32,0): 640, 641, 642, 643, 644, 645, 646, 647, 648, 649, 650, 651,
+      (32,12): 652, 653, 654, 655, 656, 657, 658, 659,
+      (33,0): 660, 661, 662, 663, 664, 665, 666, 667, 668, 669, 670, 671,
+      (33,12): 672, 673, 674, 675, 676, 677, 678, 679,
+      (34,0): 680, 681, 682, 683, 684, 685, 686, 687, 688, 689, 690, 691,
+      (34,12): 692, 693, 694, 695, 696, 697, 698, 699,
+      (35,0): 700, 701, 702, 703, 704, 705, 706, 707, 708, 709, 710, 711,
+      (35,12): 712, 713, 714, 715, 716, 717, 718, 719,
+      (36,0): 720, 721, 722, 723, 724, 725, 726, 727, 728, 729, 730, 731,
+      (36,12): 732, 733, 734, 735, 736, 737, 738, 739,
+      (37,0): 740, 741, 742, 743, 744, 745, 746, 747, 748, 749, 750, 751,
+      (37,12): 752, 753, 754, 755, 756, 757, 758, 759,
+      (38,0): 760, 761, 762, 763, 764, 765, 766, 767, 768, 769, 770, 771,
+      (38,12): 772, 773, 774, 775, 776, 777, 778, 779,
+      (39,0): 780, 781, 782, 783, 784, 785, 786, 787, 788, 789, 790, 791,
+      (39,12): 792, 793, 794, 795, 796, 797, 798, 799
       }
    }
 }