[svn-r22600] Description:

    Bring r22251:22599 from trunk to revise_chunks branch.

Tested on:
    Mac OSX/64 10.7.4 (amazon) w/gcc 4.7.1, C++ & FORTRAN
    (Not h5committested yet, as this branch doesn't require it)

26 files changed, 740 insertions, 252 deletions

diff --git a/tools/testfiles/filter_fail.ddl b/tools/testfiles/filter_fail.ddl
index 75534e2..3a456f5 100644
--- a/tools/testfiles/filter_fail.ddl
+++ b/tools/testfiles/filter_fail.ddl
@@ -8,24 +8,3 @@ GROUP "/" {
    }
 }
 }
-HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
-  #000: (file name) line (number) in H5Dread(): can't read data
-    major: Dataset
-    minor: Read failed
-  #001: (file name) line (number) in H5D_read(): can't read data
-    major: Dataset
-    minor: Read failed
-  #002: (file name) line (number) in H5D_chunk_read(): unable to read raw data chunk
-    major: Low-level I/O
-    minor: Read failed
-  #003: (file name) line (number) in H5D_chunk_lock(): data pipeline read failed
-    major: Data filters
-    minor: Filter operation failed
-  #004: (file name) line (number) in H5Z_pipeline(): required filter 'filter_fail_test' is not registered
-    major: Data filters
-    minor: Read failed
-h5dump error: unable to print data
-H5tools-DIAG: Error detected in HDF5:tools (version (number)) thread (IDs):
-  #000: (file name) line (number) in h5tools_dump_simple_dset(): H5Dread failed
-    major: Failure in tools library
-    minor: error in function
diff --git a/tools/testfiles/h5dump-help.txt b/tools/testfiles/h5dump-help.txt
index d8551ca..5e0a8f1 100644
--- a/tools/testfiles/h5dump-help.txt
+++ b/tools/testfiles/h5dump-help.txt
@@ -2,6 +2,7 @@ usage: h5dump [OPTIONS] files
   OPTIONS
      -h, --help           Print a usage message and exit
      -n, --contents       Print a list of the file contents and exit
+                          Optional value 1 also prints attributes.
      -B, --superblock     Print the content of the super block
      -H, --header         Print the header only; no data is displayed
      -A, --onlyattr       Print the header and value of attributes
@@ -61,10 +62,20 @@ usage: h5dump [OPTIONS] files
         number of dimensions in the dataspace being queried
 
   D - is the file driver to use in opening the file. Acceptable values
-        are "sec2", "family", "split", "multi", "direct", and "stream". Without
-        the file driver flag, the file will be opened with each driver in
-        turn and in the order specified above until one driver succeeds
-        in opening the file.
+      are "sec2", "family", "split", "multi", "direct", and "stream". Without
+      the file driver flag, the file will be opened with each driver in
+      turn and in the order specified above until one driver succeeds
+      in opening the file.
+      These are the letters that are appended to the file name(without .h5) when opening
+      names for the split(m,r) and multi(s,b,r,g,l,o) drivers. They are:
+         m: All meta data when using the split driver.
+         s: The userblock, superblock, and driver info block
+         b: B-tree nodes
+         r: Dataset raw data
+         g: Global heap
+         l: local heap (object names)
+         o: object headers
+
   F - is a filename.
   P - is the full path from the root group to the object.
   N - is an integer greater than 1.
@@ -101,7 +112,11 @@ usage: h5dump [OPTIONS] files
 
       h5dump -d /dset -M 0,1,4,3 quux.h5
 
-  5) Dataset foo in files multi1.h5 multi2.h5 multi3.h5
+  5) Dataset foo in files file1.h5 file2.h5 file3.h5
+
+      h5dump -d /foo file1.h5 file2.h5 file3.h5
+
+  6) Dataset foo in split files splitfile-m.h5 splitfile-r.h5
 
-      h5dump -d /foo multi1.h5 multi2.h5 multi3.h5
+      h5dump -d /foo -f split splitfile
 
diff --git a/tools/testfiles/tattr-3.ddl b/tools/testfiles/tattr-3.ddl
index a19f69a..943dc0d 100644
--- a/tools/testfiles/tattr-3.ddl
+++ b/tools/testfiles/tattr-3.ddl
@@ -6,11 +6,3 @@ ATTRIBUTE "attr2" {
 ATTRIBUTE "attr" {
 }
 }
-HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
-  #000: (file name) line (number) in H5Aopen(): unable to load attribute info from object header for attribute: 'attr'
-    major: Attribute
-    minor: Unable to initialize object
-  #001: (file name) line (number) in H5O_attr_open_by_name(): can't locate attribute: 'attr'
-    major: Attribute
-    minor: Object not found
-h5dump error: unable to open attribute "attr"
diff --git a/tools/testfiles/tattrcontents1.ddl b/tools/testfiles/tattrcontents1.ddl
new file mode 100644
index 0000000..e118d89
--- /dev/null
+++ b/tools/testfiles/tattrcontents1.ddl
@@ -0,0 +1,21 @@
+HDF5 "tall.h5" {
+FILE_CONTENTS {
+ group      /
+ attribute  /attr1
+ attribute  /attr2
+ group      /g1
+ group      /g1/g1.1
+ dataset    /g1/g1.1/dset1.1.1
+ attribute  /g1/g1.1/dset1.1.1/attr1
+ attribute  /g1/g1.1/dset1.1.1/attr2
+ dataset    /g1/g1.1/dset1.1.2
+ group      /g1/g1.2
+ ext link   /g1/g1.2/extlink -> somefile somepath
+ group      /g1/g1.2/g1.2.1
+ link       /g1/g1.2/g1.2.1/slink -> somevalue
+ group      /g2
+ dataset    /g2/dset2.1
+ dataset    /g2/dset2.2
+ unknown type of UD link /g2/udlink -> ???
+ }
+}
diff --git a/tools/testfiles/tattrcontents2.ddl b/tools/testfiles/tattrcontents2.ddl
new file mode 100644
index 0000000..4076385
--- /dev/null
+++ b/tools/testfiles/tattrcontents2.ddl
@@ -0,0 +1,21 @@
+HDF5 "tall.h5" {
+FILE_CONTENTS {
+ group      /
+ attribute  /attr2
+ attribute  /attr1
+ group      /g2
+ unknown type of UD link /g2/udlink -> ???
+ dataset    /g2/dset2.2
+ dataset    /g2/dset2.1
+ group      /g1
+ group      /g1/g1.2
+ group      /g1/g1.2/g1.2.1
+ link       /g1/g1.2/g1.2.1/slink -> somevalue
+ ext link   /g1/g1.2/extlink -> somefile somepath
+ group      /g1/g1.1
+ dataset    /g1/g1.1/dset1.1.2
+ dataset    /g1/g1.1/dset1.1.1
+ attribute  /g1/g1.1/dset1.1.1/attr2
+ attribute  /g1/g1.1/dset1.1.1/attr1
+ }
+}
diff --git a/tools/testfiles/tdset-2.ddl b/tools/testfiles/tdset-2.ddl
index 2034a43..dfda95e 100644
--- a/tools/testfiles/tdset-2.ddl
+++ b/tools/testfiles/tdset-2.ddl
@@ -8,36 +8,3 @@ DATASET "/dset2" {
    DATASPACE  SIMPLE { ( 30, 20 ) / ( 30, 20 ) }
 }
 }
-HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
-  #000: (file name) line (number) in H5Dopen2(): not found
-    major: Dataset
-    minor: Object not found
-  #001: (file name) line (number) in H5G_loc_find(): can't find object
-    major: Symbol table
-    minor: Object not found
-  #002: (file name) line (number) in H5G_traverse(): internal path traversal failed
-    major: Symbol table
-    minor: Object not found
-  #003: (file name) line (number) in H5G_traverse_real(): traversal operator failed
-    major: Symbol table
-    minor: Callback failed
-  #004: (file name) line (number) in H5G_loc_find_cb(): object 'dset3' doesn't exist
-    major: Symbol table
-    minor: Object not found
-HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
-  #000: (file name) line (number) in H5Lget_info(): unable to get link info
-    major: Symbol table
-    minor: Object not found
-  #001: (file name) line (number) in H5L_get_info(): name doesn't exist
-    major: Symbol table
-    minor: Object already exists
-  #002: (file name) line (number) in H5G_traverse(): internal path traversal failed
-    major: Symbol table
-    minor: Object not found
-  #003: (file name) line (number) in H5G_traverse_real(): traversal operator failed
-    major: Symbol table
-    minor: Callback failed
-  #004: (file name) line (number) in H5L_get_info_cb(): name doesn't exist
-    major: Symbol table
-    minor: Object not found
-h5dump error: unable to get link info from "dset3"
diff --git a/tools/testfiles/tdset_idx.ls b/tools/testfiles/tdset_idx.ls
new file mode 100644
index 0000000..daa14b2
--- /dev/null
+++ b/tools/testfiles/tdset_idx.ls
@@ -0,0 +1,36 @@
+dset_btree               Dataset {20/200, 10/100}
+    Data:
+        (0,0) 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1,
+        (2,2) 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3,
+        (4,4) 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5,
+        (6,6) 6, 7, 8, 9, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5, 6, 7,
+        (8,8) 8, 9, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9,
+        (11,0) 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1,
+        (13,2) 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3,
+        (15,4) 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5,
+        (17,6) 6, 7, 8, 9, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5, 6, 7,
+        (19,8) 8, 9
+dset_filter              Dataset {20, 10}
+    Data:
+        (0,0) 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1,
+        (2,2) 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3,
+        (4,4) 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5,
+        (6,6) 6, 7, 8, 9, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5, 6, 7,
+        (8,8) 8, 9, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9,
+        (11,0) 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1,
+        (13,2) 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3,
+        (15,4) 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5,
+        (17,6) 6, 7, 8, 9, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5, 6, 7,
+        (19,8) 8, 9
+dset_fixed               Dataset {20, 10}
+    Data:
+        (0,0) 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1,
+        (2,2) 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3,
+        (4,4) 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5,
+        (6,6) 6, 7, 8, 9, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5, 6, 7,
+        (8,8) 8, 9, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9,
+        (11,0) 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1,
+        (13,2) 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3,
+        (15,4) 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5,
+        (17,6) 6, 7, 8, 9, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5, 6, 7,
+        (19,8) 8, 9
diff --git a/tools/testfiles/textlink.ddl b/tools/testfiles/textlink.ddl
index 4718adb..5459b30 100644
--- a/tools/testfiles/textlink.ddl
+++ b/tools/testfiles/textlink.ddl
@@ -10,53 +10,3 @@ GROUP "/" {
    }
 }
 }
-HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
-  #000: (file name) line (number) in H5Oopen(): unable to open object
-    major: Symbol table
-    minor: Can't open object
-  #001: (file name) line (number) in H5O_open_name(): object not found
-    major: Symbol table
-    minor: Object not found
-  #002: (file name) line (number) in H5G_loc_find(): can't find object
-    major: Symbol table
-    minor: Object not found
-  #003: (file name) line (number) in H5G_traverse(): internal path traversal failed
-    major: Symbol table
-    minor: Object not found
-  #004: (file name) line (number) in H5G_traverse_real(): special link traversal failed
-    major: Links
-    minor: Link traversal failure
-  #005: (file name) line (number) in H5G__traverse_special(): user-defined link traversal failed
-    major: Links
-    minor: Link traversal failure
-  #006: (file name) line (number) in H5G_traverse_ud(): traversal callback returned invalid ID
-    major: Symbol table
-    minor: Unable to find atom information (already closed?)
-  #007: (file name) line (number) in H5L_extern_traverse(): unable to open external file, external link file name = 'filename', temp_file_name = 'filename'
-    major: Links
-    minor: Unable to open file
-HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
-  #000: (file name) line (number) in H5Oopen(): unable to open object
-    major: Symbol table
-    minor: Can't open object
-  #001: (file name) line (number) in H5O_open_name(): object not found
-    major: Symbol table
-    minor: Object not found
-  #002: (file name) line (number) in H5G_loc_find(): can't find object
-    major: Symbol table
-    minor: Object not found
-  #003: (file name) line (number) in H5G_traverse(): internal path traversal failed
-    major: Symbol table
-    minor: Object not found
-  #004: (file name) line (number) in H5G_traverse_real(): special link traversal failed
-    major: Links
-    minor: Link traversal failure
-  #005: (file name) line (number) in H5G__traverse_special(): user-defined link traversal failed
-    major: Links
-    minor: Link traversal failure
-  #006: (file name) line (number) in H5G_traverse_ud(): traversal callback returned invalid ID
-    major: Symbol table
-    minor: Unable to find atom information (already closed?)
-  #007: (file name) line (number) in H5L_extern_traverse(): unable to open external file, external link file name = 'anotherfile', temp_file_name = 'anotherfile'
-    major: Links
-    minor: Unable to open file
diff --git a/tools/testfiles/tgroup-2.ddl b/tools/testfiles/tgroup-2.ddl
index c4af7bb..2ac8ac6 100644
--- a/tools/testfiles/tgroup-2.ddl
+++ b/tools/testfiles/tgroup-2.ddl
@@ -40,4 +40,3 @@ GROUP "/" {
 GROUP "/y" {
    }
 }
-h5dump error: unable to open group "/y"
diff --git a/tools/testfiles/tnestedcmpddt.ddl b/tools/testfiles/tnestedcmpddt.ddl
new file mode 100644
index 0000000..db949f0
--- /dev/null
+++ b/tools/testfiles/tnestedcmpddt.ddl
@@ -0,0 +1,220 @@
+HDF5 "tnestedcmpddt.h5" {
+GROUP "/" {
+   DATASET "dset1" {
+      DATATYPE  H5T_COMPOUND {
+         H5T_STD_I32LE "a_name";
+         H5T_IEEE_F32LE "b_name";
+      }
+      DATASPACE  SIMPLE { ( 6 ) / ( H5S_UNLIMITED ) }
+      DATA {
+      (0): {
+            0,
+            0
+         },
+      (1): {
+            1,
+            1
+         },
+      (2): {
+            2,
+            4
+         },
+      (3): {
+            3,
+            9
+         },
+      (4): {
+            4,
+            16
+         },
+      (5): {
+            5,
+            25
+         }
+      }
+   }
+   DATASET "dset2" {
+      DATATYPE  H5T_COMPOUND {
+         H5T_STD_I32LE "a_name";
+         H5T_IEEE_F32LE "b_name";
+         H5T_ENUM {
+            H5T_STD_I32LE;
+            "Red"              0;
+            "Green"            1;
+            "Blue"             2;
+            "White"            3;
+            "Black"            4;
+         } "c_name";
+      }
+      DATASPACE  SIMPLE { ( 6 ) / ( H5S_UNLIMITED ) }
+      DATA {
+      (0): {
+            0,
+            0,
+            Green
+         },
+      (1): {
+            1,
+            1.1,
+            Green
+         },
+      (2): {
+            2,
+            2.2,
+            Green
+         },
+      (3): {
+            3,
+            3.3,
+            Green
+         },
+      (4): {
+            4,
+            4.4,
+            Green
+         },
+      (5): {
+            5,
+            5.5,
+            Green
+         }
+      }
+   }
+   DATASET "dset4" {
+      DATATYPE  "/enumtype"
+      DATASPACE  SIMPLE { ( 6 ) / ( H5S_UNLIMITED ) }
+      DATA {
+      (0): Red, Green, Blue, Green, White, Blue
+      }
+   }
+   DATASET "dset5" {
+      DATATYPE  "/type1"
+      DATASPACE  SIMPLE { ( 6 ) / ( H5S_UNLIMITED ) }
+      DATA {
+      (0): {
+            0,
+            0
+         },
+      (1): {
+            1,
+            1
+         },
+      (2): {
+            2,
+            4
+         },
+      (3): {
+            3,
+            9
+         },
+      (4): {
+            4,
+            16
+         },
+      (5): {
+            5,
+            25
+         }
+      }
+   }
+   DATATYPE "enumtype" H5T_ENUM {
+      H5T_STD_I32LE;
+      "Red"              0;
+      "Green"            1;
+      "Blue"             2;
+      "White"            3;
+      "Black"            4;
+   };
+   GROUP "group1" {
+      DATASET "dset3" {
+         DATATYPE  H5T_COMPOUND {
+            H5T_ARRAY { [5] H5T_STD_I32LE } "int_name";
+            H5T_ARRAY { [5][6] H5T_IEEE_F32LE } "float_name";
+            H5T_COMPOUND {
+               H5T_STD_I32LE "int_name";
+               H5T_IEEE_F32LE "float_name";
+            } "cmpd_name";
+         }
+         DATASPACE  SIMPLE { ( 6 ) / ( H5S_UNLIMITED ) }
+         DATA {
+         (0): {
+               [ 0, 0, 0, 0, 0 ],
+               [ 0, 0, 0, 0, 0, 0,
+                  0, 0, 0, 0, 0, 0,
+                  0, 0, 0, 0, 0, 0,
+                  0, 0, 0, 0, 0, 0,
+                  0, 0, 0, 0, 0, 0 ],
+               {
+                  0,
+                  0
+               }
+            },
+         (1): {
+               [ 0, 1, 2, 3, 4 ],
+               [ 0, 0, 0, 0, 0, 0,
+                  0, 1, 2, 3, 4, 5,
+                  0, 2, 4, 6, 8, 10,
+                  0, 3, 6, 9, 12, 15,
+                  0, 4, 8, 12, 16, 20 ],
+               {
+                  1,
+                  1
+               }
+            },
+         (2): {
+               [ 0, 2, 4, 6, 8 ],
+               [ 0, 0, 0, 0, 0, 0,
+                  0, 2, 4, 6, 8, 10,
+                  0, 4, 8, 12, 16, 20,
+                  0, 6, 12, 18, 24, 30,
+                  0, 8, 16, 24, 32, 40 ],
+               {
+                  2,
+                  2
+               }
+            },
+         (3): {
+               [ 0, 3, 6, 9, 12 ],
+               [ 0, 0, 0, 0, 0, 0,
+                  0, 3, 6, 9, 12, 15,
+                  0, 6, 12, 18, 24, 30,
+                  0, 9, 18, 27, 36, 45,
+                  0, 12, 24, 36, 48, 60 ],
+               {
+                  3,
+                  3
+               }
+            },
+         (4): {
+               [ 0, 4, 8, 12, 16 ],
+               [ 0, 0, 0, 0, 0, 0,
+                  0, 4, 8, 12, 16, 20,
+                  0, 8, 16, 24, 32, 40,
+                  0, 12, 24, 36, 48, 60,
+                  0, 16, 32, 48, 64, 80 ],
+               {
+                  4,
+                  4
+               }
+            },
+         (5): {
+               [ 0, 5, 10, 15, 20 ],
+               [ 0, 0, 0, 0, 0, 0,
+                  0, 5, 10, 15, 20, 25,
+                  0, 10, 20, 30, 40, 50,
+                  0, 15, 30, 45, 60, 75,
+                  0, 20, 40, 60, 80, 100 ],
+               {
+                  5,
+                  5
+               }
+            }
+         }
+      }
+   }
+   DATATYPE "type1" H5T_COMPOUND {
+      H5T_STD_I32LE "int_name";
+      H5T_IEEE_F32LE "float_name";
+   }
+}
+}
diff --git a/tools/testfiles/tnestedcmpddt.h5 b/tools/testfiles/tnestedcmpddt.h5
new file mode 100644
index 0000000..f2af756
--- /dev/null
+++ b/tools/testfiles/tnestedcmpddt.h5
diff --git a/tools/testfiles/tnofilename-with-packed-bits.ddl b/tools/testfiles/tnofilename-with-packed-bits.ddl
index 050a3a3..a82c94e 100644
--- a/tools/testfiles/tnofilename-with-packed-bits.ddl
+++ b/tools/testfiles/tnofilename-with-packed-bits.ddl
@@ -2,6 +2,7 @@ usage: h5dump [OPTIONS] files
   OPTIONS
      -h, --help           Print a usage message and exit
      -n, --contents       Print a list of the file contents and exit
+                          Optional value 1 also prints attributes.
      -B, --superblock     Print the content of the super block
      -H, --header         Print the header only; no data is displayed
      -A, --onlyattr       Print the header and value of attributes
@@ -61,10 +62,20 @@ usage: h5dump [OPTIONS] files
         number of dimensions in the dataspace being queried
 
   D - is the file driver to use in opening the file. Acceptable values
-        are "sec2", "family", "split", "multi", "direct", and "stream". Without
-        the file driver flag, the file will be opened with each driver in
-        turn and in the order specified above until one driver succeeds
-        in opening the file.
+      are "sec2", "family", "split", "multi", "direct", and "stream". Without
+      the file driver flag, the file will be opened with each driver in
+      turn and in the order specified above until one driver succeeds
+      in opening the file.
+      These are the letters that are appended to the file name(without .h5) when opening
+      names for the split(m,r) and multi(s,b,r,g,l,o) drivers. They are:
+         m: All meta data when using the split driver.
+         s: The userblock, superblock, and driver info block
+         b: B-tree nodes
+         r: Dataset raw data
+         g: Global heap
+         l: local heap (object names)
+         o: object headers
+
   F - is a filename.
   P - is the full path from the root group to the object.
   N - is an integer greater than 1.
@@ -101,8 +112,12 @@ usage: h5dump [OPTIONS] files
 
       h5dump -d /dset -M 0,1,4,3 quux.h5
 
-  5) Dataset foo in files multi1.h5 multi2.h5 multi3.h5
+  5) Dataset foo in files file1.h5 file2.h5 file3.h5
+
+      h5dump -d /foo file1.h5 file2.h5 file3.h5
+
+  6) Dataset foo in split files splitfile-m.h5 splitfile-r.h5
 
-      h5dump -d /foo multi1.h5 multi2.h5 multi3.h5
+      h5dump -d /foo -f split splitfile
 
 h5dump error: missing file name
diff --git a/tools/testfiles/tordercontents1.ddl b/tools/testfiles/tordercontents1.ddl
new file mode 100644
index 0000000..14e12d6
--- /dev/null
+++ b/tools/testfiles/tordercontents1.ddl
@@ -0,0 +1,20 @@
+HDF5 "tfcontents1.h5" {
+FILE_CONTENTS {
+ datatype   /#5616
+ group      /
+ dataset    /dset
+ dataset    /dset3 -> /dset
+ dataset    /dset4 -> /dset
+ dataset    /dsetmytype2
+ ext link   /extlink -> fname oname
+ group      /g1
+ dataset    /g1/dset1 -> /dset
+ group      /g1/g1.1
+ dataset    /g1/g1.1/dset2 -> /dset
+ group      /g2 -> /g1/g1.1
+ link       /mylink -> mylink
+ datatype   /mytype
+ link       /softlink -> /dset
+ unknown type of UD link /udlink -> ???
+ }
+}
diff --git a/tools/testfiles/tordercontents2.ddl b/tools/testfiles/tordercontents2.ddl
new file mode 100644
index 0000000..6757338
--- /dev/null
+++ b/tools/testfiles/tordercontents2.ddl
@@ -0,0 +1,20 @@
+HDF5 "tfcontents1.h5" {
+FILE_CONTENTS {
+ datatype   /#5616
+ group      /
+ unknown type of UD link /udlink -> ???
+ link       /softlink -> /dset
+ datatype   /mytype
+ link       /mylink -> mylink
+ group      /g2
+ dataset    /g2/dset2
+ group      /g1
+ group      /g1/g1.1 -> /g2
+ dataset    /g1/dset1 -> /g2/dset2
+ ext link   /extlink -> fname oname
+ dataset    /dsetmytype2
+ dataset    /dset4 -> /g2/dset2
+ dataset    /dset3 -> /g2/dset2
+ dataset    /dset -> /g2/dset2
+ }
+}
diff --git a/tools/testfiles/torderlinks1.ddl b/tools/testfiles/torderlinks1.ddl
new file mode 100644
index 0000000..eaf6eea
--- /dev/null
+++ b/tools/testfiles/torderlinks1.ddl
@@ -0,0 +1,52 @@
+HDF5 "tfcontents1.h5" {
+GROUP "/" {
+   DATATYPE "#5616" H5T_STD_I32BE;
+   DATASET "dset" {
+      DATATYPE  H5T_STD_I32BE
+      DATASPACE  SIMPLE { ( 4 ) / ( 4 ) }
+      DATA {
+      (0): 1, 2, 3, 4
+      }
+   }
+   DATASET "dset3" {
+      HARDLINK "/dset"
+   }
+   DATASET "dset4" {
+      HARDLINK "/dset"
+   }
+   DATASET "dsetmytype2" {
+      DATATYPE  "/#5616"
+      DATASPACE  SIMPLE { ( 4 ) / ( 4 ) }
+      DATA {
+      (0): 1, 2, 3, 4
+      }
+   }
+   EXTERNAL_LINK "extlink" {
+      TARGETFILE "fname"
+      TARGETPATH "oname"
+   }
+   GROUP "g1" {
+      DATASET "dset1" {
+         HARDLINK "/dset"
+      }
+      GROUP "g1.1" {
+         DATASET "dset2" {
+            HARDLINK "/dset"
+         }
+      }
+   }
+   GROUP "g2" {
+      HARDLINK "/g1/g1.1"
+   }
+   SOFTLINK "mylink" {
+      LINKTARGET "mylink"
+   }
+   DATATYPE "mytype" H5T_STD_I32BE;
+   SOFTLINK "softlink" {
+      LINKTARGET "/dset"
+   }
+   USERDEFINED_LINK "udlink" {
+      LINKCLASS 187
+   }
+}
+}
diff --git a/tools/testfiles/torderlinks2.ddl b/tools/testfiles/torderlinks2.ddl
new file mode 100644
index 0000000..dd68208
--- /dev/null
+++ b/tools/testfiles/torderlinks2.ddl
@@ -0,0 +1,52 @@
+HDF5 "tfcontents1.h5" {
+GROUP "/" {
+   DATATYPE "#5616" H5T_STD_I32BE;
+   USERDEFINED_LINK "udlink" {
+      LINKCLASS 187
+   }
+   SOFTLINK "softlink" {
+      LINKTARGET "/dset"
+   }
+   DATATYPE "mytype" H5T_STD_I32BE;
+   SOFTLINK "mylink" {
+      LINKTARGET "mylink"
+   }
+   GROUP "g2" {
+      DATASET "dset2" {
+         DATATYPE  H5T_STD_I32BE
+         DATASPACE  SIMPLE { ( 4 ) / ( 4 ) }
+         DATA {
+         (0): 1, 2, 3, 4
+         }
+      }
+   }
+   GROUP "g1" {
+      GROUP "g1.1" {
+         HARDLINK "/g2"
+      }
+      DATASET "dset1" {
+         HARDLINK "/g2/dset2"
+      }
+   }
+   EXTERNAL_LINK "extlink" {
+      TARGETFILE "fname"
+      TARGETPATH "oname"
+   }
+   DATASET "dsetmytype2" {
+      DATATYPE  "/#5616"
+      DATASPACE  SIMPLE { ( 4 ) / ( 4 ) }
+      DATA {
+      (0): 1, 2, 3, 4
+      }
+   }
+   DATASET "dset4" {
+      HARDLINK "/g2/dset2"
+   }
+   DATASET "dset3" {
+      HARDLINK "/g2/dset2"
+   }
+   DATASET "dset" {
+      HARDLINK "/g2/dset2"
+   }
+}
+}
diff --git a/tools/testfiles/tpbitsIncomplete.ddl b/tools/testfiles/tpbitsIncomplete.ddl
index 5608d2b..72d54fc 100644
--- a/tools/testfiles/tpbitsIncomplete.ddl
+++ b/tools/testfiles/tpbitsIncomplete.ddl
@@ -2,6 +2,7 @@ usage: h5dump [OPTIONS] files
   OPTIONS
      -h, --help           Print a usage message and exit
      -n, --contents       Print a list of the file contents and exit
+                          Optional value 1 also prints attributes.
      -B, --superblock     Print the content of the super block
      -H, --header         Print the header only; no data is displayed
      -A, --onlyattr       Print the header and value of attributes
@@ -61,10 +62,20 @@ usage: h5dump [OPTIONS] files
         number of dimensions in the dataspace being queried
 
   D - is the file driver to use in opening the file. Acceptable values
-        are "sec2", "family", "split", "multi", "direct", and "stream". Without
-        the file driver flag, the file will be opened with each driver in
-        turn and in the order specified above until one driver succeeds
-        in opening the file.
+      are "sec2", "family", "split", "multi", "direct", and "stream". Without
+      the file driver flag, the file will be opened with each driver in
+      turn and in the order specified above until one driver succeeds
+      in opening the file.
+      These are the letters that are appended to the file name(without .h5) when opening
+      names for the split(m,r) and multi(s,b,r,g,l,o) drivers. They are:
+         m: All meta data when using the split driver.
+         s: The userblock, superblock, and driver info block
+         b: B-tree nodes
+         r: Dataset raw data
+         g: Global heap
+         l: local heap (object names)
+         o: object headers
+
   F - is a filename.
   P - is the full path from the root group to the object.
   N - is an integer greater than 1.
@@ -101,8 +112,12 @@ usage: h5dump [OPTIONS] files
 
       h5dump -d /dset -M 0,1,4,3 quux.h5
 
-  5) Dataset foo in files multi1.h5 multi2.h5 multi3.h5
+  5) Dataset foo in files file1.h5 file2.h5 file3.h5
+
+      h5dump -d /foo file1.h5 file2.h5 file3.h5
+
+  6) Dataset foo in split files splitfile-m.h5 splitfile-r.h5
 
-      h5dump -d /foo multi1.h5 multi2.h5 multi3.h5
+      h5dump -d /foo -f split splitfile
 
 h5dump error: Bad mask list(0,2,2,1,0,2,2,)
diff --git a/tools/testfiles/tpbitsLengthExceeded.ddl b/tools/testfiles/tpbitsLengthExceeded.ddl
index f89b65f..d8b627c 100644
--- a/tools/testfiles/tpbitsLengthExceeded.ddl
+++ b/tools/testfiles/tpbitsLengthExceeded.ddl
@@ -2,6 +2,7 @@ usage: h5dump [OPTIONS] files
   OPTIONS
      -h, --help           Print a usage message and exit
      -n, --contents       Print a list of the file contents and exit
+                          Optional value 1 also prints attributes.
      -B, --superblock     Print the content of the super block
      -H, --header         Print the header only; no data is displayed
      -A, --onlyattr       Print the header and value of attributes
@@ -61,10 +62,20 @@ usage: h5dump [OPTIONS] files
         number of dimensions in the dataspace being queried
 
   D - is the file driver to use in opening the file. Acceptable values
-        are "sec2", "family", "split", "multi", "direct", and "stream". Without
-        the file driver flag, the file will be opened with each driver in
-        turn and in the order specified above until one driver succeeds
-        in opening the file.
+      are "sec2", "family", "split", "multi", "direct", and "stream". Without
+      the file driver flag, the file will be opened with each driver in
+      turn and in the order specified above until one driver succeeds
+      in opening the file.
+      These are the letters that are appended to the file name(without .h5) when opening
+      names for the split(m,r) and multi(s,b,r,g,l,o) drivers. They are:
+         m: All meta data when using the split driver.
+         s: The userblock, superblock, and driver info block
+         b: B-tree nodes
+         r: Dataset raw data
+         g: Global heap
+         l: local heap (object names)
+         o: object headers
+
   F - is a filename.
   P - is the full path from the root group to the object.
   N - is an integer greater than 1.
@@ -101,8 +112,12 @@ usage: h5dump [OPTIONS] files
 
       h5dump -d /dset -M 0,1,4,3 quux.h5
 
-  5) Dataset foo in files multi1.h5 multi2.h5 multi3.h5
+  5) Dataset foo in files file1.h5 file2.h5 file3.h5
+
+      h5dump -d /foo file1.h5 file2.h5 file3.h5
+
+  6) Dataset foo in split files splitfile-m.h5 splitfile-r.h5
 
-      h5dump -d /foo multi1.h5 multi2.h5 multi3.h5
+      h5dump -d /foo -f split splitfile
 
 h5dump error: Packed Bit offset+length value(65) too large. Max is 64
diff --git a/tools/testfiles/tpbitsLengthPositive.ddl b/tools/testfiles/tpbitsLengthPositive.ddl
index ba32aa6..39cef23 100644
--- a/tools/testfiles/tpbitsLengthPositive.ddl
+++ b/tools/testfiles/tpbitsLengthPositive.ddl
@@ -2,6 +2,7 @@ usage: h5dump [OPTIONS] files
   OPTIONS
      -h, --help           Print a usage message and exit
      -n, --contents       Print a list of the file contents and exit
+                          Optional value 1 also prints attributes.
      -B, --superblock     Print the content of the super block
      -H, --header         Print the header only; no data is displayed
      -A, --onlyattr       Print the header and value of attributes
@@ -61,10 +62,20 @@ usage: h5dump [OPTIONS] files
         number of dimensions in the dataspace being queried
 
   D - is the file driver to use in opening the file. Acceptable values
-        are "sec2", "family", "split", "multi", "direct", and "stream". Without
-        the file driver flag, the file will be opened with each driver in
-        turn and in the order specified above until one driver succeeds
-        in opening the file.
+      are "sec2", "family", "split", "multi", "direct", and "stream". Without
+      the file driver flag, the file will be opened with each driver in
+      turn and in the order specified above until one driver succeeds
+      in opening the file.
+      These are the letters that are appended to the file name(without .h5) when opening
+      names for the split(m,r) and multi(s,b,r,g,l,o) drivers. They are:
+         m: All meta data when using the split driver.
+         s: The userblock, superblock, and driver info block
+         b: B-tree nodes
+         r: Dataset raw data
+         g: Global heap
+         l: local heap (object names)
+         o: object headers
+
   F - is a filename.
   P - is the full path from the root group to the object.
   N - is an integer greater than 1.
@@ -101,8 +112,12 @@ usage: h5dump [OPTIONS] files
 
       h5dump -d /dset -M 0,1,4,3 quux.h5
 
-  5) Dataset foo in files multi1.h5 multi2.h5 multi3.h5
+  5) Dataset foo in files file1.h5 file2.h5 file3.h5
+
+      h5dump -d /foo file1.h5 file2.h5 file3.h5
+
+  6) Dataset foo in split files splitfile-m.h5 splitfile-r.h5
 
-      h5dump -d /foo multi1.h5 multi2.h5 multi3.h5
+      h5dump -d /foo -f split splitfile
 
 h5dump error: Packed Bit length value(0) must be positive.
diff --git a/tools/testfiles/tpbitsMaxExceeded.ddl b/tools/testfiles/tpbitsMaxExceeded.ddl
index 16f953d..5f35825 100644
--- a/tools/testfiles/tpbitsMaxExceeded.ddl
+++ b/tools/testfiles/tpbitsMaxExceeded.ddl
@@ -2,6 +2,7 @@ usage: h5dump [OPTIONS] files
   OPTIONS
      -h, --help           Print a usage message and exit
      -n, --contents       Print a list of the file contents and exit
+                          Optional value 1 also prints attributes.
      -B, --superblock     Print the content of the super block
      -H, --header         Print the header only; no data is displayed
      -A, --onlyattr       Print the header and value of attributes
@@ -61,10 +62,20 @@ usage: h5dump [OPTIONS] files
         number of dimensions in the dataspace being queried
 
   D - is the file driver to use in opening the file. Acceptable values
-        are "sec2", "family", "split", "multi", "direct", and "stream". Without
-        the file driver flag, the file will be opened with each driver in
-        turn and in the order specified above until one driver succeeds
-        in opening the file.
+      are "sec2", "family", "split", "multi", "direct", and "stream". Without
+      the file driver flag, the file will be opened with each driver in
+      turn and in the order specified above until one driver succeeds
+      in opening the file.
+      These are the letters that are appended to the file name(without .h5) when opening
+      names for the split(m,r) and multi(s,b,r,g,l,o) drivers. They are:
+         m: All meta data when using the split driver.
+         s: The userblock, superblock, and driver info block
+         b: B-tree nodes
+         r: Dataset raw data
+         g: Global heap
+         l: local heap (object names)
+         o: object headers
+
   F - is a filename.
   P - is the full path from the root group to the object.
   N - is an integer greater than 1.
@@ -101,8 +112,12 @@ usage: h5dump [OPTIONS] files
 
       h5dump -d /dset -M 0,1,4,3 quux.h5
 
-  5) Dataset foo in files multi1.h5 multi2.h5 multi3.h5
+  5) Dataset foo in files file1.h5 file2.h5 file3.h5
+
+      h5dump -d /foo file1.h5 file2.h5 file3.h5
+
+  6) Dataset foo in split files splitfile-m.h5 splitfile-r.h5
 
-      h5dump -d /foo multi1.h5 multi2.h5 multi3.h5
+      h5dump -d /foo -f split splitfile
 
 h5dump error: Too many masks requested (max. 8). Mask list(0,1,0,1,1,1,2,1,3,1,4,1,5,1,6,1,7,1)
diff --git a/tools/testfiles/tpbitsOffsetExceeded.ddl b/tools/testfiles/tpbitsOffsetExceeded.ddl
index 446fe2d..92cc816 100644
--- a/tools/testfiles/tpbitsOffsetExceeded.ddl
+++ b/tools/testfiles/tpbitsOffsetExceeded.ddl
@@ -2,6 +2,7 @@ usage: h5dump [OPTIONS] files
   OPTIONS
      -h, --help           Print a usage message and exit
      -n, --contents       Print a list of the file contents and exit
+                          Optional value 1 also prints attributes.
      -B, --superblock     Print the content of the super block
      -H, --header         Print the header only; no data is displayed
      -A, --onlyattr       Print the header and value of attributes
@@ -61,10 +62,20 @@ usage: h5dump [OPTIONS] files
         number of dimensions in the dataspace being queried
 
   D - is the file driver to use in opening the file. Acceptable values
-        are "sec2", "family", "split", "multi", "direct", and "stream". Without
-        the file driver flag, the file will be opened with each driver in
-        turn and in the order specified above until one driver succeeds
-        in opening the file.
+      are "sec2", "family", "split", "multi", "direct", and "stream". Without
+      the file driver flag, the file will be opened with each driver in
+      turn and in the order specified above until one driver succeeds
+      in opening the file.
+      These are the letters that are appended to the file name(without .h5) when opening
+      names for the split(m,r) and multi(s,b,r,g,l,o) drivers. They are:
+         m: All meta data when using the split driver.
+         s: The userblock, superblock, and driver info block
+         b: B-tree nodes
+         r: Dataset raw data
+         g: Global heap
+         l: local heap (object names)
+         o: object headers
+
   F - is a filename.
   P - is the full path from the root group to the object.
   N - is an integer greater than 1.
@@ -101,8 +112,12 @@ usage: h5dump [OPTIONS] files
 
       h5dump -d /dset -M 0,1,4,3 quux.h5
 
-  5) Dataset foo in files multi1.h5 multi2.h5 multi3.h5
+  5) Dataset foo in files file1.h5 file2.h5 file3.h5
+
+      h5dump -d /foo file1.h5 file2.h5 file3.h5
+
+  6) Dataset foo in split files splitfile-m.h5 splitfile-r.h5
 
-      h5dump -d /foo multi1.h5 multi2.h5 multi3.h5
+      h5dump -d /foo -f split splitfile
 
 h5dump error: Packed Bit offset value(64) must be between 0 and 63
diff --git a/tools/testfiles/tpbitsOffsetNegative.ddl b/tools/testfiles/tpbitsOffsetNegative.ddl
index 747cf99..c318834 100644
--- a/tools/testfiles/tpbitsOffsetNegative.ddl
+++ b/tools/testfiles/tpbitsOffsetNegative.ddl
@@ -2,6 +2,7 @@ usage: h5dump [OPTIONS] files
   OPTIONS
      -h, --help           Print a usage message and exit
      -n, --contents       Print a list of the file contents and exit
+                          Optional value 1 also prints attributes.
      -B, --superblock     Print the content of the super block
      -H, --header         Print the header only; no data is displayed
      -A, --onlyattr       Print the header and value of attributes
@@ -61,10 +62,20 @@ usage: h5dump [OPTIONS] files
         number of dimensions in the dataspace being queried
 
   D - is the file driver to use in opening the file. Acceptable values
-        are "sec2", "family", "split", "multi", "direct", and "stream". Without
-        the file driver flag, the file will be opened with each driver in
-        turn and in the order specified above until one driver succeeds
-        in opening the file.
+      are "sec2", "family", "split", "multi", "direct", and "stream". Without
+      the file driver flag, the file will be opened with each driver in
+      turn and in the order specified above until one driver succeeds
+      in opening the file.
+      These are the letters that are appended to the file name(without .h5) when opening
+      names for the split(m,r) and multi(s,b,r,g,l,o) drivers. They are:
+         m: All meta data when using the split driver.
+         s: The userblock, superblock, and driver info block
+         b: B-tree nodes
+         r: Dataset raw data
+         g: Global heap
+         l: local heap (object names)
+         o: object headers
+
   F - is a filename.
   P - is the full path from the root group to the object.
   N - is an integer greater than 1.
@@ -101,8 +112,12 @@ usage: h5dump [OPTIONS] files
 
       h5dump -d /dset -M 0,1,4,3 quux.h5
 
-  5) Dataset foo in files multi1.h5 multi2.h5 multi3.h5
+  5) Dataset foo in files file1.h5 file2.h5 file3.h5
+
+      h5dump -d /foo file1.h5 file2.h5 file3.h5
+
+  6) Dataset foo in split files splitfile-m.h5 splitfile-r.h5
 
-      h5dump -d /foo multi1.h5 multi2.h5 multi3.h5
+      h5dump -d /foo -f split splitfile
 
 h5dump error: Bad mask list(-1,1)
diff --git a/tools/testfiles/tperror.ddl b/tools/testfiles/tperror.ddl
index 16a7d8e..0cb961c 100644
--- a/tools/testfiles/tperror.ddl
+++ b/tools/testfiles/tperror.ddl
@@ -1,35 +1,2 @@
 HDF5 "tfcontents1.h5" {
 }
-HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
-  #000: (file name) line (number) in H5Dopen2(): not found
-    major: Dataset
-    minor: Object not found
-  #001: (file name) line (number) in H5G_loc_find(): can't find object
-    major: Symbol table
-    minor: Object not found
-  #002: (file name) line (number) in H5G_traverse(): internal path traversal failed
-    major: Symbol table
-    minor: Object not found
-  #003: (file name) line (number) in H5G_traverse_real(): traversal operator failed
-    major: Symbol table
-    minor: Callback failed
-  #004: (file name) line (number) in H5G_loc_find_cb(): object 'bogus' doesn't exist
-    major: Symbol table
-    minor: Object not found
-HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
-  #000: (file name) line (number) in H5Lget_info(): unable to get link info
-    major: Symbol table
-    minor: Object not found
-  #001: (file name) line (number) in H5L_get_info(): name doesn't exist
-    major: Symbol table
-    minor: Object already exists
-  #002: (file name) line (number) in H5G_traverse(): internal path traversal failed
-    major: Symbol table
-    minor: Object not found
-  #003: (file name) line (number) in H5G_traverse_real(): traversal operator failed
-    major: Symbol table
-    minor: Callback failed
-  #004: (file name) line (number) in H5L_get_info_cb(): name doesn't exist
-    major: Symbol table
-    minor: Object not found
-h5dump error: unable to get link info from "bogus"
diff --git a/tools/testfiles/tqmarkfile.ddl b/tools/testfiles/tqmarkfile.ddl
index e7771cb..885be5f 100644
--- a/tools/testfiles/tqmarkfile.ddl
+++ b/tools/testfiles/tqmarkfile.ddl
@@ -48,36 +48,3 @@ DATASET "Dataset1" {
 }
 HDF5 "tarray8.h5" {
 }
-HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
-  #000: (file name) line (number) in H5Dopen2(): not found
-    major: Dataset
-    minor: Object not found
-  #001: (file name) line (number) in H5G_loc_find(): can't find object
-    major: Symbol table
-    minor: Object not found
-  #002: (file name) line (number) in H5G_traverse(): internal path traversal failed
-    major: Symbol table
-    minor: Object not found
-  #003: (file name) line (number) in H5G_traverse_real(): traversal operator failed
-    major: Symbol table
-    minor: Callback failed
-  #004: (file name) line (number) in H5G_loc_find_cb(): object 'Dataset1' doesn't exist
-    major: Symbol table
-    minor: Object not found
-HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
-  #000: (file name) line (number) in H5Lget_info(): unable to get link info
-    major: Symbol table
-    minor: Object not found
-  #001: (file name) line (number) in H5L_get_info(): name doesn't exist
-    major: Symbol table
-    minor: Object already exists
-  #002: (file name) line (number) in H5G_traverse(): internal path traversal failed
-    major: Symbol table
-    minor: Object not found
-  #003: (file name) line (number) in H5G_traverse_real(): traversal operator failed
-    major: Symbol table
-    minor: Callback failed
-  #004: (file name) line (number) in H5L_get_info_cb(): name doesn't exist
-    major: Symbol table
-    minor: Object not found
-h5dump error: unable to get link info from "Dataset1"
diff --git a/tools/testfiles/tslink-D.ddl b/tools/testfiles/tslink-D.ddl
index a1d999a..9d90262 100644
--- a/tools/testfiles/tslink-D.ddl
+++ b/tools/testfiles/tslink-D.ddl
@@ -3,28 +3,3 @@ SOFTLINK "/slink1" {
    LINKTARGET "somevalue"
 }
 }
-HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
-  #000: (file name) line (number) in H5Dopen2(): not found
-    major: Dataset
-    minor: Object not found
-  #001: (file name) line (number) in H5G_loc_find(): can't find object
-    major: Symbol table
-    minor: Object not found
-  #002: (file name) line (number) in H5G_traverse(): internal path traversal failed
-    major: Symbol table
-    minor: Object not found
-  #003: (file name) line (number) in H5G_traverse_real(): special link traversal failed
-    major: Links
-    minor: Link traversal failure
-  #004: (file name) line (number) in H5G__traverse_special(): symbolic link traversal failed
-    major: Links
-    minor: Link traversal failure
-  #005: (file name) line (number) in H5G_traverse_slink(): unable to follow symbolic link
-    major: Symbol table
-    minor: Object not found
-  #006: (file name) line (number) in H5G_traverse_real(): traversal operator failed
-    major: Symbol table
-    minor: Callback failed
-  #007: (file name) line (number) in H5G_traverse_slink_cb(): component not found
-    major: Symbol table
-    minor: Object not found
diff --git a/tools/testfiles/twidedisplay.ddl b/tools/testfiles/twidedisplay.ddl
new file mode 100644
index 0000000..1e6ffee
--- /dev/null
+++ b/tools/testfiles/twidedisplay.ddl
@@ -0,0 +1,130 @@
+HDF5 "packedbits.h5" {
+GROUP "/" {
+   DATASET "DS08BITS" {
+      DATATYPE  H5T_STD_I8LE
+      DATASPACE  SIMPLE { ( 8, 8 ) / ( 8, 8 ) }
+      DATA {
+      (0,0): -1, -2, -4, -8, -16, -32, -64, -128,
+      (1,0): -2, -4, -8, -16, -32, -64, -128, 0,
+      (2,0): -4, -8, -16, -32, -64, -128, 0, 0,
+      (3,0): -8, -16, -32, -64, -128, 0, 0, 0,
+      (4,0): -16, -32, -64, -128, 0, 0, 0, 0,
+      (5,0): -32, -64, -128, 0, 0, 0, 0, 0,
+      (6,0): -64, -128, 0, 0, 0, 0, 0, 0,
+      (7,0): -128, 0, 0, 0, 0, 0, 0, 0
+      }
+   }
+   DATASET "DS16BITS" {
+      DATATYPE  H5T_STD_I16LE
+      DATASPACE  SIMPLE { ( 8, 16 ) / ( 8, 16 ) }
+      DATA {
+      (0,0): -1, -2, -4, -8, -16, -32, -64, -128, -256, -512, -1024, -2048, -4096, -8192, -16384, -32768,
+      (1,0): -2, -4, -8, -16, -32, -64, -128, -256, -512, -1024, -2048, -4096, -8192, -16384, -32768, 0,
+      (2,0): -4, -8, -16, -32, -64, -128, -256, -512, -1024, -2048, -4096, -8192, -16384, -32768, 0, 0,
+      (3,0): -8, -16, -32, -64, -128, -256, -512, -1024, -2048, -4096, -8192, -16384, -32768, 0, 0, 0,
+      (4,0): -16, -32, -64, -128, -256, -512, -1024, -2048, -4096, -8192, -16384, -32768, 0, 0, 0, 0,
+      (5,0): -32, -64, -128, -256, -512, -1024, -2048, -4096, -8192, -16384, -32768, 0, 0, 0, 0, 0,
+      (6,0): -64, -128, -256, -512, -1024, -2048, -4096, -8192, -16384, -32768, 0, 0, 0, 0, 0, 0,
+      (7,0): -128, -256, -512, -1024, -2048, -4096, -8192, -16384, -32768, 0, 0, 0, 0, 0, 0, 0
+      }
+   }
+   DATASET "DS32BITS" {
+      DATATYPE  H5T_STD_I32LE
+      DATASPACE  SIMPLE { ( 8, 32 ) / ( 8, 32 ) }
+      DATA {
+      (0,0): -1, -2, -4, -8, -16, -32, -64, -128, -256, -512, -1024, -2048, -4096, -8192, -16384, -32768, -65536, -131072, -262144, -524288, -1048576, -2097152, -4194304, -8388608, -16777216, -33554432, -67108864, -134217728, -268435456, -536870912, -1073741824, -2147483648,
+      (1,0): -2, -4, -8, -16, -32, -64, -128, -256, -512, -1024, -2048, -4096, -8192, -16384, -32768, -65536, -131072, -262144, -524288, -1048576, -2097152, -4194304, -8388608, -16777216, -33554432, -67108864, -134217728, -268435456, -536870912, -1073741824, -2147483648, 0,
+      (2,0): -4, -8, -16, -32, -64, -128, -256, -512, -1024, -2048, -4096, -8192, -16384, -32768, -65536, -131072, -262144, -524288, -1048576, -2097152, -4194304, -8388608, -16777216, -33554432, -67108864, -134217728, -268435456, -536870912, -1073741824, -2147483648, 0, 0,
+      (3,0): -8, -16, -32, -64, -128, -256, -512, -1024, -2048, -4096, -8192, -16384, -32768, -65536, -131072, -262144, -524288, -1048576, -2097152, -4194304, -8388608, -16777216, -33554432, -67108864, -134217728, -268435456, -536870912, -1073741824, -2147483648, 0, 0, 0,
+      (4,0): -16, -32, -64, -128, -256, -512, -1024, -2048, -4096, -8192, -16384, -32768, -65536, -131072, -262144, -524288, -1048576, -2097152, -4194304, -8388608, -16777216, -33554432, -67108864, -134217728, -268435456, -536870912, -1073741824, -2147483648, 0, 0, 0, 0,
+      (5,0): -32, -64, -128, -256, -512, -1024, -2048, -4096, -8192, -16384, -32768, -65536, -131072, -262144, -524288, -1048576, -2097152, -4194304, -8388608, -16777216, -33554432, -67108864, -134217728, -268435456, -536870912, -1073741824, -2147483648, 0, 0, 0, 0, 0,
+      (6,0): -64, -128, -256, -512, -1024, -2048, -4096, -8192, -16384, -32768, -65536, -131072, -262144, -524288, -1048576, -2097152, -4194304, -8388608, -16777216, -33554432, -67108864, -134217728, -268435456, -536870912, -1073741824, -2147483648, 0, 0, 0, 0, 0, 0,
+      (7,0): -128, -256, -512, -1024, -2048, -4096, -8192, -16384, -32768, -65536, -131072, -262144, -524288, -1048576, -2097152, -4194304, -8388608, -16777216, -33554432, -67108864, -134217728, -268435456, -536870912, -1073741824, -2147483648, 0, 0, 0, 0, 0, 0, 0
+      }
+   }
+   DATASET "DS64BITS" {
+      DATATYPE  H5T_STD_I64LE
+      DATASPACE  SIMPLE { ( 8, 64 ) / ( 8, 64 ) }
+      DATA {
+      (0,0): -1, -2, -4, -8, -16, -32, -64, -128, -256, -512, -1024, -2048, -4096, -8192, -16384, -32768, -65536, -131072, -262144, -524288, -1048576, -2097152, -4194304, -8388608, -16777216, -33554432, -67108864, -134217728, -268435456, -536870912, -1073741824, -2147483648, -4294967296, -8589934592, -17179869184, -34359738368, -68719476736, -137438953472, -274877906944, -549755813888, -1099511627776, -2199023255552, -4398046511104, -8796093022208, -17592186044416, -35184372088832, -70368744177664, -140737488355328, -281474976710656, -562949953421312, -1125899906842624, -2251799813685248, -4503599627370496, -9007199254740992, -18014398509481984, -36028797018963968, -72057594037927936, -144115188075855872, -288230376151711744, -576460752303423488, -1152921504606846976, -2305843009213693952, -4611686018427387904, -9223372036854775808,
+      (1,0): -2, -4, -8, -16, -32, -64, -128, -256, -512, -1024, -2048, -4096, -8192, -16384, -32768, -65536, -131072, -262144, -524288, -1048576, -2097152, -4194304, -8388608, -16777216, -33554432, -67108864, -134217728, -268435456, -536870912, -1073741824, -2147483648, -4294967296, -8589934592, -17179869184, -34359738368, -68719476736, -137438953472, -274877906944, -549755813888, -1099511627776, -2199023255552, -4398046511104, -8796093022208, -17592186044416, -35184372088832, -70368744177664, -140737488355328, -281474976710656, -562949953421312, -1125899906842624, -2251799813685248, -4503599627370496, -9007199254740992, -18014398509481984, -36028797018963968, -72057594037927936, -144115188075855872, -288230376151711744, -576460752303423488, -1152921504606846976, -2305843009213693952, -4611686018427387904, -9223372036854775808, 0,
+      (2,0): -4, -8, -16, -32, -64, -128, -256, -512, -1024, -2048, -4096, -8192, -16384, -32768, -65536, -131072, -262144, -524288, -1048576, -2097152, -4194304, -8388608, -16777216, -33554432, -67108864, -134217728, -268435456, -536870912, -1073741824, -2147483648, -4294967296, -8589934592, -17179869184, -34359738368, -68719476736, -137438953472, -274877906944, -549755813888, -1099511627776, -2199023255552, -4398046511104, -8796093022208, -17592186044416, -35184372088832, -70368744177664, -140737488355328, -281474976710656, -562949953421312, -1125899906842624, -2251799813685248, -4503599627370496, -9007199254740992, -18014398509481984, -36028797018963968, -72057594037927936, -144115188075855872, -288230376151711744, -576460752303423488, -1152921504606846976, -2305843009213693952, -4611686018427387904, -9223372036854775808, 0, 0,
+      (3,0): -8, -16, -32, -64, -128, -256, -512, -1024, -2048, -4096, -8192, -16384, -32768, -65536, -131072, -262144, -524288, -1048576, -2097152, -4194304, -8388608, -16777216, -33554432, -67108864, -134217728, -268435456, -536870912, -1073741824, -2147483648, -4294967296, -8589934592, -17179869184, -34359738368, -68719476736, -137438953472, -274877906944, -549755813888, -1099511627776, -2199023255552, -4398046511104, -8796093022208, -17592186044416, -35184372088832, -70368744177664, -140737488355328, -281474976710656, -562949953421312, -1125899906842624, -2251799813685248, -4503599627370496, -9007199254740992, -18014398509481984, -36028797018963968, -72057594037927936, -144115188075855872, -288230376151711744, -576460752303423488, -1152921504606846976, -2305843009213693952, -4611686018427387904, -9223372036854775808, 0, 0, 0,
+      (4,0): -16, -32, -64, -128, -256, -512, -1024, -2048, -4096, -8192, -16384, -32768, -65536, -131072, -262144, -524288, -1048576, -2097152, -4194304, -8388608, -16777216, -33554432, -67108864, -134217728, -268435456, -536870912, -1073741824, -2147483648, -4294967296, -8589934592, -17179869184, -34359738368, -68719476736, -137438953472, -274877906944, -549755813888, -1099511627776, -2199023255552, -4398046511104, -8796093022208, -17592186044416, -35184372088832, -70368744177664, -140737488355328, -281474976710656, -562949953421312, -1125899906842624, -2251799813685248, -4503599627370496, -9007199254740992, -18014398509481984, -36028797018963968, -72057594037927936, -144115188075855872, -288230376151711744, -576460752303423488, -1152921504606846976, -2305843009213693952, -4611686018427387904, -9223372036854775808, 0, 0, 0, 0,
+      (5,0): -32, -64, -128, -256, -512, -1024, -2048, -4096, -8192, -16384, -32768, -65536, -131072, -262144, -524288, -1048576, -2097152, -4194304, -8388608, -16777216, -33554432, -67108864, -134217728, -268435456, -536870912, -1073741824, -2147483648, -4294967296, -8589934592, -17179869184, -34359738368, -68719476736, -137438953472, -274877906944, -549755813888, -1099511627776, -2199023255552, -4398046511104, -8796093022208, -17592186044416, -35184372088832, -70368744177664, -140737488355328, -281474976710656, -562949953421312, -1125899906842624, -2251799813685248, -4503599627370496, -9007199254740992, -18014398509481984, -36028797018963968, -72057594037927936, -144115188075855872, -288230376151711744, -576460752303423488, -1152921504606846976, -2305843009213693952, -4611686018427387904, -9223372036854775808, 0, 0, 0, 0, 0,
+      (6,0): -64, -128, -256, -512, -1024, -2048, -4096, -8192, -16384, -32768, -65536, -131072, -262144, -524288, -1048576, -2097152, -4194304, -8388608, -16777216, -33554432, -67108864, -134217728, -268435456, -536870912, -1073741824, -2147483648, -4294967296, -8589934592, -17179869184, -34359738368, -68719476736, -137438953472, -274877906944, -549755813888, -1099511627776, -2199023255552, -4398046511104, -8796093022208, -17592186044416, -35184372088832, -70368744177664, -140737488355328, -281474976710656, -562949953421312, -1125899906842624, -2251799813685248, -4503599627370496, -9007199254740992, -18014398509481984, -36028797018963968, -72057594037927936, -144115188075855872, -288230376151711744, -576460752303423488, -1152921504606846976, -2305843009213693952, -4611686018427387904, -9223372036854775808, 0, 0, 0, 0, 0, 0,
+      (7,0): -128, -256, -512, -1024, -2048, -4096, -8192, -16384, -32768, -65536, -131072, -262144, -524288, -1048576, -2097152, -4194304, -8388608, -16777216, -33554432, -67108864, -134217728, -268435456, -536870912, -1073741824, -2147483648, -4294967296, -8589934592, -17179869184, -34359738368, -68719476736, -137438953472, -274877906944, -549755813888, -1099511627776, -2199023255552, -4398046511104, -8796093022208, -17592186044416, -35184372088832, -70368744177664, -140737488355328, -281474976710656, -562949953421312, -1125899906842624, -2251799813685248, -4503599627370496, -9007199254740992, -18014398509481984, -36028797018963968, -72057594037927936, -144115188075855872, -288230376151711744, -576460752303423488, -1152921504606846976, -2305843009213693952, -4611686018427387904, -9223372036854775808, 0, 0, 0, 0, 0, 0, 0
+      }
+   }
+   DATASET "DU08BITS" {
+      DATATYPE  H5T_STD_U8LE
+      DATASPACE  SIMPLE { ( 8, 8 ) / ( 8, 8 ) }
+      DATA {
+      (0,0): 255, 254, 252, 248, 240, 224, 192, 128,
+      (1,0): 254, 252, 248, 240, 224, 192, 128, 0,
+      (2,0): 252, 248, 240, 224, 192, 128, 0, 0,
+      (3,0): 248, 240, 224, 192, 128, 0, 0, 0,
+      (4,0): 240, 224, 192, 128, 0, 0, 0, 0,
+      (5,0): 224, 192, 128, 0, 0, 0, 0, 0,
+      (6,0): 192, 128, 0, 0, 0, 0, 0, 0,
+      (7,0): 128, 0, 0, 0, 0, 0, 0, 0
+      }
+   }
+   DATASET "DU16BITS" {
+      DATATYPE  H5T_STD_U16LE
+      DATASPACE  SIMPLE { ( 8, 16 ) / ( 8, 16 ) }
+      DATA {
+      (0,0): 65535, 65534, 65532, 65528, 65520, 65504, 65472, 65408, 65280, 65024, 64512, 63488, 61440, 57344, 49152, 32768,
+      (1,0): 65534, 65532, 65528, 65520, 65504, 65472, 65408, 65280, 65024, 64512, 63488, 61440, 57344, 49152, 32768, 0,
+      (2,0): 65532, 65528, 65520, 65504, 65472, 65408, 65280, 65024, 64512, 63488, 61440, 57344, 49152, 32768, 0, 0,
+      (3,0): 65528, 65520, 65504, 65472, 65408, 65280, 65024, 64512, 63488, 61440, 57344, 49152, 32768, 0, 0, 0,
+      (4,0): 65520, 65504, 65472, 65408, 65280, 65024, 64512, 63488, 61440, 57344, 49152, 32768, 0, 0, 0, 0,
+      (5,0): 65504, 65472, 65408, 65280, 65024, 64512, 63488, 61440, 57344, 49152, 32768, 0, 0, 0, 0, 0,
+      (6,0): 65472, 65408, 65280, 65024, 64512, 63488, 61440, 57344, 49152, 32768, 0, 0, 0, 0, 0, 0,
+      (7,0): 65408, 65280, 65024, 64512, 63488, 61440, 57344, 49152, 32768, 0, 0, 0, 0, 0, 0, 0
+      }
+   }
+   DATASET "DU32BITS" {
+      DATATYPE  H5T_STD_U32LE
+      DATASPACE  SIMPLE { ( 8, 32 ) / ( 8, 32 ) }
+      DATA {
+      (0,0): 4294967295, 4294967294, 4294967292, 4294967288, 4294967280, 4294967264, 4294967232, 4294967168, 4294967040, 4294966784, 4294966272, 4294965248, 4294963200, 4294959104, 4294950912, 4294934528, 4294901760, 4294836224, 4294705152, 4294443008, 4293918720, 4292870144, 4290772992, 4286578688, 4278190080, 4261412864, 4227858432, 4160749568, 4026531840, 3758096384, 3221225472, 2147483648,
+      (1,0): 4294967294, 4294967292, 4294967288, 4294967280, 4294967264, 4294967232, 4294967168, 4294967040, 4294966784, 4294966272, 4294965248, 4294963200, 4294959104, 4294950912, 4294934528, 4294901760, 4294836224, 4294705152, 4294443008, 4293918720, 4292870144, 4290772992, 4286578688, 4278190080, 4261412864, 4227858432, 4160749568, 4026531840, 3758096384, 3221225472, 2147483648, 0,
+      (2,0): 4294967292, 4294967288, 4294967280, 4294967264, 4294967232, 4294967168, 4294967040, 4294966784, 4294966272, 4294965248, 4294963200, 4294959104, 4294950912, 4294934528, 4294901760, 4294836224, 4294705152, 4294443008, 4293918720, 4292870144, 4290772992, 4286578688, 4278190080, 4261412864, 4227858432, 4160749568, 4026531840, 3758096384, 3221225472, 2147483648, 0, 0,
+      (3,0): 4294967288, 4294967280, 4294967264, 4294967232, 4294967168, 4294967040, 4294966784, 4294966272, 4294965248, 4294963200, 4294959104, 4294950912, 4294934528, 4294901760, 4294836224, 4294705152, 4294443008, 4293918720, 4292870144, 4290772992, 4286578688, 4278190080, 4261412864, 4227858432, 4160749568, 4026531840, 3758096384, 3221225472, 2147483648, 0, 0, 0,
+      (4,0): 4294967280, 4294967264, 4294967232, 4294967168, 4294967040, 4294966784, 4294966272, 4294965248, 4294963200, 4294959104, 4294950912, 4294934528, 4294901760, 4294836224, 4294705152, 4294443008, 4293918720, 4292870144, 4290772992, 4286578688, 4278190080, 4261412864, 4227858432, 4160749568, 4026531840, 3758096384, 3221225472, 2147483648, 0, 0, 0, 0,
+      (5,0): 4294967264, 4294967232, 4294967168, 4294967040, 4294966784, 4294966272, 4294965248, 4294963200, 4294959104, 4294950912, 4294934528, 4294901760, 4294836224, 4294705152, 4294443008, 4293918720, 4292870144, 4290772992, 4286578688, 4278190080, 4261412864, 4227858432, 4160749568, 4026531840, 3758096384, 3221225472, 2147483648, 0, 0, 0, 0, 0,
+      (6,0): 4294967232, 4294967168, 4294967040, 4294966784, 4294966272, 4294965248, 4294963200, 4294959104, 4294950912, 4294934528, 4294901760, 4294836224, 4294705152, 4294443008, 4293918720, 4292870144, 4290772992, 4286578688, 4278190080, 4261412864, 4227858432, 4160749568, 4026531840, 3758096384, 3221225472, 2147483648, 0, 0, 0, 0, 0, 0,
+      (7,0): 4294967168, 4294967040, 4294966784, 4294966272, 4294965248, 4294963200, 4294959104, 4294950912, 4294934528, 4294901760, 4294836224, 4294705152, 4294443008, 4293918720, 4292870144, 4290772992, 4286578688, 4278190080, 4261412864, 4227858432, 4160749568, 4026531840, 3758096384, 3221225472, 2147483648, 0, 0, 0, 0, 0, 0, 0
+      }
+   }
+   DATASET "DU64BITS" {
+      DATATYPE  H5T_STD_U64LE
+      DATASPACE  SIMPLE { ( 8, 64 ) / ( 8, 64 ) }
+      DATA {
+      (0,0): 18446744073709551615, 18446744073709551614, 18446744073709551612, 18446744073709551608, 18446744073709551600, 18446744073709551584, 18446744073709551552, 18446744073709551488, 18446744073709551360, 18446744073709551104, 18446744073709550592, 18446744073709549568, 18446744073709547520, 18446744073709543424, 18446744073709535232, 18446744073709518848, 18446744073709486080, 18446744073709420544, 18446744073709289472, 18446744073709027328, 18446744073708503040, 18446744073707454464, 18446744073705357312, 18446744073701163008, 18446744073692774400, 18446744073675997184, 18446744073642442752, 18446744073575333888, 18446744073441116160, 18446744073172680704, 18446744072635809792, 18446744071562067968, 18446744069414584320, 18446744065119617024, 18446744056529682432, 18446744039349813248, 18446744004990074880, 18446743936270598144, 18446743798831644672, 18446743523953737728, 18446742974197923840, 18446741874686296064, 18446739675663040512, 18446735277616529408, 18446726481523507200, 18446708889337462784, 18446673704965373952, 18446603336221196288, 18446462598732840960, 18446181123756130304, 18445618173802708992, 18444492273895866368, 18442240474082181120, 18437736874454810624, 18428729675200069632, 18410715276690587648, 18374686479671623680, 18302628885633695744, 18158513697557839872, 17870283321406128128, 17293822569102704640, 16140901064495857664, 13835058055282163712, 9223372036854775808,
+      (1,0): 18446744073709551614, 18446744073709551612, 18446744073709551608, 18446744073709551600, 18446744073709551584, 18446744073709551552, 18446744073709551488, 18446744073709551360, 18446744073709551104, 18446744073709550592, 18446744073709549568, 18446744073709547520, 18446744073709543424, 18446744073709535232, 18446744073709518848, 18446744073709486080, 18446744073709420544, 18446744073709289472, 18446744073709027328, 18446744073708503040, 18446744073707454464, 18446744073705357312, 18446744073701163008, 18446744073692774400, 18446744073675997184, 18446744073642442752, 18446744073575333888, 18446744073441116160, 18446744073172680704, 18446744072635809792, 18446744071562067968, 18446744069414584320, 18446744065119617024, 18446744056529682432, 18446744039349813248, 18446744004990074880, 18446743936270598144, 18446743798831644672, 18446743523953737728, 18446742974197923840, 18446741874686296064, 18446739675663040512, 18446735277616529408, 18446726481523507200, 18446708889337462784, 18446673704965373952, 18446603336221196288, 18446462598732840960, 18446181123756130304, 18445618173802708992, 18444492273895866368, 18442240474082181120, 18437736874454810624, 18428729675200069632, 18410715276690587648, 18374686479671623680, 18302628885633695744, 18158513697557839872, 17870283321406128128, 17293822569102704640, 16140901064495857664, 13835058055282163712, 9223372036854775808, 0,
+      (2,0): 18446744073709551612, 18446744073709551608, 18446744073709551600, 18446744073709551584, 18446744073709551552, 18446744073709551488, 18446744073709551360, 18446744073709551104, 18446744073709550592, 18446744073709549568, 18446744073709547520, 18446744073709543424, 18446744073709535232, 18446744073709518848, 18446744073709486080, 18446744073709420544, 18446744073709289472, 18446744073709027328, 18446744073708503040, 18446744073707454464, 18446744073705357312, 18446744073701163008, 18446744073692774400, 18446744073675997184, 18446744073642442752, 18446744073575333888, 18446744073441116160, 18446744073172680704, 18446744072635809792, 18446744071562067968, 18446744069414584320, 18446744065119617024, 18446744056529682432, 18446744039349813248, 18446744004990074880, 18446743936270598144, 18446743798831644672, 18446743523953737728, 18446742974197923840, 18446741874686296064, 18446739675663040512, 18446735277616529408, 18446726481523507200, 18446708889337462784, 18446673704965373952, 18446603336221196288, 18446462598732840960, 18446181123756130304, 18445618173802708992, 18444492273895866368, 18442240474082181120, 18437736874454810624, 18428729675200069632, 18410715276690587648, 18374686479671623680, 18302628885633695744, 18158513697557839872, 17870283321406128128, 17293822569102704640, 16140901064495857664, 13835058055282163712, 9223372036854775808, 0, 0,
+      (3,0): 18446744073709551608, 18446744073709551600, 18446744073709551584, 18446744073709551552, 18446744073709551488, 18446744073709551360, 18446744073709551104, 18446744073709550592, 18446744073709549568, 18446744073709547520, 18446744073709543424, 18446744073709535232, 18446744073709518848, 18446744073709486080, 18446744073709420544, 18446744073709289472, 18446744073709027328, 18446744073708503040, 18446744073707454464, 18446744073705357312, 18446744073701163008, 18446744073692774400, 18446744073675997184, 18446744073642442752, 18446744073575333888, 18446744073441116160, 18446744073172680704, 18446744072635809792, 18446744071562067968, 18446744069414584320, 18446744065119617024, 18446744056529682432, 18446744039349813248, 18446744004990074880, 18446743936270598144, 18446743798831644672, 18446743523953737728, 18446742974197923840, 18446741874686296064, 18446739675663040512, 18446735277616529408, 18446726481523507200, 18446708889337462784, 18446673704965373952, 18446603336221196288, 18446462598732840960, 18446181123756130304, 18445618173802708992, 18444492273895866368, 18442240474082181120, 18437736874454810624, 18428729675200069632, 18410715276690587648, 18374686479671623680, 18302628885633695744, 18158513697557839872, 17870283321406128128, 17293822569102704640, 16140901064495857664, 13835058055282163712, 9223372036854775808, 0, 0, 0,
+      (4,0): 18446744073709551600, 18446744073709551584, 18446744073709551552, 18446744073709551488, 18446744073709551360, 18446744073709551104, 18446744073709550592, 18446744073709549568, 18446744073709547520, 18446744073709543424, 18446744073709535232, 18446744073709518848, 18446744073709486080, 18446744073709420544, 18446744073709289472, 18446744073709027328, 18446744073708503040, 18446744073707454464, 18446744073705357312, 18446744073701163008, 18446744073692774400, 18446744073675997184, 18446744073642442752, 18446744073575333888, 18446744073441116160, 18446744073172680704, 18446744072635809792, 18446744071562067968, 18446744069414584320, 18446744065119617024, 18446744056529682432, 18446744039349813248, 18446744004990074880, 18446743936270598144, 18446743798831644672, 18446743523953737728, 18446742974197923840, 18446741874686296064, 18446739675663040512, 18446735277616529408, 18446726481523507200, 18446708889337462784, 18446673704965373952, 18446603336221196288, 18446462598732840960, 18446181123756130304, 18445618173802708992, 18444492273895866368, 18442240474082181120, 18437736874454810624, 18428729675200069632, 18410715276690587648, 18374686479671623680, 18302628885633695744, 18158513697557839872, 17870283321406128128, 17293822569102704640, 16140901064495857664, 13835058055282163712, 9223372036854775808, 0, 0, 0, 0,
+      (5,0): 18446744073709551584, 18446744073709551552, 18446744073709551488, 18446744073709551360, 18446744073709551104, 18446744073709550592, 18446744073709549568, 18446744073709547520, 18446744073709543424, 18446744073709535232, 18446744073709518848, 18446744073709486080, 18446744073709420544, 18446744073709289472, 18446744073709027328, 18446744073708503040, 18446744073707454464, 18446744073705357312, 18446744073701163008, 18446744073692774400, 18446744073675997184, 18446744073642442752, 18446744073575333888, 18446744073441116160, 18446744073172680704, 18446744072635809792, 18446744071562067968, 18446744069414584320, 18446744065119617024, 18446744056529682432, 18446744039349813248, 18446744004990074880, 18446743936270598144, 18446743798831644672, 18446743523953737728, 18446742974197923840, 18446741874686296064, 18446739675663040512, 18446735277616529408, 18446726481523507200, 18446708889337462784, 18446673704965373952, 18446603336221196288, 18446462598732840960, 18446181123756130304, 18445618173802708992, 18444492273895866368, 18442240474082181120, 18437736874454810624, 18428729675200069632, 18410715276690587648, 18374686479671623680, 18302628885633695744, 18158513697557839872, 17870283321406128128, 17293822569102704640, 16140901064495857664, 13835058055282163712, 9223372036854775808, 0, 0, 0, 0, 0,
+      (6,0): 18446744073709551552, 18446744073709551488, 18446744073709551360, 18446744073709551104, 18446744073709550592, 18446744073709549568, 18446744073709547520, 18446744073709543424, 18446744073709535232, 18446744073709518848, 18446744073709486080, 18446744073709420544, 18446744073709289472, 18446744073709027328, 18446744073708503040, 18446744073707454464, 18446744073705357312, 18446744073701163008, 18446744073692774400, 18446744073675997184, 18446744073642442752, 18446744073575333888, 18446744073441116160, 18446744073172680704, 18446744072635809792, 18446744071562067968, 18446744069414584320, 18446744065119617024, 18446744056529682432, 18446744039349813248, 18446744004990074880, 18446743936270598144, 18446743798831644672, 18446743523953737728, 18446742974197923840, 18446741874686296064, 18446739675663040512, 18446735277616529408, 18446726481523507200, 18446708889337462784, 18446673704965373952, 18446603336221196288, 18446462598732840960, 18446181123756130304, 18445618173802708992, 18444492273895866368, 18442240474082181120, 18437736874454810624, 18428729675200069632, 18410715276690587648, 18374686479671623680, 18302628885633695744, 18158513697557839872, 17870283321406128128, 17293822569102704640, 16140901064495857664, 13835058055282163712, 9223372036854775808, 0, 0, 0, 0, 0, 0,
+      (7,0): 18446744073709551488, 18446744073709551360, 18446744073709551104, 18446744073709550592, 18446744073709549568, 18446744073709547520, 18446744073709543424, 18446744073709535232, 18446744073709518848, 18446744073709486080, 18446744073709420544, 18446744073709289472, 18446744073709027328, 18446744073708503040, 18446744073707454464, 18446744073705357312, 18446744073701163008, 18446744073692774400, 18446744073675997184, 18446744073642442752, 18446744073575333888, 18446744073441116160, 18446744073172680704, 18446744072635809792, 18446744071562067968, 18446744069414584320, 18446744065119617024, 18446744056529682432, 18446744039349813248, 18446744004990074880, 18446743936270598144, 18446743798831644672, 18446743523953737728, 18446742974197923840, 18446741874686296064, 18446739675663040512, 18446735277616529408, 18446726481523507200, 18446708889337462784, 18446673704965373952, 18446603336221196288, 18446462598732840960, 18446181123756130304, 18445618173802708992, 18444492273895866368, 18442240474082181120, 18437736874454810624, 18428729675200069632, 18410715276690587648, 18374686479671623680, 18302628885633695744, 18158513697557839872, 17870283321406128128, 17293822569102704640, 16140901064495857664, 13835058055282163712, 9223372036854775808, 0, 0, 0, 0, 0, 0, 0
+      }
+   }
+   DATASET "DummyDBL" {
+      DATATYPE  H5T_IEEE_F64BE
+      DATASPACE  SIMPLE { ( 8, 8 ) / ( 8, 8 ) }
+      DATA {
+      (0,0): 0, 0.0001, 0.0002, 0.0003, 0.0004, 0.0005, 0.0006, 0.0007,
+      (1,0): 1, 1.0001, 1.0002, 1.0003, 1.0004, 1.0005, 1.0006, 1.0007,
+      (2,0): 2, 2.0001, 2.0002, 2.0003, 2.0004, 2.0005, 2.0006, 2.0007,
+      (3,0): 3, 3.0001, 3.0002, 3.0003, 3.0004, 3.0005, 3.0006, 3.0007,
+      (4,0): 4, 4.0001, 4.0002, 4.0003, 4.0004, 4.0005, 4.0006, 4.0007,
+      (5,0): 5, 5.0001, 5.0002, 5.0003, 5.0004, 5.0005, 5.0006, 5.0007,
+      (6,0): 6, 6.0001, 6.0002, 6.0003, 6.0004, 6.0005, 6.0006, 6.0007,
+      (7,0): 7, 7.0001, 7.0002, 7.0003, 7.0004, 7.0005, 7.0006, 7.0007
+      }
+   }
+}
+}